Merge branch 'refs/heads/NINJAmaster' into TimelineUber

1 files changed, 26 insertions, 12 deletions

diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 4dca6313..e4f1fb99 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -29,6 +29,8 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
     modifyElements : {
                 value : function(data, event)
         {
+            //console.log( "modifyElements, data: " + data.pt0 + " => " + data.pt1 );
+
             // form the translation vector and post translate the matrix by it.
             var delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 );
             if(this._handleMode !== null)
@@ -66,15 +68,12 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                     delta[0] = 0;
                     delta[1] = 0;
                 }
-                else
-                {
-                    delta[2] = 0;
-                }
                 this._delta = delta.slice(0);
             }
 
             var transMat = Matrix.Translation( delta );
 
+            //console.log( "Translate: " + delta );
             if(this._inLocalMode && (this._targets.length === 1) )
             {
                 this._translateLocally(transMat);
@@ -91,22 +90,21 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                 value : function()
                 {
             var item,
-                elt,
                 mat,
                 dist,
                 newStyles = [],
                 previousStyles = [],
-                len = this._targets.length;
+                len = this.application.ninja.selectedElements.length;
             for(var i = 0; i < len; i++)
             {
                 // Reset to the identity matrix but retain the rotation values
-                item = this._targets[i];
-                mat = item.mat.slice(0);
+                item = this.application.ninja.selectedElements[i];
+                mat = ElementsMediator.getMatrix(item);
                 mat[12] = 0;
                 mat[13] = 0;
                 mat[14] = 0;
 
-                dist = this._undoArray[i].dist;
+                dist = ElementsMediator.getPerspectiveDist(item);
 
                 var previousStyleStr = {dist:dist, mat:item.mat};
 
@@ -126,14 +124,20 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                         this.isDrawing = false;
             this.endDraw(event);
 
-//                      this.UpdateSelection(true);
-                        this.Configure(true);
+
+            // Need to force stage to draw immediately so the new selection center is calculated
+            this.application.ninja.stage.draw();
+            // And captureSelectionDrawn to draw the transform handles
+            this.captureSelectionDrawn(null);
                 }
         },
 
         // We will only translate single elements locally
         _translateLocally: {
                 value: function (transMat) {
+            //console.log( "_translateLocally, startMat: " + this._startMat );
+            //console.log( "_translateLocally, transMat: " + transMat );
+            //console.log( "_translateLocally, startMat: " + this._startMat + ", transMat: " + transMat );
                         var mat = glmat4.multiply(this._startMat, transMat, []);
                         viewUtils.setMatrixForElement( this._target, mat, true );
                         if(this._mode !== 1)
@@ -145,14 +149,22 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
         _translateGlobally: {
                 value: function (transMat) {
+            //console.log( "_translateGlobally, startMat: " + this._startMat + ", transMat: " + transMat );
+            //console.log( "_translateGlobally, transMat: " + transMat );
                         var len = this._targets.length,
                                 i = 0,
                                 item,
                                 elt,
-                                curMat,
+                                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, [] );
+            }
 
                         var shouldUpdateStartMat = true;
 
@@ -181,6 +193,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
                                 if(shouldUpdateStartMat)
                                 {
+                    //console.log(  "\t\tshouldUpdateStartMat" );
                                         this._targets[i].mat = curMat;
                                 }
                         }
@@ -189,6 +202,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
     _updateTargets: {
                 value: function(addToUndoStack) {
+//            console.log( "_updateTargets" );
             var newStyles = [],
                 previousStyles = [],
                             len = this.application.ninja.selectedElements.length;