From 16f62ca09cc428043e8fef8bdeea11a989e62bc0 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 4 Apr 2012 16:29:16 -0700
Subject: Cap fix for vecUtils.

---
 js/tools/TranslateObject3DTool.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index 7163f005..867bec7f 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -7,6 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Translate3DToolBase = require("js/tools/Translate3DToolBase").Translate3DToolBase,
     drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
     viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
+    vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
     snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
 
 exports.TranslateObject3DTool = Object.create(Translate3DToolBase, {
@@ -128,7 +129,7 @@ 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);
+                    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 );
-- 
cgit v1.2.3


From f91e64235eb03c889ff4f5577c3e3480cd0d787f Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 13 Apr 2012 00:30:19 -0700
Subject: removing _undo array and _targets array and use object instead of
 matching arrays to set properties

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/tools/TranslateObject3DTool.js | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

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

diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index 8edf1fee..74df6c14 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -65,10 +65,8 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
                 }
             }
 
-            if(this._targets)
-            {
-                var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
-                                                                new WebKitPoint(event.pageX, event.pageY));
+            if(this.application.ninja.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
@@ -96,11 +94,10 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
                 }
 
                 // 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 );
-                }
+                this.application.ninja.selectedElements.forEach(function(element) {
+                    snapManager.addToAvoidList(element);
+                });
+
 				if (hitRec)
 				{
 					// disable snap attributes
@@ -122,7 +119,7 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
 
                     if(!this._dragPlane)
                     {
-                        if( this._inLocalMode && (this._targets.length === 1) )
+                        if( this._inLocalMode && (this.application.ninja.selectedElements.length === 1) )
                         {
                             this._dragPlane = viewUtils.getUnprojectedElementPlane(this._clickedObject);
                             snapManager.setupDragPlaneFromPlane(this._dragPlane);
-- 
cgit v1.2.3