Merge branch 'refs/heads/Snapping_II' into EricMerge

1 files changed, 165 insertions, 90 deletions

diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index e4f1fb99..41dbb3ae 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -71,9 +71,9 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                 this._delta = delta.slice(0);
             }
 
+                        //console.log( "modifyElements delta: " + delta );
             var transMat = Matrix.Translation( delta );
 
-            //console.log( "Translate: " + delta );
             if(this._inLocalMode && (this._targets.length === 1) )
             {
                 this._translateLocally(transMat);
@@ -149,26 +149,28 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
         _translateGlobally: {
                 value: function (transMat) {
-            //console.log( "_translateGlobally, startMat: " + this._startMat + ", transMat: " + transMat );
-            //console.log( "_translateGlobally, transMat: " + transMat );
+                        //console.log( "_translateGlobally, transMat: " + transMat );
+                        //console.log( "_translateGlobally, startMat: " + this._startMat + ", transMat: " + transMat[12] + ", " + transMat[13] + ", " + transMat[14] );
                         var len = this._targets.length,
                                 i = 0,
                                 item,
                                 elt,
                                 curMat = viewUtils.getMatrixFromElement( this._target ),
-                matInv = glmat4.inverse(this._startMat, []),
-                nMat = glmat4.multiply(transMat, this._startMat, [] ),
-                            qMat = glmat4.multiply(matInv, nMat, []);
-           
-            if (this._mode === 1)
-            { 
-                var curInv = glmat4.inverse( curMat, [] );
-                transMat = glmat4.multiply( nMat, curInv, [] );
-            }
+                                matInv = glmat4.inverse(this._startMat, []),
+                                nMat = glmat4.multiply(transMat, this._startMat, [] ),
+                                qMat = glmat4.multiply(matInv, nMat, []);
+                   
+                        if (this._mode === 1)
+                        { 
+                                if (len > 1)  curMat = this._targets[0].mat.slice();
+                                var curInv = glmat4.inverse( curMat, [] );
+                                transMat = glmat4.multiply( nMat, curInv, [] );
+                        }
 
                         var shouldUpdateStartMat = true;
 
-                        if(this._clickedOnStage)
+                        //if (this._clickedOnStage)
+                        if(this._clickedOnStage || ((this._handleMode === 2) && (this._targets.length > 1)))
                         {
                                 shouldUpdateStartMat = false;
                         }
@@ -186,26 +188,25 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 //                              glmat4.multiply(curMat, qMat, curMat);
 //
 //                              viewUtils.setMatrixForElement( elt, curMat, true);
-                curMat[12] += transMat[12];
-                curMat[13] += transMat[13];
-                curMat[14] += transMat[14];
-                viewUtils.setMatrixForElement( elt, curMat, true);
+                                curMat[12] += transMat[12];
+                                curMat[13] += transMat[13];
+                                curMat[14] += transMat[14];
+                                viewUtils.setMatrixForElement( elt, curMat, true);
 
                                 if(shouldUpdateStartMat)
                                 {
-                    //console.log(  "\t\tshouldUpdateStartMat" );
+                                        //console.log(  "\t\tshouldUpdateStartMat" );
                                         this._targets[i].mat = curMat;
                                 }
                         }
                 }
         },
 
