Merge pull request #186 from mqg734/StageWebTemplate

More grid drawing fixes for new web template workflow. Also, adding back ability to draw when working plane changes.

5 files changed, 83 insertions, 32 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 81a740e0..88830964 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -651,6 +651,21 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         this._lineColor = saveColor;
                         this._drawingContext.lineWidth = saveLineWidth;
 
+            if(this.application.ninja.currentDocument.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);
+    //            glmat4.multiply( tMat, stageMat, stageMat);
+                pt0 = [0, 0, 0];
+                pt1 = [0, height, 0];
+                delta = [width, 0, 0];
+                this.drawGridLines(pt0, pt1, delta, stageMat, 2);
+                pt0 = [0, 0, 0];
+                pt1 = [width, 0, 0];
+                delta = [0, height, 0];
+                this.drawGridLines(pt0, pt1, delta, stageMat, 2);
+            }
+
                         // draw the lines
                         this.redrawGridLines();
 
@@ -752,12 +767,27 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         this._drawingContext.lineWidth = 0.25;
 
                         // draw the lines
-                        var nLines = this._gridLineArray.length;
+            var line,
+                            nLines = this._gridLineArray.length;
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                            nLines = this._gridLineArray.length-4;
+            }
+
                         for (var i = 0; i < nLines; i++) {
-                                var line = this._gridLineArray[i];
+                                line = this._gridLineArray[i];
                                 this.drawIntersectedLine(line, this._drawingContext);
                         }
 
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                this._lineColor = "red";
+                i = nLines;
+                nLines += 4;
+                for (; i < nLines; i++) {
+                    line = this._gridLineArray[i];
+                    this.drawIntersectedLine(line, this._drawingContext);
+                }
+            }
+
                         this.popState();
                 }
         },
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 7fc492a5..f4bfc12b 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1617,7 +1617,11 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         if (x > y) {
                                                 if (x > z) {
                                                         plane[0] = 1;
-                                                        plane[3] = this.getStageWidth() / 2.0;
+                            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                                plane[3] = stage.scrollWidth / 2.0;
+                            } else {
+                                plane[3] = this.getStageWidth() / 2.0;
+                            }
                                                         if (dir[0] > 0) plane[3] = -plane[3];
                                                         change = !drawUtils.drawYZ;
                                                         drawUtils.drawXY = drawUtils.drawXZ = false;
@@ -1635,7 +1639,11 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         else {
                                                 if (y > z) {
                                                         plane[1] = 1;
-                                                        plane[3] = this.getStageHeight() / 2.0;
+                            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                                plane[3] = stage.scrollHeight / 2.0;
+                            } else {
+                                plane[3] = this.getStageHeight() / 2.0;
+                            }
                                                         if (dir[1] > 0) plane[3] = -plane[3];
                                                         change = !drawUtils.drawXZ;
                                                         drawUtils.drawXY = drawUtils.drawYZ = false;
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 8f45891d..d2337000 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -106,6 +106,9 @@ exports.ShapeTool = Montage.create(DrawingTool, {
             if(wasSelected) {
                 this.AddCustomFeedback();
                 this.application.ninja.elementMediator.addDelegate = this;
+                if(this.application.ninja.currentSelectedContainer.nodeName === "CANVAS") {
+                    this._targetedElement = this.application.ninja.currentSelectedContainer;
+                }
             } else {
                 this.RemoveCustomFeedback();
                 this.application.ninja.elementMediator.addDelegate = null;
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index 0b51aa28..7d97f105 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -24,6 +24,9 @@ exports.DrawingToolBase = Montage.create(Montage, {
         value: null
     },
 
+    dragPlane: {
+        value: null
+    },
     /**
      * Used on the initial MouseDown for Drawing Tools
      * 
@@ -33,28 +36,30 @@ exports.DrawingToolBase = Montage.create(Montage, {
      *          2 - Y value converted to screen point
      */
     getInitialSnapPoint: {
-        value: function(x,y) {
+        value: function(x, y, shapeCanvas) {
+            snapManager.clearDragPlane();
+
             // update the snap settings
                         snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
                         snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() );
                         snapManager.enableGridSnap( snapManager.gridSnapEnabledAppLevel() );
 
                         // do the snap
-                        var hitRec = snapManager.snap(x, y,  true);
-                        var dragPlane;
+                        this.dragPlane = null;
+            var hitRec = snapManager.snap(x, y,  true);
                         if (hitRec) {
-                                // set up the working plane and convert the hit record to be working plane relative
-                                if (hitRec.getElement() === snapManager.application.ninja.currentSelectedContainer)
+                                if (shapeCanvas)
                                 {
-                                        dragPlane = viewUtils.getUnprojectedElementPlane( hitRec.getElement() );
-                                        snapManager.setupDragPlaneFromPlane( dragPlane );
+                                        this.dragPlane = viewUtils.getUnprojectedElementPlane( shapeCanvas );
+                                        snapManager.setupDragPlaneFromPlane( this.dragPlane );
                                 }
                                 else
                                 {
-                                        dragPlane = snapManager.setupDragPlanes( hitRec );
+                                        this.dragPlane = snapManager.setupDragPlanes( hitRec, true );
                                 }
+//                              console.log( "drag plane: " + this.dragPlane );
 
-                                var wpHitRec = hitRec.convertToWorkingPlane( dragPlane );
+                                var wpHitRec = hitRec.convertToWorkingPlane( this.dragPlane );
                                 var pt = hitRec.getScreenPoint();
 
                 return( [wpHitRec, pt[0], pt[1]] );
@@ -72,28 +77,32 @@ exports.DrawingToolBase = Montage.create(Montage, {
                         snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() );
                         snapManager.enableGridSnap( snapManager.gridSnapEnabledAppLevel() );
 
-
-                        // do the first snap
                         var hitRec = snapManager.snap(x, y, snap3d );
                         if (hitRec) {
-                                if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
-                                        hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
-                                }
-
-                                if(downHitRec !== null) {
-                                        // if we are working off-plane, do a snap to the projected locations of the geometry
-                                        var thePlane = workingPlane;
-                                        if (snapManager.hasDragPlane())
-                                        {
-                                                thePlane = snapManager.getDragPlane();
-                                        }
-
-                    // Return the up HitRec
-                    return hitRec;
-                                } else {
-                    return null;
+//                              if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
+//                                      hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
+//                              }
+//
+//                              if(downHitRec !== null) {
+//                                      // if we are working off-plane, do a snap to the projected locations of the geometry
+//                                      var thePlane = workingPlane;
+//                                      if (snapManager.hasDragPlane())
+//                                      {
+//                                              thePlane = snapManager.getDragPlane();
+//                                      }
+//
+//                    // Return the up HitRec
+//                    return hitRec;
+//                              } else {
+//                    return null;
+//                }
+                if(downHitRec) {
+                    hitRec = hitRec.convertToWorkingPlane(this.dragPlane);
+                } else if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {