From 1f2d84716ddca3cfc9e5457f67ec1b007b3455a8 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 18 Apr 2012 15:48:20 -0700
Subject: Moving initialzeSnapping routine from RotateObject3DTool tool to
 Rotate3DToolBase so Rotate Stage uses the same code.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/tools/Rotate3DToolBase.js   | 143 +++++++++++++++++++++++++++++++++++++++++
 js/tools/RotateObject3DTool.js | 142 ----------------------------------------
 2 files changed, 143 insertions(+), 142 deletions(-)

diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index 04bdc946..4fa8657e 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -25,6 +25,149 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
         value: false
     },
 
+    initializeSnapping : {
+        value : function(event)
+        {
+//            console.log( "initializeSnapping" );
+
+            var selectedElements = this.application.ninja.selectedElements;
+            if(this.rotateStage) {
+                selectedElements = [this.application.ninja.currentDocument.documentRoot];
+            }
+
+			this._mouseDownHitRec = null;
+			this._mouseUpHitRec   = null;
+
+			snapManager.clearAvoidList();
+			snapManager.clearDragPlane();
+
+			// the translate tool does snap align to the bounds of the object only.
+			// turn off snap align to the cursor.  This needs to be re-enabled in the mouse up method
+			snapManager.enableSnapAlign( false );
+
+			// snap to element and snap to grid are conditionally enabled based
+			// on the snap results of the mouse down.  enable everything for the first snap
+			this._snapToElements = snapManager.elementSnapEnabledAppLevel();
+			this._snapToGrid = snapManager.gridSnapEnabledAppLevel();
+
+            this._dragPlane = null;
+            this._clickedOnStage = false;
+            var do3DSnap = true;
+
+            if(this._handleMode === null)
+            {
+                snapManager.enableElementSnap	( true	);
+				snapManager.enableGridSnap		( true	);
+            }
+//            else
+//            {
+//                this._delta = null;
+                // special case for z-translation
+//                if(this._handleMode === 0)
+//                {
+//                    this._dragPlane = viewUtils.getNormalToUnprojectedElementPlane(this._target);
+//                    snapManager.setupDragPlaneFromPlane(this._dragPlane);
+//                    do3DSnap = false;
+
+//                    snapManager.enableElementSnap	( false	);
+//                    snapManager.enableGridSnap		( false );
+//                }
+//            }
+
+            if (selectedElements.length)
+            {
+                var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
+                                                                new WebKitPoint(event.pageX, event.pageY));
+
+				// do the snap before setting up the avoid list to allow
+				// a snap on the mouse down
+				var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
+
+//                if(this._handleMode === 2)
+//                {
+//                    // translate z doesn't snap to element so hitRec's element will always be different
+//                    // from what the browser says we clicked on. So, skip this check.
+//                }
+//                else
+//                {
+//                    // Check that hitRec's element matches element that browser says we clicked on
+//                    // TODO - This is still not working when using a handle that is on top of an
+//                    // element that is not currently selected
+//                    var elt = this.application.ninja.stage.GetSelectableElement(event);
+//                    if(elt && (elt !== hitRec.getElement()))
+//                    {
+//                        hitRec = snapManager.findHitRecordForElement(elt);
+//                    }
+//                    if(elt === this.application.ninja.currentSelectedContainer)
+//                    {
+//                        this._clickedOnStage = true;
+//                    }
+//                }
+
+                // we don't want to snap to selected objects during the drag
+//                var len = this._targets.length;
+//                for(var i=0; i<len; i++)
+//                {
+//                    snapManager.addToAvoidList( this._targets[i].elt );
+//                }
+				if (hitRec)
+				{
+					// disable snap attributes
+					if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT)
+					{
+						this._snapToElements = false;
+						this._snapToGrid = false;
+					}
+					else if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_CENTER)
+					{
+						snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
+					}
+
+                    if(this._handleMode === 0)
+                        this.clickedObject = this._target;
+
+                    // parameterize the snap point on the target
+                    this._snapParam = this.parameterizeSnap( hitRec );
+
+                    if(!this._dragPlane)
+                    {
+                        if (selectedElements.length === 1)
+                        {
+                            this._dragPlane = viewUtils.getUnprojectedElementPlane(this._clickedObject);
+                            snapManager.setupDragPlaneFromPlane(this._dragPlane);
+                        }
+                        else
+                        {
+                            this._dragPlane = snapManager.setupDragPlanes( hitRec, true );
+                        }
+
+                    }
+
+                    // no quadrant snapping for the rotate tool
+                    this._shouldUseQuadPt = false;
+
+					var wpHitRec = hitRec.convertToWorkingPlane( this._dragPlane );
+					this._mouseDownHitRec = wpHitRec;
+					this._mouseUpHitRec = null;
+
+					var pt = hitRec.getScreenPoint();
+					this.downPoint.x = pt[0];
+					this.downPoint.y = pt[1];
+					this.downPoint.z = pt[2];
+
+                    // TODO - need to figure out snapManager dependency by drawUtils.
+                    // For now, bypassing by calling snapManager.drawLastHit();
+//					drawUtils.refreshDisplay();
+//                    snapManager.drawLastHit();
+				}
+            }
+            else
+            {
+                this.target = null;
+            }
+        }
+    },
+
     drawWithoutSnapping:
     {
         value: function(event)
diff --git a/js/tools/RotateObject3DTool.js b/js/tools/RotateObject3DTool.js
index c1ddb286..ec2fcc0c 100755
--- a/js/tools/RotateObject3DTool.js
+++ b/js/tools/RotateObject3DTool.js
@@ -58,148 +58,6 @@ exports.RotateObject3DTool = Montage.create(Rotate3DToolBase, {
         }
     },
 
-    initializeSnapping : {
-        value : function(event)
-        {
-//            console.log( "initializeSnapping" );
-
-            var selectedElements = this.application.ninja.selectedElements;
-            if(this.rotateStage) {
-                selectedElements = [this.application.ninja.currentDocument.documentRoot];
-            }
-
-			this._mouseDownHitRec = null;
-			this._mouseUpHitRec   = null;
-
-			snapManager.clearAvoidList();
-			snapManager.clearDragPlane();
-
-			// the translate tool does snap align to the bounds of the object only.
-			// turn off snap align to the cursor.  This needs to be re-enabled in the mouse up method
-			snapManager.enableSnapAlign( false );
-
-			// snap to element and snap to grid are conditionally enabled based
-			// on the snap results of the mouse down.  enable everything for the first snap
-			this._snapToElements = snapManager.elementSnapEnabledAppLevel();
-			this._snapToGrid = snapManager.gridSnapEnabledAppLevel();
-
-            this._dragPlane = null;
-            this._clickedOnStage = false;
-            var do3DSnap = true;
-            
-            if(this._handleMode === null)
-            {
-                snapManager.enableElementSnap	( true	);
-				snapManager.enableGridSnap		( true	);
-            }
-//            else
-//            {
-//                this._delta = null;
-                // special case for z-translation
-//                if(this._handleMode === 0)
-//                {
-//                    this._dragPlane = viewUtils.getNormalToUnprojectedElementPlane(this._target);
-//                    snapManager.setupDragPlaneFromPlane(this._dragPlane);
-//                    do3DSnap = false;
-
-//                    snapManager.enableElementSnap	( false	);
-//                    snapManager.enableGridSnap		( false );
-//                }
-//            }
-
-            if (selectedElements.length)
-            {
-                var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
-                                                                new WebKitPoint(event.pageX, event.pageY));
-
-				// do the snap before setting up the avoid list to allow
-				// a snap on the mouse down
-				var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
-
-//                if(this._handleMode === 2)
-//                {
-//                    // translate z doesn't snap to element so hitRec's element will always be different
-//                    // from what the browser says we clicked on. So, skip this check.
-//                }
-//                else
-//                {
-//                    // Check that hitRec's element matches element that browser says we clicked on
-//                    // TODO - This is still not working when using a handle that is on top of an
-//                    // element that is not currently selected
-//                    var elt = this.application.ninja.stage.GetSelectableElement(event);
-//                    if(elt && (elt !== hitRec.getElement()))
-//                    {
-//                        hitRec = snapManager.findHitRecordForElement(elt);
-//                    }
-//                    if(elt === this.application.ninja.currentSelectedContainer)
-//                    {
-//                        this._clickedOnStage = true;
-//                    }
-//                }
-
-                // we don't want to snap to selected objects during the drag
-//                var len = this._targets.length;
-//                for(var i=0; i<len; i++)
-//                {
-//                    snapManager.addToAvoidList( this._targets[i].elt );
-//                }
-				if (hitRec)
-				{
-					// disable snap attributes
-					if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT)
-					{
-						this._snapToElements = false;
-						this._snapToGrid = false;
-					}
-					else if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_CENTER)
-					{
-						snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
-					}
-
-                    if(this._handleMode === 0)
-                        this.clickedObject = this._target;
-
-                    // parameterize the snap point on the target
-                    this._snapParam = this.parameterizeSnap( hitRec );
-
-                    if(!this._dragPlane)
-                    {
-                        if (selectedElements.length === 1)
-                        {
-                            this._dragPlane = viewUtils.getUnprojectedElementPlane(this._clickedObject);
-                            snapManager.setupDragPlaneFromPlane(this._dragPlane);
-                        }
-                        else
-                        {
-                            this._dragPlane = snapManager.setupDragPlanes( hitRec, true );
-                        }
-
-                    }
-
-                    // no quadrant snapping for the rotate tool
-                    this._shouldUseQuadPt = false;
-
-					var wpHitRec = hitRec.convertToWorkingPlane( this._dragPlane );
-					this._mouseDownHitRec = wpHitRec;
-					this._mouseUpHitRec = null;
-
-					var pt = hitRec.getScreenPoint();
-					this.downPoint.x = pt[0];
-					this.downPoint.y = pt[1];
-					this.downPoint.z = pt[2];
-
-                    // TODO - need to figure out snapManager dependency by drawUtils.
-                    // For now, bypassing by calling snapManager.drawLastHit();
-//					drawUtils.refreshDisplay();
-//                    snapManager.drawLastHit();
-				}
-            }
-            else
-            {
-                this.target = null;
-            }
-        }
-    },
     _handleToolOptionsChange: {
         value: function(event) {
             this._inLocalMode = event.detail.mode;
-- 
cgit v1.2.3