Merge branch 'master' into pentool

12 files changed, 154 insertions, 309 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 1666d311..5d4e8288 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -376,13 +376,11 @@ exports.BrushTool = Montage.create(ShapeTool, {
                 return;
             }
 
-            var left = Math.round(midPt[0] - 0.5 * w);
-            var top = Math.round(midPt[1] - 0.5 * h);
-
             if (!canvas) {
-                var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas, true);
-                ElementMediator.addElements(newCanvas, elementModel.data, false);
+                var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+                document.application.njUtils.createModelWithShape(newCanvas, "Brushstroke");
+                var styles = document.application.njUtils.stylesFromDraw(newCanvas, w, h, {midPt: midPt, planeMat: planeMat});
+                this.application.ninja.elementMediator.addElements(newCanvas, styles, false);
 
                 // create all the GL stuff
                 var world = this.getGLWorld(newCanvas, this._useWebGL);
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 346975b2..6678e498 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -375,7 +375,8 @@ exports.EyedropperTool = Montage.create(toolBase, {
                     var worldData = elt.elementModel.shapeModel.GLWorld.exportJSON();
                     if(worldData)
                     {
-                        this._webGlDataCanvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, true);
+                        this._webGlDataCanvas = njModule.NJUtils.make("canvas", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+                        njModule.NJUtils.createModelWithShape(this._webGlDataCanvas, "Canvas");
                         this._applyElementStyles(elt, this._webGlDataCanvas, ["display", "position", "width", "height",
                                                                     "-webkit-transform", "-webkit-transform-style"]);
                         this._webGlDataCanvas.style.left = eltCoords[0] + "px";
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 3e9167fd..5941b464 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -77,10 +77,11 @@ exports.LineTool = Montage.create(ShapeTool, {
                             h += ~~(yAdj*2);
                         }
 
-                        canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                        var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas, true);
-                        canvas.elementModel.isShape = true;
-                        this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
+                        canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+                        document.application.njUtils.createModelWithShape(canvas, "Line");
+
+                        var styles = document.application.njUtils.stylesFromDraw(canvas, w, h, drawData);
+                        this.application.ninja.elementMediator.addElements(canvas, styles);
                     } else {
                         canvas = this._targetedElement;
                         canvas.elementModel.controller = ShapesController;
@@ -241,7 +242,7 @@ exports.LineTool = Montage.create(ShapeTool, {
             canvas.elementModel.shapeModel.shapeCount++;
             if(canvas.elementModel.shapeModel.shapeCount === 1)
             {
-                canvas.elementModel.selection = "Line";
+//                canvas.elementModel.selection = "Line";
                 canvas.elementModel.pi = "LinePi";
                 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
 
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index e8e88d1d..6edec811 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -66,7 +66,7 @@ exports.OvalTool = Montage.create(ShapeTool, {
             var world = this.getGLWorld(canvas, this.options.use3D);
 
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
-            var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
+            var yOffset = -(canvas.height/2 - (top - canvas.offsetTop + h/2));
 
             var oval = new Circle(); //GLCircle();
             oval.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle);
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index 0537a27b..ce7606a1 100755
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
@@ -331,10 +331,26 @@ exports.PanTool = Montage.create(toolBase,
                                 
                                 if (!this._altKeyDown)
                                         delta[2] = 0;
-                                var transMat = Matrix.Translation( delta );
-                                this._worldPt = wPt;
+
+                                // limit the change
+                                var ucMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.documentRoot);
+                                var tooMuch = false
+                                if ((ucMat[12] >  12000) && (delta[0] > 0))  tooMuch = true;
+                                if ((ucMat[12] < -12000) && (delta[0] < 0))  tooMuch = true;
+                                if ((ucMat[13] >  12000) && (delta[1] > 0))  tooMuch = true;
+                                if ((ucMat[13] < -12000) && (delta[1] < 0))  tooMuch = true;
+                                if ((ucMat[14] >  12000) && (delta[2] > 0))  tooMuch = true;
+                                if ((ucMat[14] < -12000) && (delta[2] < 0))  tooMuch = true;
+                                if (tooMuch)
+                                {
+                                        this._isDrawing = false;
+                                        delta = [0,0,0];
+                                }
+                                else
+                                        this._worldPt = wPt;
 
                                 // update everything
+                                var transMat = Matrix.Translation( delta );
                                 this.applyDeltaMat( transMat );
                         }
                 }
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index fb7f6d6d..fd470af7 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -578,17 +578,16 @@ exports.PenTool = Montage.create(ShapeTool, {
                 return;
             }
 
-            w= Math.round(w);
+            w = Math.round(w);
             h = Math.round(h);
             var left = Math.round(midPt[0] - 0.5 * w);
             var top = Math.round(midPt[1] - 0.5 * h);
 
             if (!canvas) {
-                var newCanvas = null;
-                newCanvas = NJUtils.makeNJElement("canvas", "Subpath", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas, true);
-                //note that we set the notify event to false because we send the event separately at end of this code block
-                ElementMediator.addElements(newCanvas, elementModel.data, false);
+                var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+                document.application.njUtils.createModelWithShape(newCanvas, "Subpath");
+                var styles = document.application.njUtils.stylesFromDraw(newCanvas, parseInt(w), parseInt(h), {midPt: midPt, planeMat: planeMat});
+                this.application.ninja.elementMediator.addElements(newCanvas, styles, false);
 
                 // create all the GL stuff
                 var world = this.getGLWorld(newCanvas, this._useWebGL);//this.options.use3D);//this.CreateGLWorld(planeMat, midPt, newCanvas, this._useWebGL);//fillMaterial, strokeMaterial);
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index d1701304..2a9c63db 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -96,6 +96,12 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
             viewUtils.pushViewportObj( stage );
             var eltCtr = viewUtils.getCenterOfProjection();
             viewUtils.popViewportObj();
+//            if(this.application.ninja.documentController.webTemplate)
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent")
+            {
+                eltCtr[0] = stage.scrollWidth/2;
+                eltCtr[1] = stage.scrollHeight/2;
+            }
 
             var curMat = viewUtils.getMatrixFromElement(stage);
             var curMatInv = glmat4.inverse(curMat, []);
@@ -113,8 +119,16 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
 
             this._origin = viewUtils.localToGlobal(eltCtr, stage);
 
-            this._setTransformOrigin(false);
-
+//            if(this.application.ninja.documentController.webTemplate)
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent")
+            {
+                this._startOriginArray = [];
+                this._startOriginArray.push(this._origin.slice());
+            }
+            else
+            {
+                this._setTransformOrigin(false);
+            }
             this.DrawHandles();
         }
     },
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 7033ee3d..855c7b8c 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -751,10 +751,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
 
             var zoomFactor = 1;
             var viewPort = this.application.ninja.stage._viewport;
-            if (viewPort.style && viewPort.style.zoom)
-            {
+            if (viewPort && viewPort.style && viewPort.style.zoom) {
                 zoomFactor = Number(viewPort.style.zoom);
             }
+
             var tmpMat = viewUtils.getLocalToGlobalMatrix( item );
             for (var j=0;  j<4;  j++)
             {
@@ -863,7 +863,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
 
             var zoomFactor = 1;
             var viewPort = this.application.ninja.stage._viewport;
-            if (viewPort.style && viewPort.style.zoom)
+            if (viewPort && viewPort.style && viewPort.style.zoom)