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/modifier-tool-base.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'js/tools/modifier-tool-base.js')

diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 94b806fd..07b28747 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;
@@ -517,7 +525,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 );
 
@@ -806,6 +814,8 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
     HandleLeftButtonDown: {
         value: function(event) {
 
+            console.log( "modifier-tool-base.HandleLeftButtonDown" );
+
             var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
             this.downPoint.x = point.x;
             this.downPoint.y = point.y;
-- 
cgit v1.2.3