Merge branch 'refs/heads/Ninja-Internal' into Document

1 files changed, 20 insertions, 13 deletions

diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index 60633e74..8edf1fee 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -4,18 +4,28 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var Translate3DToolBase = require("js/tools/Translate3DToolBase").Translate3DToolBase,
+var Montage = require("montage/core/core").Montage,
+    Translate3DToolBase = require("js/tools/Translate3DToolBase").Translate3DToolBase,
     drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
+    vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
     viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
     snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
 
-exports.TranslateObject3DTool = Object.create(Translate3DToolBase, {
+exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
     _toolID: { value: "translateObject3DTool" },
     _canOperateOnStage: { value: true },
 
+    _initializeToolHandles: {
+        value: function() {
+            this._inLocalMode = (this.options.selectedMode === "rotateLocally");
+        }
+    },
+
     initializeSnapping : {
         value : function(event)
         {
+//            console.log( "initializeSnapping" );
+
                         this._mouseDownHitRec = null;
                         this._mouseUpHitRec   = null;
 
@@ -37,8 +47,6 @@ exports.TranslateObject3DTool = Object.create(Translate3DToolBase, {
             
             if(this._handleMode === null)
             {
-//                this.doSelection(event);
-
                 snapManager.enableElementSnap   ( true  );
                                 snapManager.enableGridSnap              ( true  );
             }
@@ -107,16 +115,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 +134,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;