3 files changed, 137 insertions, 48 deletions

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);
                                 var wpMat = drawUtils.getPlaneToWorldMatrix(currentWorkingPlane, MathUtils.getPointOnPlane(currentWorkingPlane));
                                 projPt[3] = 1.0;
@@ -1067,8 +1068,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         // Snapping is done in screen space, so convert the bounds from
                         // local element space to global screen space
                         var bounds3D = new Array();
+            var eltMat = viewUtils.getLocalToGlobalMatrix( elt );
                         for (var i=0;  i<4;  i++)
-                                bounds3D[i] = viewUtils.localToGlobal( bounds[i],  elt );
+                                bounds3D[i] = viewUtils.localToGlobal2(bounds[i], eltMat);
                         
                         var hitRec = this.snapToScreenBounds( elt, globalScrPt, bounds, bounds3D );
 
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 63c2cb52..55ecbc59 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -37,10 +37,8 @@ exports.ViewUtils = Montage.create(Component, {
     setViewportObj: {
         value: function( vp ) {
             this.m_viewportObj = vp;
-            this._perspectiveDist = 1400;
 
-            var dist = this.getPerspectiveDistFromElement( vp );
-            var mode = this.getPerspectiveModeFromElement( vp );
+            this._perspectiveDist = this.getPerspectiveDistFromElement( vp );
         }
     },
     getViewportObj: { value: function()                 {  return this.m_viewportObj;   } },
@@ -360,11 +358,21 @@ exports.ViewUtils = Montage.create(Component, {
 
                 if (this.elementHas3D( child ))
                 {
+                    // TODO - Commenting out flatten support until new perspective workflow is fully working
                     // if (flatten)  pt[2] = 0;
+//                    var flatten = (parent !== this._rootElement) && (ElementsMediator.getProperty(parent, "-webkit-transform-style") !== "preserve-3d");
+//                    if(flatten)
+//                    {
+//                        pt[2] = 0;
+//                    }
                     pt = this.screenToView( pt[0], pt[1], pt[2] );
                     pt[3] = 1;
                     //var wPt = childMat.multiply( pt );
                     var wPt = glmat4.multiplyVec3( childMat, pt, [] );
+//                    if(flatten)
+//                    {
+//                        wPt[2] = 0;
+//                    }
                     var scrPt = this.viewToScreen( wPt );
                     pt = scrPt;
                 }
@@ -480,7 +488,15 @@ exports.ViewUtils = Montage.create(Component, {
             var plane = MathUtils.transformPlane( [0,0,1,0],  mat );
 
             // project the view point onto the plane
-            var eyePt = this.getEyePoint();
+            var eyePt;
+            if(this.getPerspectiveDistFromElement(child))
+            {
+                eyePt = this.getEyePoint();
+            }
+            else
+            {
+                eyePt = [viewPt[0], viewPt[1], 1400];
+            }
             var projPt = MathUtils.vecIntersectPlane( eyePt, MathUtils.vecSubtract(viewPt,eyePt), plane );
 
             var childPt;
@@ -522,7 +538,15 @@ exports.ViewUtils = Montage.create(Component, {
             var plane = MathUtils.transformPlane( [0,0,1,0],  mat );
 
             // project the view point onto the plane
-            var eyePt = this.getEyePoint();
+            var eyePt;
+            if(this.getPerspectiveDistFromElement(child))
+            {
+                eyePt = this.getEyePoint();
+            }
+            else
+            {
+                eyePt = [viewPt[0], viewPt[1], 1400];
+            }
             var projPt = MathUtils.vecIntersectPlane( eyePt, MathUtils.vecSubtract(viewPt,eyePt), plane );
 
             this.popViewportObj();
@@ -533,7 +557,7 @@ exports.ViewUtils = Montage.create(Component, {
 
 
     parentToChildVec: {
-        value: function( parentPt, child ) {
+        value: function( parentPt, child, rtnEyePt ) {
             var pt = parentPt.slice(0);
             if (pt.length == 2)  pt[2] = 0.0;
 
@@ -546,12 +570,24 @@ exports.ViewUtils = Montage.create(Component, {
             this.setViewportObj( child );
             pt = this.screenToView( pt[0], pt[1], pt[2] );
 
-            var eyePt = this.getEyePoint();
-            //var eyePt = [0, 0, 0];
-            //var vec = [pt[0], pt[1], pt[2]].subtract( eyePt );
+            var eyePt;
+            if(this.getPerspectiveDistFromElement(child))
+            {
+                eyePt = this.getEyePoint();
+            }
+            else
+            {
+                eyePt = [pt[0], pt[1], 1400];
+            }
             var vec = vecUtils.vecSubtract(3, [pt[0], pt[1], pt[2]], eyePt);
             vec = vecUtils.vecNormalize( 3, vec );
 
+            if(rtnEyePt)
+            {
+                rtnEyePt[0] = eyePt[0];
+                rtnEyePt[1] = eyePt[1];
+                rtnEyePt[2] = eyePt[2];
+            }
             return vec;
         }
     },
@@ -707,6 +743,10 @@ exports.ViewUtils = Montage.create(Component, {
 
     projectToViewPlane: {
         value: function( viewPos ) {
+            if(!this._perspectiveDist)
+            {
+                return viewPos.slice(0);
+            }
             var viewPt;
             var viewport = this.m_viewportObj;
             if (viewport)
@@ -734,6 +774,10 @@ exports.ViewUtils = Montage.create(Component, {
     
     unproject: {
         value: function( pt ) {
+            if(!this._perspectiveDist)