Merge branch 'refs/heads/master' into CSSPanelUpdates

2 files changed, 75 insertions, 29 deletions

diff --git a/js/helper-classes/3D/vec-utils.js b/js/helper-classes/3D/vec-utils.js
index 4eacd856..0916c840 100755
--- a/js/helper-classes/3D/vec-utils.js
+++ b/js/helper-classes/3D/vec-utils.js
@@ -113,6 +113,25 @@ var VecUtils = exports.VecUtils = Object.create(Object.prototype,
         }
     },
 
+    vecDistSq : {
+            value: function( dimen,  a, b ) {
+                var sum;
+
+                if ((a.length < dimen) || (b.length < dimen))
+                {
+                    throw new Error( "dimension error in VecUtils.vecDistSq" );
+                }
+
+                var sum = 0.0;
+                for (var i=0;  i<dimen;  i++)
+                {
+                    var d = a[i] - b[i];
+                    sum += d*d;
+                }
+                return sum;
+            }
+        },
+
     vecDot : {
         value: function( dimen,  v0, v1 ) {
             if ((v0.length < dimen) || (v1.length < dimen))
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index ee822f1f..40a19b90 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -246,7 +246,6 @@ exports.ViewUtils = Montage.create(Component, {
             var worldPt = MathUtils.transformPoint( viewPt, mat );
             var stageWorldPt = this.postViewToStageWorld( worldPt, elt );
             this.popViewportObj();
-
             return stageWorldPt;
         }
     },
@@ -841,43 +840,21 @@ exports.ViewUtils = Montage.create(Component, {
     },
 
     getStageWorldToGlobalMatrix:
-        {
+    {
         value: function()
-                {
+        {
             var stage = this.application.ninja.currentDocument.documentRoot;
-                //projMat;
-                                
-            // get the matrix to the parent
-            //var mat = Matrix.I(4);
 
             this.pushViewportObj( stage );
+            // put the point into screen space of the stage - requires
+            // a translation to the top/left only
             var cop = this.getCenterOfProjection();
             var v2s = Matrix.Translation([cop[0], cop[1], 0]);
             this.popViewportObj();
 
-                        /*
-            var p = this.getPerspectiveDistFromElement(stage);
-            if(p)
-            {
-                projMat = glmat4.scale( Matrix.I(4), [p,p,p], [] );
-                projMat[11] = -1;
-            }
-            else
-            {
-                mat = v2s;
-            }
-            // offset to the parent
-            var offset = this.getElementOffset( stage );
-            var offMat = Matrix.Translation([offset[0], offset[1], 0]);
-            //mat = offMat.multiply( mat );
-            glmat4.multiply( offMat, mat, mat );
-            this.popViewportObj();
-                        */
-
-                        // append the localToGlobal matrix of the stage.
+            // append the localToGlobal matrix of the stage.
             var mat = this.getLocalToGlobalMatrix( stage );
-                        glmat4.multiply( mat, v2s );
-
+            glmat4.multiply( mat, v2s );
             return mat;
         }
     },
@@ -1056,6 +1033,56 @@ exports.ViewUtils = Montage.create(Component, {
         }
     },
 
+    getLocalToStageWorldMatrix: {
+        value: function( elt, shouldProject, shouldLocalTransform ) {
+            var mat = Matrix.I(4);
+            while (elt)
+            {
+                this.pushViewportObj( elt );
+                    var cop = this.getCenterOfProjection();
+                    var s2v = Matrix.Translation([-cop[0], -cop[1], 0]);
+                    var objMat = this.getMatrixFromElement( elt );
+                    var projMat;
+                    if(shouldProject)
+                    {
+                        //projMat = Matrix.I(4).multiply( this.getPerspectiveDistFromElement(elt) );
+                        var pDist = this.getPerspectiveDistFromElement(elt);
+                        var projMat = glmat4.scale(Matrix.I(4), [pDist,pDist,pDist], []);
+                        projMat[11] = -1;
+                        projMat[15] = 1400;
+                    }
+                    var v2s = Matrix.Translation([cop[0], cop[1], 0]);
+                this.popViewportObj();
+
+                // multiply all the matrices together
+                //mat = s2v.multiply( mat );
+                glmat4.multiply( s2v, mat, mat );
+                if (elt === this._stageElement)  break;
+                //mat = objMat.multiply( mat );
+                if (shouldLocalTransform) {
+                    glmat4.multiply( objMat, mat, mat );
+                }
+                if(shouldProject)
+                {
+                    //mat = projMat.multiply( mat );
+                    glmat4.multiply( projMat, mat, mat );
+                }
+                //mat = v2s.multiply( mat );
+                glmat4.multiply( v2s, mat, mat );
+
+                // offset to the parent
+                var offset = this.getElementOffset( elt );
+                var offMat = Matrix.Translation([offset[0], offset[1], 0]);
+                //mat = offMat.multiply( mat );
+                glmat4.multiply( offMat, mat, mat );
+
+                elt = elt.parentElement;
+            }
+
+            return mat;
+        }
+    },
+
     getUpVectorFromMatrix: {
         value: function( mat )    {
             //var inv = mat.inverse();