6 files changed, 494 insertions, 126 deletions

diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index 696408bf..d08b3a31 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -14,7 +14,8 @@ var Montage = require("montage/core/core").Montage,
     viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
     vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
     drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
-    ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
+    ElementsMediator = require("js/mediators/element-mediator").ElementMediator,
+        Rectangle = require("js/helper-classes/3D/rectangle").Rectangle;
 
 exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
         _canSnap: { value: false },
@@ -42,6 +43,33 @@ 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,
@@ -53,20 +81,31 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
             {
                 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;
+                    // 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)
                     {
-                        this._startOriginArray[0][0] += dx;
-                        this._startOriginArray[0][1] += dy;
+                                                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,8 +172,10 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 }
             }
 
+
             if(this._inLocalMode && (this._targets.length === 1) )
             {
+                                console.log( "modifyElements: rotateLocally " );
                 this._rotateLocally(mat);
             }
             else
@@ -159,6 +200,8 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 // 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];
@@ -198,6 +241,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];
@@ -267,6 +312,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;
@@ -277,17 +323,19 @@ 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._setTransformOrigin(true);
+                                        this._origin = this.calculateMultiSelOrigin();
+                                        this._setTransformOrigin(true);
                 }
             }
             else
@@ -303,8 +351,15 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
         }
     },
 
+        /*
+        _updateHandlesOrigin: {
+                value: function () { }
+        },
+        */
+
     _updateTargets: {
         value: function(addToUndoStack) {
+                        console.log( "Rotate3DToolBase._updateTargets" );
             var newStyles = [],
                 previousStyles = [],
                 len = this.application.ninja.selectedElements.length;
@@ -322,10 +377,14 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 var eltCtr = viewUtils.getCenterOfProjection();
                 viewUtils.popViewportObj();
 
-                eltCtr = viewUtils.localToGlobal(eltCtr, elt);
+                                // 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 );
 
-                this._targets.push({elt:elt, mat:curMat, matInv:curMatInv, ctr:eltCtr});
-                if(addToUndoStack)
+                this._targets.push({elt:elt, mat:curMat, matInv:curMatInv, ctr:eltCtr,  l2g:l2gMat,  g2l:g2lMat});
+                
+                                if(addToUndoStack)
                 {
                     var previousStyleStr = {dist:this._undoArray[i].dist, mat:MathUtils.scientificToDecimal(this._undoArray[i].mat.slice(0), 5)};
 
@@ -356,12 +415,54 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
         }
     },
 
+        calculateMultiSelOrigin: 
+        {
+                value: function()
+                {
+                        var minPt,  maxPt, i,j;
+                        this._startOriginArray = [];
+                        var len = this.application.ninja.selectedElements.length;
+                        for (i = 0; i < len; i++)
+                        {