-    _updateTargets: {
+        _updateTargets: {
                 value: function(addToUndoStack) {
-//            console.log( "_updateTargets" );
-            var newStyles = [],
-                previousStyles = [],
-                            len = this.application.ninja.selectedElements.length;
+                        var newStyles = [],
+                                previousStyles = [],
+                                len = this.application.ninja.selectedElements.length;
                         this._targets = [];
                         for(var i = 0; i < len; i++)
                         {
@@ -215,47 +216,47 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                                 var curMatInv = glmat4.inverse(curMat, []);
 
                                 this._targets.push({elt:elt, mat:curMat, matInv:curMatInv});
-                if(addToUndoStack)
-                {
-                    var previousStyleStr = {dist:this._undoArray[i].dist, mat:MathUtils.scientificToDecimal(this._undoArray[i].mat.slice(0), 5)};
+                                if(addToUndoStack)
+                                {
+                                        var previousStyleStr = {dist:this._undoArray[i].dist, mat:MathUtils.scientificToDecimal(this._undoArray[i].mat.slice(0), 5)};
 
-                    var newStyleStr = {dist:viewUtils.getPerspectiveDistFromElement(elt), mat:MathUtils.scientificToDecimal(curMat, 5)};
+                                        var newStyleStr = {dist:viewUtils.getPerspectiveDistFromElement(elt), mat:MathUtils.scientificToDecimal(curMat, 5)};
 
-                    previousStyles.push(previousStyleStr);
-                    newStyles.push(newStyleStr);
-                }
+                                        previousStyles.push(previousStyleStr);
+                                        newStyles.push(newStyleStr);
+                                }
                         }
                         if(addToUndoStack)
                         {
-                ElementsMediator.set3DProperties(this.application.ninja.selectedElements,
-                                                newStyles,
-                                                "Change",
-                                                "translateTool",
-                                                previousStyles
-                                              );
-                if(this._origin && this._delta)
-                {
-                    if(this._handleMode !== null)
-                    {
-                        this._origin[this._handleMode] += this._delta;
-                    }
-                    else
-                    {
-                        this._origin[0] += this._delta[0];
-                        this._origin[1] += this._delta[1];
-                    }
-                }
-                this._delta = null;
-            }
-            // Save previous value for undo/redo
-            this._undoArray = [];
-            for(i = 0, len = this._targets.length; i < len; i++)
-            {
-                var elt = this._targets[i].elt;
-                var _mat = viewUtils.getMatrixFromElement(elt);
-                var _dist = viewUtils.getPerspectiveDistFromElement(elt);
-                this._undoArray.push({mat:_mat, dist:_dist});
-            }
+                                ElementsMediator.set3DProperties(this.application.ninja.selectedElements,
+                                                                                                newStyles,
+                                                                                                "Change",
+                                                                                                "translateTool",
+                                                                                                previousStyles
+                                                                                          );
+                                if(this._origin && this._delta)
+                                {
+                                        if(this._handleMode !== null)
+                                        {
+                                                this._origin[this._handleMode] += this._delta;
+                                        }
+                                        else
+                                        {
+                                                this._origin[0] += this._delta[0];
+                                                this._origin[1] += this._delta[1];
+                                        }
+                                }
+                                this._delta = null;
+                        }
+                        // Save previous value for undo/redo
+                        this._undoArray = [];
+                        for(i = 0, len = this._targets.length; i < len; i++)
+                        {
+                                var elt = this._targets[i].elt;
+                                var _mat = viewUtils.getMatrixFromElement(elt);
+                                var _dist = viewUtils.getPerspectiveDistFromElement(elt);
+                                this._undoArray.push({mat:_mat, dist:_dist});
+                        }
 
                 }
         },
@@ -295,42 +296,113 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                                         viewUtils.popViewportObj();
                                         ctr[2] = 0;
 
-//                                      var ctrOffset = item.elementModel.props3D.m_transformCtr;
-//                                      if(ctrOffset)
-//                                      {
-//                                              ctr = vecUtils.vecAdd(3, ctr, ctrOffset);
-//                                      }
-
                                         this._origin = viewUtils.localToGlobal(ctr, item);
                                 }
                                 else
                                 {
-                    if(this._origin)
-                    {
-                        if(this._delta)
-                        {
-                            if(this._handleMode !== null)
-                            {
-//                                this._origin[this._handleMode] = this._delta;
-                            }
-                            else
-                            {
-                                this._origin[0] += this._delta[0];
-                                this._origin[1] += this._delta[1];
-                            }
-                        }
-                    }
+                                        this._origin = undefined;
+                                        this._origin = this.calculateMultiSelOrigin();
+                                }
+                        }
+                }
+        },
+
+    captureSelectionDrawn: {
+        value: function(event){
+            this._origin = null;
+            this._targets = [];
+            this._startOriginArray = null;
+
+            var len = this.application.ninja.selectedElements.length;
+            if(len)