11 files changed, 69 insertions, 49 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 2171d2c6..d71cc743 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -305,7 +305,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
 
                 if (!canvas) {
                     var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                    var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas);
+                    var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas, this._useWebGL);
                     ElementMediator.addElements(newCanvas, elementModel.data, false);
 
                     // create all the GL stuff
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index e6e05b04..de2eb21d 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -78,7 +78,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                         }
 
                         canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                        var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas);
+                        var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas, this.options.use3D);
                         canvas.elementModel.isShape = true;
                         this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
                     } else {
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 4a16a491..aa14ea75 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -584,7 +584,7 @@ exports.PenTool = Montage.create(ShapeTool, {
             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);
+                var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas, this._useWebGL);
                 ElementMediator.addElements(newCanvas, elementModel.data, false);
 
                 // create all the GL stuff
diff --git a/js/tools/RotateObject3DTool.js b/js/tools/RotateObject3DTool.js
index 72af6eff..27352231 100755
--- a/js/tools/RotateObject3DTool.js
+++ b/js/tools/RotateObject3DTool.js
@@ -51,6 +51,7 @@ exports.RotateObject3DTool = Montage.create(Rotate3DToolBase, {
                     toolHandle._rotMat = Matrix.RotationZ( angle );
                 }
             }
+            this._inLocalMode = (this.options.selectedMode === "rotateLocally");
         }
     },
 
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 2b312e53..f5cc4040 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -76,7 +76,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
 
             this._targets.push({elt:elt, mat:curMat, matInv:curMatInv, ctr:eltCtr});
 
-            viewUtils.setMatrixForElement( elt, curMat, false );
+            ElementsMediator.setMatrix(elt, curMat, false, "rotateStage3DTool");
         }
     },
 
@@ -130,7 +130,8 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
            // Reset stage to identity matrix
            var iMat = Matrix.I(4);
 
-           ElementsMediator.setMatrix(this.application.ninja.currentDocument.documentRoot, iMat, false);
+           ElementsMediator.setMatrix(this.application.ninja.currentDocument.documentRoot,
+                                        iMat, false, "rotateStage3DTool");
            this.application.ninja.currentDocument.documentRoot.elementModel.props3D.m_transformCtr = null;
 
                         // let the document and stage manager know about the zoom change
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 74784485..94cc6b83 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -317,16 +317,27 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
 
                 this._targets.push({elt:elt, mat:curMat, matInv:curMatInv});
                 if(addToUndoStack) {
+                    var prevX,
+                        prevY,
+                        prevW,
+                        prevH,
+                        _x,
+                        _y,
+                        _w,
+                        _h,
+                        previousMat,
+                        previousStyleStr,
+                        newStyleStr;
+
                     if(!this._use3DMode) {
-                        var previousMat = this._undoArray[i].mat.slice(0);
-                        var prevX = this._undoArray[i]._x;
-                        var prevY = this._undoArray[i]._y;
-                        var prevW = this._undoArray[i]._w;
-                        var prevH = this._undoArray[i]._h;
-                        var _x = parseInt(ElementsMediator.getProperty(elt, "left")) + curMat[12] - previousMat[12];
-                        var _y = parseInt(ElementsMediator.getProperty(elt, "top")) + curMat[13] - previousMat[13];
-                        var _w = parseInt(ElementsMediator.getProperty(elt, "width"));
-                        var _h = parseInt(ElementsMediator.getProperty(elt, "height"));
+                        prevX = this._undoArray[i]._x;
+                        prevY = this._undoArray[i]._y;
+                        prevW = this._undoArray[i]._w;
+                        prevH = this._undoArray[i]._h;
+                        _x = parseInt(ElementsMediator.getProperty(elt, "left"));
+                        _y = parseInt(ElementsMediator.getProperty(elt, "top"));
+                        _w = parseInt(ElementsMediator.getProperty(elt, "width"));
+                        _h = parseInt(ElementsMediator.getProperty(elt, "height"));
 
                         previousLeft.push(prevX + "px");
                         previousTop.push(prevY + "px");
@@ -336,25 +347,22 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                         newTop.push(_y + "px");
                         newWidth.push(_w + "px");
                         newHeight.push(_h + "px");
-
-                        viewUtils.setMatrixForElement(elt, previousMat);
-
-                        this._targets[i].mat = previousMat;
-                        this._targets[i].matInv = glmat4.inverse(previousMat, []);
-                    } else {
-                        var previousMat = this._undoArray[i].mat.slice(0);
-                        var prevW = this._undoArray[i]._w;
-                        var prevH = this._undoArray[i]._h;
-                        var _w = parseInt(ElementsMediator.getProperty(elt, "width"));
-                        var _h = parseInt(ElementsMediator.getProperty(elt, "height"));
+                    }
+                    else
+                    {
+                        previousMat = this._undoArray[i].mat.slice(0);
+                        prevW = this._undoArray[i]._w;
+                        prevH = this._undoArray[i]._h;
+                        _w = parseInt(ElementsMediator.getProperty(elt, "width"));
+                        _h = parseInt(ElementsMediator.getProperty(elt, "height"));
                         previousWidth.push(prevW + "px");
                         previousHeight.push(prevH + "px");
                         newWidth.push(_w + "px");
                         newHeight.push(_h + "px");
 
-                        var previousStyleStr = {dist:this._undoArray[i].dist,
+                        previousStyleStr = {dist:this._undoArray[i].dist,
                                                 mat:MathUtils.scientificToDecimal(previousMat, 5)};
-                        var newStyleStr = {dist:viewUtils.getPerspectiveDistFromElement(elt),
+                        newStyleStr = {dist:viewUtils.getPerspectiveDistFromElement(elt),
                                             mat:MathUtils.scientificToDecimal(curMat, 5)};
                         previousStyles.push(previousStyleStr);
                         newStyles.push(newStyleStr);
@@ -455,11 +463,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                 }
                 else
                 {
-                    curMat = item.mat.slice(0);
-                    glmat4.multiply(curMat, qMat, curMat);
-                    var previousMat = this._undoArray[i].mat.slice(0);
-                    var _x = parseInt(ElementsMediator.getProperty(elt, "left")) + curMat[12] - previousMat[12];
-                    var _y = parseInt(ElementsMediator.getProperty(elt, "top")) + curMat[13] - previousMat[13];
+                    var _x = parseInt(ElementsMediator.getProperty(elt, "left")) + transMat[12];
+                    var _y = parseInt(ElementsMediator.getProperty(elt, "top")) + transMat[13];
 
                     newLeft.push(_x + "px");
                     newTop.push(_y + "px");
@@ -572,6 +577,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             {
                 // form the translation vector and post translate the matrix by it.
                 delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 );
+                delta[0] = ~~delta[0];
+                delta[1] = ~~delta[1];
                 delta[2] = 0;
                 var transMat = Matrix.Translation( delta );
                 this._moveElements(transMat);
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 4d8a318e..00d36528 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -6,8 +6,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage = require("montage/core/core").Montage,
     DrawingTool = require("js/tools/drawing-tool").DrawingTool,
-    viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
-    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
     NJUtils = require("js/lib/NJUtils").NJUtils,
     ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
     ShapeModel    = require("js/models/shape-model").ShapeModel,
@@ -67,7 +65,8 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                 var canvas;
                 if(!this._useExistingCanvas()) {
                     canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                    var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height, drawData.planeMat, drawData.midPt, canvas);
+                    var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height,
+                                                                        drawData.planeMat, drawData.midPt, canvas, this.options.use3D);
 
                     canvas.elementModel.isShape = true;
                     this.application.ninja.elementMediator.addElements(canvas, elementModel.data);