From dc9650af5760b1f93d6e93a383eabceacfdc0ad8 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 2 Apr 2012 15:40:25 -0700
Subject: Snapping fixes.

---
 js/tools/Translate3DToolBase.js | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'js/tools/Translate3DToolBase.js')

diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 07b6d04d..18e2b610 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);
@@ -134,6 +133,9 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 	// 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 +147,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 +191,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
 				if(shouldUpdateStartMat)
 				{
+                    //console.log(  "\t\tshouldUpdateStartMat" );
 					this._targets[i].mat = curMat;
 				}
 			}
@@ -188,7 +199,9 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 	},
 
     _updateTargets: {
-		value: function(addToUndoStack) {
+		value: function(addToUndoStack)
+        {
+            console.log( "_updateTargets" );
             var newStyles = [],
                 previousStyles = [],
 			    len = this.application.ninja.selectedElements.length;
-- 
cgit v1.2.3