Snapping fixes.

4 files changed, 41 insertions, 89 deletions

diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index e839e229..1848218d 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -140,76 +140,6 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
                 this.importMaterialsJSON( jObj.materials );
         };
 
-        this.export = function() {
-                var rtnStr = "type: " + this.geomType() + "\n";
-
-                rtnStr += "xoff: "                      + this._xOffset         + "\n";
-                rtnStr += "yoff: "                      + this._yOffset         + "\n";
-                rtnStr += "width: "                     + this._width           + "\n";
-                rtnStr += "height: "            + this._height          + "\n";
-                rtnStr += "xAdj: "                  + this._xAdj                + "\n";
-                rtnStr += "yAdj: "                  + this._yAdj                + "\n";
-                rtnStr += "strokeWidth: "       + this._strokeWidth     + "\n";
-
-        if(this._strokeColor.gradientMode) {
-            rtnStr += "strokeGradientMode: "    + this._strokeColor.gradientMode        + "\n";
-            rtnStr += "strokeColor: " + this.gradientToString(this._strokeColor.color) + "\n";
-        } else {
-            rtnStr += "strokeColor: "   + String(this._strokeColor)  + "\n";
-        }
-
-                rtnStr += "strokeStyle: "       + this._strokeStyle     + "\n";
-                rtnStr += "slope: "             + String(this._slope)   + "\n";
-
-                rtnStr += "strokeMat: ";
-                if (this._strokeMaterial) {
-                        rtnStr += this._strokeMaterial.getName();
-        } else {
-                        rtnStr +=  MaterialsModel.getDefaultMaterialName();
-        }
-
-                rtnStr += "\n";
-                return rtnStr;
-        };
-
-        this.import = function( importStr ) {
-                this._xOffset                   = Number( this.getPropertyFromString( "xoff: ",                 importStr )  );
-                this._yOffset                   = Number( this.getPropertyFromString( "yoff: ",                 importStr )  );
-                this._width                             = Number( this.getPropertyFromString( "width: ",                importStr )  );
-                this._height                    = Number( this.getPropertyFromString( "height: ",               importStr )  );
-                this._xAdj                          = Number( this.getPropertyFromString( "xAdj: ",                     importStr )  );
-                this._yAdj                          = Number( this.getPropertyFromString( "yAdj: ",                     importStr )  );
-                this._strokeWidth               = Number( this.getPropertyFromString( "strokeWidth: ",  importStr )  );
-                var slope                       = this.getPropertyFromString( "slope: ",        importStr );
-
-                if(isNaN(Number(slope))) {
-                        this._slope                 = slope;
-        } else {
-                        this._slope         = Number(slope);
-        }
-
-                var strokeMaterialName  = this.getPropertyFromString( "strokeMat: ",    importStr );
-                this._strokeStyle               = this.getPropertyFromString( "strokeStyle: ",  importStr );
-
-        if(importStr.indexOf("strokeGradientMode: ") < 0)
-        {
-            this._strokeColor           =  eval( "[" + this.getPropertyFromString( "strokeColor: ",     importStr ) + "]" );
-        } else {
-            this._strokeColor = {};
-            this._strokeColor.gradientMode = this.getPropertyFromString( "strokeGradientMode: ",        importStr );
-            this._strokeColor.color = this.stringToGradient(this.getPropertyFromString( "strokeColor: ",        importStr ));
-        }
-
-                var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
-                if (!strokeMat) {
-                        console.log( "object material not found in library: " + strokeMaterialName );
-                        strokeMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
-                }
-
-                this._strokeMaterial = strokeMat;
-
-        };
-
         ///////////////////////////////////////////////////////////////////////
         // Methods
         ///////////////////////////////////////////////////////////////////////
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;
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 );