Merge branch 'refs/heads/Ninja-Internal' into FileIO

10 files changed, 188 insertions, 81 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index fda3a3c5..7ab6664f 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -249,10 +249,6 @@ exports.ElementController = Montage.create(Component, {
             else
             {
                 var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, false);
-                if(dist == null) {
-                    dist = 1400;
-                }
-
                 el.elementModel.props3D.perspectiveDist = dist;
                 return dist;
             }
@@ -266,9 +262,13 @@ exports.ElementController = Montage.create(Component, {
                 mat = props[index]["mat"];
             this.application.ninja.stylesController.setElementStyle(el,
                                                                     "-webkit-transform",
-                                                                    "perspective(" + dist + ") " +
                                                                     "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")");
 
+            // TODO - We don't support perspective on individual elements yet
+//            this.application.ninja.stylesController.setElementStyle(el,
+//                                                                    "-webkit-perspective",
+//                                                                    dist);
+
             el.elementModel.props3D.matrix3d = mat;
             el.elementModel.props3D.perspectiveDist = dist;
 
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index dc916b1a..f376e40f 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -90,7 +90,7 @@ exports.StageController = Montage.create(ElementController, {
                         return el.elementModel.stageView.style.getProperty(p);
                     }
                 default:
-                    return ElementController.getProperty(el, p, false, true);
+                    return ElementController.getProperty(el, p, true, true);
                     //console.log("Undefined Stage property ", p);
             }
         }
@@ -119,6 +119,7 @@ exports.StageController = Montage.create(ElementController, {
                     break;
                 case "-webkit-transform-style":
                     el.elementModel.stageView.style.setProperty(p, value);
+                    this.application.ninja.stage.updatedStage = true;
                     break;
                 default:
                     console.log("Undefined property ", p, "for the Stage Controller");
@@ -178,5 +179,20 @@ exports.StageController = Montage.create(ElementController, {
                 return mat;
             }
         }
-    }
+    },
+
+    getPerspectiveDist: {
+        value: function(el) {
+            if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.perspectiveDist)
+            {
+                return el.elementModel.props3D.perspectiveDist;
+            }
+            else
+            {
+                var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, true);
+                el.elementModel.props3D.perspectiveDist = dist;
+                return dist;
+            }
+        }
+    },
 });
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 5d5f27ba..ec4314f9 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -1130,7 +1130,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     getMatrixFromElement : {
         value: function(element, isStage) {
-            var xformStr = this.getElementStyle(element, "-webkit-transform", false, isStage),
+            var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage),
                 mat;
 
             if (xformStr) {
@@ -1163,26 +1163,29 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     getPerspectiveDistFromElement : {
         value: function(element, isStage) {
-            var xformStr = this.getElementStyle(element, "-webkit-transform", false, isStage),
+            var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage),
                 dist;
 
-            if (xformStr) {
-                var index1 = xformStr.indexOf( "perspective(");
-                if (index1 >= 0) {
-                    index1 += 12;    // do not include 'perspective('
-                    var index2 = xformStr.indexOf( ")", index1 );
-                    if (index2 >= 0) {
-                        var substr = xformStr.substr( index1, (index2-index1));
-                        if (substr && (substr.length > 0)) {
-                            dist = parseInt( substr );
+            if(xformStr) {
+                dist = parseInt(xformStr);
+            } else {
+                xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage);
+                if (xformStr) {
+                    var index1 = xformStr.indexOf( "perspective(");
+                    if (index1 >= 0) {
+                        index1 += 12;    // do not include 'perspective('
+                        var index2 = xformStr.indexOf( ")", index1 );
+                        if (index2 >= 0) {
+                            var substr = xformStr.substr( index1, (index2-index1));
+                            if (substr && (substr.length > 0)) {
+                                dist = parseInt( substr );
+                            }
                         }
                     }
                 }
-            } else {
-                xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage);
-                if(xformStr) {
-                    dist = parseInt(xformStr);
-                }
+            }
+            if(isNaN(dist)) {
+                dist = null;
             }
             return dist;
         }
diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js
index 2c60adc6..265bf2a4 100755
--- a/js/helper-classes/3D/hit-record.js
+++ b/js/helper-classes/3D/hit-record.js
@@ -232,7 +232,15 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype,
             var elt = this.getElt();
             viewUtils.pushViewportObj( elt );
             var viewPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] );
-            var eyePt = viewUtils.getEyePoint();
+            var eyePt;
+            if(viewUtils.getPerspectiveDistFromElement(elt))
+            {
+                eyePt = viewUtils.getEyePoint();
+            }
+            else
+            {
+                eyePt = [viewPt[0], viewPt[1], 1400];
+            }
             var projPt = MathUtils.vecIntersectPlane( eyePt, MathUtils.vecSubtract(viewPt,eyePt), plane );
 
             return projPt;
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index a401c363..61f5bc97 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -229,7 +229,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         parentPt = [quadPt[0], quadPt[1], 0.0];
                                 else
                                         parentPt = [xScreen, yScreen, 0.0];
-                                var vec = viewUtils.parentToChildVec(parentPt, stage);
+
+                var eyePt = [];
+                                var vec = viewUtils.parentToChildVec(parentPt, stage, eyePt);
                                 if (vec)
                                 {
                                         // activate the drag working plane
@@ -241,7 +243,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         var wp = currentWorkingPlane.slice(0);
                                         var mat = viewUtils.getMatrixFromElement(stage);
                                         wp = MathUtils.transformPlane(wp, mat);
-                                        var eyePt = viewUtils.getEyePoint();
                                         var projPt = MathUtils.vecIntersectPlane(eyePt, vec, wp);
                                         if (projPt)
                                         {
@@ -709,8 +710,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                 var wp = currentWorkingPlane.slice(0);
                                 var mat = viewUtils.getMatrixFromElement(stage);
                                 wp = MathUtils.transformPlane(wp, mat);
-                                var eyePt = viewUtils.getEyePoint();
-                                var vec = viewUtils.parentToChildVec(gPt, stage);
+                var eyePt = [];
+                                var vec = viewUtils.parentToChildVec(gPt, stage, eyePt);
                                 var projPt = MathUtils.vecIntersectPlane(eyePt, vec, wp);