1 files changed, 36 insertions, 65 deletions

diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 919f7c50..a3d09404 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -18,18 +18,11 @@ exports.ViewUtils = Montage.create(Component, {
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
 
-    m_viewportObj : { value: null, writable: true},
-    _perspectiveDist: { value: null, writable: true},
+    m_viewportObj : { value: null},
+    _perspectiveDist: { value: null},
 
     // keep a stack of viewport objects
-    _viewportObjStack: { value: [], writable: true },
-
-    _currentDocument: { value: null , writable: true},
-    _userContentLeft: { value: null , writable: true},
-    _userContentTop: { value: null , writable: true},
-
-    _rootElement: { value: null, writable: true},
-    _stageElement: { value: null, writable: true},
+    _viewportObjStack: { value: []},
 
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
@@ -43,18 +36,6 @@ exports.ViewUtils = Montage.create(Component, {
     },
     getViewportObj: { value: function()                 {  return this.m_viewportObj;   } },
 
-    setRootElement: { value: function( elt )            { this._rootElement = elt; } },
-    getRootElement: { value: function ()                { return this._rootElement;        } },
-
-    setStageElement: { value: function( elt )    {  this._stageElement = elt;    } },
-    getStageElement: { value: function () { return this._stageElement; } },
-
-    setCurrentDocument: { value: function(value) { this._currentDocument = value; }},
-
-    setUserContentLeft: { value: function(value) { this._userContentLeft = value; }},
-    setUserContentTop: { value: function(value) { this._userContentTop = value; }},
-
-
     getPerspectiveDistance: { value: function () { return this._perspectiveDist; } },
 
     ///////////////////////////////////////////////////////////////////////
@@ -139,7 +120,7 @@ exports.ViewUtils = Montage.create(Component, {
             var yVec = [0,1,0];
             var zVec = [0,0,1];
 
-            var stage = this.application.ninja.currentDocument.documentRoot;
+            var stage = this.application.ninja.currentDocument.model.documentRoot;
             var stageMat = this.getMatrixFromElement(stage);
 
                         var mat = glmat4.multiply( stageMat, objMat, [] );
@@ -156,14 +137,6 @@ exports.ViewUtils = Montage.create(Component, {
                                 viewDir = MathUtils.transformVector( [0,0,1],  stageInv );
                         }
 
-                        /*
-                        if (elt === stage)
-                        {
-                                xVec = [1,0,0];
-                                yVec = [0,1,0];
-                        }
-                        */
-
                         var plane;
                         var xDot, yDot, zDot;
                         switch (axis)
@@ -288,6 +261,11 @@ exports.ViewUtils = Montage.create(Component, {
         value: function( localPt,  elt ) {
             this.pushViewportObj( elt );
             var viewPt = this.screenToView( localPt[0], localPt[1], localPt[2] );
+                        if ((elt == null) || (elt === this._stageElement))
+                        {
+                                this.popViewportObj();
+                                return viewPt;
+                        }
             var mat = this.getMatrixFromElement( elt );
             var worldPt = MathUtils.transformPoint( viewPt, mat );
             var stageWorldPt = this.postViewToStageWorld( worldPt, elt );
@@ -302,7 +280,7 @@ exports.ViewUtils = Montage.create(Component, {
     // into stage world space.
     postViewToStageWorld: {
         value: function( localPt, elt ) {
-            if ((elt == null) || (elt === this._stageElement))  return localPt;
+            if ((elt == null) || (elt === this.application.ninja.currentDocument.model.documentRoot))  return localPt;
 
             // get the 3D transformation and 2D offset from the element
             var pt = localPt.slice(0);
@@ -329,7 +307,7 @@ exports.ViewUtils = Montage.create(Component, {
                 this.popViewportObj();
 
                 // check if we are done
-                if (parent === this._stageElement)  break;
+                if (parent === this.application.ninja.currentDocument.model.documentRoot)  break;
 
                 if (this.elementHas3D( parent ))
                 {
@@ -354,15 +332,17 @@ exports.ViewUtils = Montage.create(Component, {
 
             // transform the bounds up the tree
             var child = elt;
-            var parent = elt.offsetParent;
-            while ( parent )
+            while ( child )
             {
                 pt = this.childToParent( pt, child );
 
-                if (parent === this._rootElement)  break;
+//                if (child === this.application.ninja.currentDocument.model.documentRoot)  break;
+//                child = child.offsetParent;
 
-                child = parent;
-                parent = parent.offsetParent;
+                if (child === this.application.ninja.currentDocument.model.documentRoot)  break;
+                if (child === this.application.ninja.currentDocument.model.documentRoot.parentNode)  break;
+                child = child.offsetParent;
+                if (child === this.application.ninja.currentDocument.model.documentRoot.parentNode)  break;
             }
 
             /////////////////////////////////////////////////////////
@@ -398,7 +378,8 @@ exports.ViewUtils = Montage.create(Component, {
 
             // transform the bounds up the tree
             var parent = child.offsetParent;
-            if ( parent )
+            // TODO - Should have a different way to check for new template mode
+            if ( parent || (child === this.application.ninja.currentDocument.model.documentRoot) )
             {
                 this.setViewportObj( child );
 
@@ -411,7 +392,7 @@ exports.ViewUtils = Montage.create(Component, {
                 {
                     // 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");
+//                    var flatten = (parent !== this.application.ninja.currentDocument.model.documentRoot.parentNode) && (ElementsMediator.getProperty(parent, "-webkit-transform-style") !== "preserve-3d");
 //                    if(flatten)
 //                    {
 //                        pt[2] = 0;
@@ -471,7 +452,7 @@ exports.ViewUtils = Montage.create(Component, {
             // get the four corners of the element in global space
             var bounds = this.getElementViewBounds3D( elt );
             var bounds3D = new Array();
-            var stage = this.application.ninja.currentDocument.documentRoot;
+            var stage = this.application.ninja.currentDocument.model.documentRoot;
             for (var i=0;  i<3;  i++)
             {
                 var gPt = this.localToGlobal( bounds[i],  elt );
@@ -696,7 +677,7 @@ exports.ViewUtils = Montage.create(Component, {
         //        if (elt.__ninjaXOff)  xOff = elt.__ninjaXOff;
         //        if (elt.__ninjaYOff)  yOff = elt.__ninjaYOff;
             var offset = [xOff, yOff];
-            if(elt.offsetParent && (elt.offsetParent !== this._stageElement))
+            if(elt.offsetParent && (elt.offsetParent !== this.application.ninja.currentDocument.model.documentRoot))
             {
                 var pS = elt.ownerDocument.defaultView.getComputedStyle(elt.offsetParent);
 
@@ -712,12 +693,12 @@ exports.ViewUtils = Montage.create(Component, {
                 }
             }
 
-            if(elt === this._stageElement)
+            if(elt === this.application.ninja.currentDocument.model.documentRoot)
             {
                 // TODO - Call a routine from the user document controller to get the offsets/margins
                 // Once we expose the document controller to ViewUtils
-                offset[0] += this._userContentLeft;
-                offset[1] += this._userContentTop;
+                offset[0] += this.application.ninja.stage._userContentLeft;
+                offset[1] += this.application.ninja.stage._userContentTop;
             }
 
             return offset;
@@ -889,7 +870,7 @@ exports.ViewUtils = Montage.create(Component, {
     {
         value: function()
         {
-            var stage = this.application.ninja.currentDocument.documentRoot;
+            var stage = this.application.ninja.currentDocument.model.documentRoot;
 
             this.pushViewportObj( stage );
             // put the point into screen space of the stage - requires
@@ -1003,7 +984,7 @@ exports.ViewUtils = Montage.create(Component, {
                     glmat4.multiply( v2s, mat, mat );