1 files changed, 156 insertions, 114 deletions

diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 5a820fc2..1cd1c313 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;   } },
@@ -261,7 +259,7 @@ exports.ViewUtils = Montage.create(Component, {
 
             // transform the point up the tree
             var child = elt;
-            var parent = elt.parentElement;
+            var parent = elt.offsetParent;
             while ( parent )
             {
                 // go to screen space of the current child
@@ -289,7 +287,7 @@ exports.ViewUtils = Montage.create(Component, {
                 }
 
                 child = parent;
-                parent = parent.parentElement;
+                parent = parent.offsetParent;
             }
 
             return pt;
@@ -305,7 +303,7 @@ exports.ViewUtils = Montage.create(Component, {
 
             // transform the bounds up the tree
             var child = elt;
-            var parent = elt.parentElement;
+            var parent = elt.offsetParent;
             while ( parent )
             {
                 pt = this.childToParent( pt, child );
@@ -313,7 +311,7 @@ exports.ViewUtils = Montage.create(Component, {
                 if (parent === this._rootElement)  break;
 
                 child = parent;
-                parent = parent.parentElement;
+                parent = parent.offsetParent;
             }
 
             /////////////////////////////////////////////////////////
@@ -348,7 +346,7 @@ exports.ViewUtils = Montage.create(Component, {
             if (pt.length == 2)  pt[2] = 0;
 
             // transform the bounds up the tree
-            var parent = child.parentElement;
+            var parent = child.offsetParent;
             if ( parent )
             {
                 this.setViewportObj( child );
@@ -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;
                 }
@@ -386,7 +394,7 @@ exports.ViewUtils = Montage.create(Component, {
             pt[3] = 1;
 
             // transform the bounds up the tree
-            var parent = child.parentElement;
+            var parent = child.offsetParent;
             if ( parent )
             {
                 this.setViewportObj( child );
@@ -421,7 +429,7 @@ exports.ViewUtils = Montage.create(Component, {
 
             /*
              this.pushViewportObj( elt );
-             var parent = elt.parentElement;
+             var parent = elt.offsetParent;
              var offset = this.getElementOffset( elt );
              offset[2] = 0;
              var localEyePt = this.getCenterOfProjection();
@@ -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;
         }
     },
@@ -567,19 +603,6 @@ exports.ViewUtils = Montage.create(Component, {
                 w       = elt.offsetWidth,
                 h       = elt.offsetHeight;
 
-            if(elt.width)
-                w = elt.width;
-            if(elt.height)
-                h = elt.height;
-
-            if (elt.style)
-            {
-                if (elt.style.left)     left    = MathUtils.styleToNumber(elt.style.left);
-                if (elt.style.top)      top     = MathUtils.styleToNumber(elt.style.top);
-                if (elt.style.width)    w   = MathUtils.styleToNumber(elt.style.width);
-                if (elt.style.height)   h  = MathUtils.styleToNumber(elt.style.height);
-            }
-
 //            if (elt instanceof SVGSVGElement) {
             if(elt.nodeName.toLowerCase() === "svg") {
                         if(w instanceof SVGAnimatedLength)
@@ -622,6 +645,21 @@ exports.ViewUtils = Montage.create(Component, {
         //        if (elt.__ninjaXOff)  xOff = elt.__ninjaXOff;