6 files changed, 463 insertions, 72 deletions

diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index 2e121b0b..6bd92353 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -46,25 +46,70 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
         }
     },
 
+    HandleMouseMove: {
+        value: function(event) {
+            if(this._escape) {
+                this._escape = false;
+                this.isDrawing = true;
+            }
+
+            if(this.isDrawing) {
+                this._hasDraw = true;   // Flag for position of element
+                this.doDraw(event);
+            } else {
+                this._showFeedbackOnMouseMove(event);
+                if(this._canSnap)
+                {
+                    this.doSnap(event);
+                }
+            }
+
+                        this.DrawHandles(this._delta);
+            
+                        if(this._canSnap)
+            {
+                snapManager.drawLastHit();
+            }
+        }
+    },
+
     modifyElements: {
         value: function(data, event) {
-            var mat, angle, pt0 = data.pt0, pt1 = data.pt1;
-
-            if(this._handleMode !== null) {
-                if(this._activateOriginHandle) {
-                    // move the transform origin handle
-                    var dx = pt1.x - pt0.x;
-                    var dy = pt1.y - pt0.y;
-                    this._origin[0] += dx;
-                    this._origin[1] += dy;
-
-                    if( this.rotateStage || (this.application.ninja.selectedElements.length === 1)) {
-                        this._startOriginArray[0][0] += dx;
-                        this._startOriginArray[0][1] += dy;
+            var mat,
+                angle,
+                pt0 = data.pt0,
+                pt1 = data.pt1;
+
+            if(this._handleMode !== null)
+            {
+                if(this._activateOriginHandle)
+                {
+                    // move the transform origin handle directly to the snap point (pt1)
+                    this._origin[0] = pt1.x;
+                    this._origin[1] = pt1.y;
+                    this._origin[2] = pt1.z;
+
+                                        var sw2gMat = viewUtils.getStageWorldToGlobalMatrix();
+                                        var g2swMat = glmat4.inverse( sw2gMat, [] );
+                                        var swOrigin = MathUtils.transformAndDivideHomogeneousPoint( this._origin, g2swMat );
+                                        //console.log( "modifyElements, _origin: " + this._origin + ", in stageWorld: " + swOrigin );
+
+                    var len = this._targets.length;
+                    if(len === 1)
+                    {
+                                                var g2lMat = this._targets[0].g2l;
+                                                var localOrigin = MathUtils.transformAndDivideHomogeneousPoint( this._origin, g2lMat );
+                                                var elt = this._targets[0].elt;
+                                                viewUtils.pushViewportObj( elt );
+                                                var viewOrigin = viewUtils.screenToView( localOrigin[0], localOrigin[1], localOrigin[2] );
+                                                viewUtils.popViewportObj();
+                                                this._startOriginArray[0] = viewOrigin;
+                                                //console.log( "Rotate3DToolBase.modifyElements, _startOriginArray[0]: " + this._startOriginArray[0] );
                     }
 
                     this.downPoint.x = pt1.x;
                     this.downPoint.y = pt1.y;
+                    this.downPoint.z = pt1.z;
                     this.DrawHandles();
                     return;
                 }
@@ -133,6 +178,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
 
             if(this._inLocalMode && (this.application.ninja.selectedElements.length === 1 || this.rotateStage) )
             {
+                                console.log( "modifyElements: rotateLocally " );
                 this._rotateLocally(mat);
             }
             else
@@ -154,12 +200,14 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
             }
             var len = selectedElements.length;
             for(var i = 0; i < len; i++) {
-                var elt = selectedElements[i].elementModel.getProperty("elt");
-                var curMat = selectedElements[i].elementModel.getProperty("mat");
+                var elt = selectedElements[i];
+                var curMat = elt.elementModel.getProperty("mat");
 
                 // pre-translate by the transformation center
                 var tMat = Matrix.I(4);
 
+                                // _startOriginArray is the location of the center of rotation
+                                // in view space of the element.  
                 var transformCtr = this._startOriginArray[i];
 
                 tMat[12] = transformCtr[0];
@@ -179,7 +227,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 glmat4.multiply(mat, tMat, mat);
 
                 // while moving, set inline style to improve performance
-                viewUtils.setMatrixForElement(selectedElements[i], mat, true );
+                viewUtils.setMatrixForElement( elt, mat, true );
             }
         }
     },
@@ -197,6 +245,8 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 var transformCtr = this._startOriginArray[i].slice(0);
                 transformCtr = MathUtils.transformPoint(transformCtr, curMat);
 
+                                console.log( "modifyElements: rotateGlobally, ctr: " + transformCtr );
+
                 tMat[12] = transformCtr[0];
                 tMat[13] = transformCtr[1];
                 tMat[14] = transformCtr[2];
@@ -265,6 +315,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
 
                     viewUtils.pushViewportObj( this.target );
                     var eltCtr = viewUtils.getCenterOfProjection();
+                                        eltCtr[2] = 0;
                     viewUtils.popViewportObj();
 
                     var ctrOffset = this.target.elementModel.props3D.m_transformCtr;
@@ -275,16 +326,18 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                     }
                     
                     this._origin = viewUtils.localToGlobal(eltCtr, this.target);
+                                        //console.log( "Rotate3DToolBase.captureSelectionDrawn _origin: " + this._origin );
                     this._updateTargets();
                     this._setTransformOrigin(false);
                 }
                 else
                 {
                     this.target = this.application.ninja.currentDocument.documentRoot;
-                    this._origin = drawUtils._selectionCtr.slice(0);
-                    this._origin[0] += this.application.ninja.stage.userContentLeft;
-                    this._origin[1] += this.application.ninja.stage.userContentTop;
+                    //this._origin = drawUtils._selectionCtr.slice(0);
+                    //this._origin[0] += this.application.ninja.stage.userContentLeft;
+                    //this._origin[1] += this.application.ninja.stage.userContentTop;
                     this._updateTargets();
+                                        this._origin = this.calculateMultiSelOrigin();
                     this._setTransformOrigin(true);
                 }
             }
@@ -301,17 +354,35 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
         }
     },
 
+        /*
+        _updateHandlesOrigin: {
+                value: function () { }
+        },
+        */
+
     _updateTargets: {
         value: function(addToUndo) {
-            var mod3dObject = [], self = this;
+            var mod3dObject = [],
+                                self = this;
 
             this.application.ninja.selectedElements.forEach(function(element) {
-                viewUtils.pushViewportObj(element);
+                var curMat = viewUtils.getMatrixFromElement(elt);
+                var curMatInv = glmat4.inverse(curMat, []);
+
+                viewUtils.pushViewportObj( elt );
                 var eltCtr = viewUtils.getCenterOfProjection();
                 viewUtils.popViewportObj();
-                eltCtr = viewUtils.localToGlobal(eltCtr, element);
+
+                                // cache the local to global and global to local matrices
+                                var l2gMat = viewUtils.getLocalToGlobalMatrix( elt );
+                                var g2lMat = glmat4.inverse( l2gMat, [] );
+                                eltCtr = MathUtils.transformAndDivideHomogeneousPoint( eltCtr, l2gMat );
 
                 element.elementModel.setProperty("ctr", eltCtr);
+                                element.elementModel.setProperty("mat", curMat);
+                                element.elementModel.setProperty("matInv", curMatInv);
+                                element.elementModel.setProperty("l2g", l2gMat);
+                                element.elementModel.setProperty("g2l", g2lMat);
 
                 if(addToUndo) {
                     var previousMat = element.elementModel.getProperty("mat").slice(0);