From 2346d8ab9db06573d8672c64988c46b6c672e015 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 6 Mar 2012 11:28:16 -0800
Subject: Create drag plane parallel to working plane and offset by where the
 user clicked in z.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/helper-classes/3D/snap-manager.js | 12 ++++++++++--
 js/tools/SelectionTool.js            |  9 ++++-----
 js/tools/Translate3DToolBase.js      |  1 -
 js/tools/TranslateObject3DTool.js    |  2 +-
 js/tools/modifier-tool-base.js       |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 596ba56a..5eef8b5c 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1990,12 +1990,20 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 	},
 
 	setupDragPlanes : {
-		value: function( hitRec ) {
+		value: function( hitRec, inGlobalMode ) {
 			// get the location of the point in stage world space
 			var elt = hitRec.getElt();
 			var localPt = hitRec.getLocalPoint();
 			var planeMat = hitRec.getPlaneMatrix();
-			var stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat),  elt );
+            var stageWorldPt;
+            if(inGlobalMode)
+            {
+                stageWorldPt = MathUtils.transformPoint(localPt,planeMat);
+            }
+            else
+            {
+                stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat),  elt );
+            }
 
 			/*
 			 // get a working plane parallel to the current working plane through the stage world point
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 7eee761d..13a04944 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -16,6 +16,7 @@ var Montage = require("montage/core/core").Montage,
 var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
     drawingFeedback: { value: { mode: "Draw2D", type: "" } },
 
+    _inLocalMode: { value: false},      // This tool should always use global mode for translations
     _canOperateOnStage: { value: true},
     _isSelecting: {value: false, writable:true},
     _shiftMove: { value: 10},
@@ -34,14 +35,12 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
         value: function () {
             if(this._targets && this._targets.length)
             {
-                // TODO - drawUtils's elementPlanes check in drawSelectionBounds doesn't seem to work,
-                // so temporary workaround to simply check if all elements have identity matrix
-                // TODO - Eventually, this should instead check if all the selected items are on the view plane
                 var len = this._targets.length;
+                var plane = this.application.ninja.stage.stageDeps.snapManager.getDragPlane();
                 for(var i = 0; i < len; i++)
                 {
-                    var mat = this._targets[i].mat;
-                    if(!MathUtils.isIdentityMatrix(mat))
+                    var elt = this._targets[i].elt;
+                    if(!this.application.ninja.stage.stageDeps.snapManager.elementIsOnPlane(elt, plane))
                     {
                         return false;
                     }
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 3d9191da..24a68ad1 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -10,7 +10,6 @@ Subclass TranslateObject3DTool will translate the object that was clicked.
 var Montage = require("montage/core/core").Montage,
     ModifierToolBase = require("js/tools/modifier-tool-base").ModifierToolBase,
     toolHandleModule = require("js/stage/tool-handle"),
-    snapManager = require("js/helper-classes/3D/snap-manager").SnapManager,
     viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
     vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
     drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index 5157e39c..92b9b2f7 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -103,7 +103,7 @@ exports.TranslateObject3DTool = Object.create(Translate3DToolBase, {
                         }
                         else
                         {
-                            this._dragPlane = snapManager.setupDragPlanes( hitRec );
+                            this._dragPlane = snapManager.setupDragPlanes( hitRec, true );
                         }
 
                     }
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 7e950b03..80f7d758 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -171,7 +171,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
 //                        }
 //                        else
 //                        {
-                            this._dragPlane = snapManager.setupDragPlanes( hitRec );
+                            this._dragPlane = snapManager.setupDragPlanes( hitRec, true );
 //                        }
                     }
 
-- 
cgit v1.2.3