3 files changed, 41 insertions, 15 deletions

diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 005b9749..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)
@@ -71,6 +73,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
             var transMat = Matrix.Translation( delta );
 
+            //console.log( "Translate: " + delta );
             if(this._inLocalMode && (this._targets.length === 1) )
             {
                 this._translateLocally(transMat);
@@ -130,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)
@@ -141,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;
 
@@ -177,6 +191,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
                                 if(shouldUpdateStartMat)
                                 {
+                    //console.log(  "\t\tshouldUpdateStartMat" );
                                         this._targets[i].mat = curMat;
                                 }
                         }
@@ -184,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;
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index 60633e74..7163f005 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -16,6 +16,8 @@ exports.TranslateObject3DTool = Object.create(Translate3DToolBase, {
     initializeSnapping : {
         value : function(event)
         {
+            console.log( "initializeSnapping" );
+
                         this._mouseDownHitRec = null;
                         this._mouseUpHitRec   = null;
 
@@ -37,8 +39,6 @@ exports.TranslateObject3DTool = Object.create(Translate3DToolBase, {
             
             if(this._handleMode === null)
             {
-//                this.doSelection(event);
-
                 snapManager.enableElementSnap   ( true  );
                                 snapManager.enableGridSnap              ( true  );
             }
@@ -107,16 +107,10 @@ exports.TranslateObject3DTool = Object.create(Translate3DToolBase, {
                                         }
 
                     if(this._handleMode === 2)
-                    {
-                        // TODO - not sure how to parameterize point in z-translate mode
                         this.clickedObject = this._target;
-                        this._snapParam = [0, 0, 0];
-                    }
-                    else
-                    {
-                        // parameterize the snap point on the target
-                        this._snapParam = this.parameterizeSnap( hitRec );
-                    }
+
+                    // parameterize the snap point on the target
+                    this._snapParam = this.parameterizeSnap( hitRec );
 
                     if(!this._dragPlane)
                     {
@@ -132,6 +126,11 @@ exports.TranslateObject3DTool = Object.create(Translate3DToolBase, {
 
                     }
 
+                    // only do quadrant snapping if the 4 corners of the element are in the drag plane
+                    
+                    var sign = MathUtils.fpSign( VecUtils.vecDot(3,this._dragPlane,[0,0,1]) + this._dragPlane[3] - 1.0);
+                     this._shouldUseQuadPt = (sign == 0);
+
                                         var wpHitRec = hitRec.convertToWorkingPlane( this._dragPlane );
                                         this._mouseDownHitRec = wpHitRec;
                                         this._mouseUpHitRec = null;
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index a1812650..5f2d29be 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -25,6 +25,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
         _snapParam: { value: null },
         _snapIndex: { value: -1 },
         _useQuadPt: { value: false },
+    _shouldUseQuadPt: { value: false },
 
         // we set snapping capabilities depending on the tool.
         // The following variables are set in a tool's initializeSnapping method called on mouse down.
@@ -175,6 +176,10 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
 //                        }
                     }
 
+                    // only do quadrant snapping if the 4 corners of the element are in the drag plane
+                    var sign = MathUtils.fpSign( VecUtils.vecDot(3,this._dragPlane,[0,0,1]) + this._dragPlane[3] - 1.0);
+                    this._shouldUseQuadPt = (sign == 0)
+
                                         var wpHitRec = hitRec.convertToWorkingPlane( this._dragPlane );
                                         this._mouseDownHitRec = wpHitRec;
                                         this._mouseUpHitRec = null;
@@ -236,6 +241,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                                 }
                         }
 
+            //console.log( "ParameterizeSnap: " + paramPt );
                         return paramPt;
                 }
         },
@@ -284,14 +290,16 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                                         y = x0 + ty*dy,
                                         z = 0.0;
                                 var localPt = [x,y,z];
+
                                 globalPt = viewUtils.localToGlobal( localPt,  elt );
  
                                 // add in the delta
                                 var hitPt = this.GetObjectHitPoint();
                                 var scrPt = viewUtils.localToGlobal( hitPt, this._clickedObject );
-                                var delta = [xEvent-scrPt[0], yEvent-scrPt[1]];
+                                var delta = [xEvent-scrPt[0], yEvent-scrPt[1], 0-scrPt[2]];
                                 globalPt[0] += delta[0];
                                 globalPt[1] += delta[1];
+                globalPt[2] += delta[2];
                         }
 
                         return globalPt;
@@ -518,7 +526,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
 
                         // do the snap
                         var quadPt;
-                        if (mouseIsDown)
+                        if (mouseIsDown && !do3DSnap && this._shouldUseQuadPt && (this._handleMode === null) && (this._mode === 0))
                                 quadPt = this.GetQuadrantSnapPoint(x,y);
                         var hitRec = snapManager.snap(x, y, do3DSnap, quadPt );
 
@@ -812,6 +820,8 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {