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/TranslateObject3DTool.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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

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;
-- 
cgit v1.2.3