From 96bfeee2e6b735b87e8482d6e2cf24d5224c6417 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 5 Apr 2012 17:03:14 -0700
Subject: translate3DObject tool fixes.

---
 js/tools/Translate3DToolBase.js | 7 ++++---
 js/tools/modifier-tool-base.js  | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'js/tools')

diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 4799b840..2276178c 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -71,6 +71,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                 this._delta = delta.slice(0);
             }
 
+			//console.log( "modifyElements delta: " + delta );
             var transMat = Matrix.Translation( delta );
 
             if(this._inLocalMode && (this._targets.length === 1) )
@@ -79,7 +80,6 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
             }
             else
             {
-				console.log( "modifyElements delta: " + delta );
                 this._translateGlobally(transMat);
             }
         }
@@ -148,7 +148,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 	_translateGlobally: {
 		value: function (transMat) {
 			//console.log( "_translateGlobally, transMat: " + transMat );
-			//console.log( "_translateGlobally, startMat: " + this._startMat + ", transMat: " + transMat );
+			//console.log( "_translateGlobally, startMat: " + this._startMat + ", transMat: " + transMat[12] + ", " + transMat[13] + ", " + transMat[14] );
 			var len = this._targets.length,
 				i = 0,
 				item,
@@ -167,7 +167,8 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
 			var shouldUpdateStartMat = true;
 
-			if(this._clickedOnStage)
+			//if (this._clickedOnStage)
+			if(this._clickedOnStage || ((this._handleMode === 2) && (this._targets.length > 1)))
 			{
 				shouldUpdateStartMat = false;
 			}
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 2c9b484e..f9fd001c 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -405,6 +405,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                 var index = this._snapIndex;
                 var pt0;
                 var useViewPoint = (this._inLocalMode && (this._targets.length === 1));
+				//console.log( "useViewPoint: " + useViewPoint );
                 if (this._useQuadPt)
                 {
                     pt0 = this.GetQuadrantPoint(useViewPoint);
@@ -427,6 +428,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                     pt1 = MathUtils.transformPoint( pt1, this._startMat );
                 }
 
+				//console.log( "getMousePoints, useViewPoint: " + useViewPoint + ",  " + pt0 + " => " + pt1 );
                 return {pt0:pt0, pt1:pt1};
             }
             else
-- 
cgit v1.2.3