3 files changed, 44 insertions, 55 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index bf48a723..871b832d 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -119,20 +119,23 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
     initializeFromDocument:{
         value:function(){
-            var documentRootChildren = null, i, stage = this.application.ninja.stage;
+            var i,
+                documentRootChildren = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true),
+                stage = this.application.ninja.stage,
+                len = documentRootChildren.length;
             //initialize with current document
             this._eltArray = [];
             this._planesArray = [];
             this.setDrawingSurfaceElement(stage.canvas);
-            this.setSourceSpaceElement( this.application.ninja.currentDocument.documentRoot);
+            this.setSourceSpaceElement( this.application.ninja.currentDocument.model.documentRoot);
             this.setWorkingPlane( [0,0,1,0] );
 
             //Loop through all the top-level children of the current document and call drawUtils.addElement on them
-            if(this.application.ninja.currentDocument._liveNodeList.length > 0){
-                documentRootChildren = this.application.ninja.currentDocument._liveNodeList;
-                var len = documentRootChildren.length,
-                    minLeft = stage.userPaddingLeft,
-                    minTop = stage.userPaddingTop,
+            if(len > 0) {
+                var initL = 0,
+                    initT = 0,
+                    minLeft = 0,
+                    minTop = 0,
                     docLeft = stage.documentOffsetLeft,
                     docTop = stage.documentOffsetTop,
                     l,
@@ -151,10 +154,10 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         minTop = t;
                     }
                 }
-                if(minLeft !== stage.userPaddingLeft) {
+                if(minLeft !== initL) {
                     stage.userPaddingLeft = minLeft;
                 }
-                if(minTop !== stage.userPaddingTop) {
+                if(minTop !== initT) {
                     stage.userPaddingTop = minTop;
                 }
             }
@@ -697,7 +700,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         this._lineColor = saveColor;
                         this._drawingContext.lineWidth = saveLineWidth;
 
-            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+            if(this.application.ninja.currentDocument.model.documentRoot.id !== "UserContent") {
                 // draw an outline around the body
                 var stagePt = MathUtils.getPointOnPlane([0,0,1,0]);
                 var stageMat = this.getPlaneToWorldMatrix([0,0,1], stagePt);
@@ -815,7 +818,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         // draw the lines
             var line,
                             nLines = this._gridLineArray.length;
-            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+            if(this.application.ninja.currentDocument.model.documentRoot.id !== "UserContent") {
                             nLines = this._gridLineArray.length-4;
             }
 
@@ -824,7 +827,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                                 this.drawIntersectedLine(line, this._drawingContext);
                         }
 
-            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+            if(this.application.ninja.currentDocument.model.documentRoot.id !== "UserContent") {
                 this._lineColor = "red";
                 i = nLines;
                 nLines += 4;
@@ -923,7 +926,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                                 // if all of the planes are aligned, check if they are aligned with the view direction
                                 if (flat)
                                 {
-                                        var stage = this.application.ninja.currentDocument.documentRoot;
+                                        var stage = this.application.ninja.currentDocument.model.documentRoot;
                                         var stageMat = this.viewUtils.getMatrixFromElement(stage);
                                         var viewDir = [ stageMat[8], stageMat[9], stageMat[10] ];
                                         viewDir = vecUtils.vecNormalize( 3, viewDir );
@@ -1213,7 +1216,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 value: function() {
                         // set the element to be the viewport object - temporarily
                         var tmpCanvas = this.application.ninja.stage.canvas;
-                        var tmpStage = this.application.ninja.currentDocument.documentRoot;
+                        var tmpStage = this.application.ninja.currentDocument.model.documentRoot;
                         this.viewUtils.pushViewportObj( tmpCanvas );
 
                         // save the source space object and set to the target object
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 0f456e1e..069c6022 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -83,14 +83,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         popWorkingPlane : { value: function ()          { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
 
         getStageWidth : { value: function ()            {
-                return parseInt(this.application.ninja.currentDocument.documentRoot.offsetWidth);
+                return parseInt(this.application.ninja.currentDocument.model.documentRoot.offsetWidth);
         }},
 
         getStageHeight : { value: function ()           {
-                return parseInt(this.application.ninja.currentDocument.documentRoot.offsetHeight);
+                return parseInt(this.application.ninja.currentDocument.model.documentRoot.offsetHeight);
         }},
 
-    getStage : { value: function()              {        return this.application.ninja.currentDocument.documentRoot;    }},
+    getStage : { value: function()              {        return this.application.ninja.currentDocument.model.documentRoot;    }},
 
         getGridVertexHitRad : { value: function()               {  return this._gridVertexHitRad;                               }},
         getGridEdgeHitRad : { value: function()         {  return this._gridEdgeHitRad;                                 }},
@@ -470,13 +470,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                 }
         },
 
-    reload2DCache: {
-        value: function() {
-            this.clear2DCache();
-            this.load2DCache(workingPlane);
-        }
-    },
-
         clear2DCache : {
                 value : function() {
                         // clear the 2D cache flags in the objects
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 0080bf90..a3d09404 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -24,9 +24,6 @@ exports.ViewUtils = Montage.create(Component, {
     // keep a stack of viewport objects
     _viewportObjStack: { value: []},
 
-    _userContentLeft: { value: null},
-    _userContentTop: { value: null},
-
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -39,9 +36,6 @@ exports.ViewUtils = Montage.create(Component, {
     },
     getViewportObj: { value: function()                 {  return this.m_viewportObj;   } },
 
-    setUserContentLeft: { value: function(value) { this._userContentLeft = value; }},
-    setUserContentTop: { value: function(value) { this._userContentTop = value; }},
-
     getPerspectiveDistance: { value: function () { return this._perspectiveDist; } },
 
     ///////////////////////////////////////////////////////////////////////
@@ -126,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, [] );
@@ -286,7 +280,7 @@ exports.ViewUtils = Montage.create(Component, {
     // into stage world space.
     postViewToStageWorld: {
         value: function( localPt, elt ) {
-            if ((elt == null) || (elt === this.application.ninja.currentDocument.documentRoot))  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);
@@ -313,7 +307,7 @@ exports.ViewUtils = Montage.create(Component, {
                 this.popViewportObj();
 
                 // check if we are done
-                if (parent === this.application.ninja.currentDocument.documentRoot)  break;
+                if (parent === this.application.ninja.currentDocument.model.documentRoot)  break;
 
                 if (this.elementHas3D( parent ))
                 {
@@ -342,13 +336,13 @@ exports.ViewUtils = Montage.create(Component, {
             {