1 files changed, 32 insertions, 21 deletions

diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 80f7d758..de73c861 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -9,8 +9,8 @@ var Montage = require("montage/core/core").Montage,
     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,
-    Properties3D = ("js/models/properties-3d").Properties3D;
+    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;
+//    Properties3D = ("js/models/properties-3d").Properties3D;
 
 exports.ModifierToolBase = Montage.create(DrawingTool, {
 
@@ -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.
@@ -134,7 +135,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                                 var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
 
                 // TODO - Check that hitRec's element matches element that browser says we clicked on
-                var elt = this.application.ninja.stage.GetElement(event);
+                var elt = this.application.ninja.stage.GetSelectableElement(event);
                 if(elt !== hitRec.getElement())
                 {
                     hitRec = snapManager.findHitRecordForElement(elt);
@@ -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;
@@ -448,6 +456,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
             {
                 this.isDrawing = true;
                 this.application.ninja.stage.showSelectionBounds = false;
+                this._updateTargets();
 
                 if(this._canSnap)
                 {
@@ -517,7 +526,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 );
 
@@ -552,6 +561,9 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
 
                     // update the target
                     this._mouseUpHitRec = hitRec;
+                    var pt = hitRec.getScreenPoint();
+                    this.upPoint.x = pt[0];
+                    this.upPoint.y = pt[1];
                                 }
                         }
         }
@@ -579,12 +591,15 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
 
             this.downPoint.x = null;
             this.downPoint.y = null;
+            this.upPoint.x = null;
+            this.upPoint.y = null;
 //            this.isDrawing = false;
 
             if(this._canSnap)
             {
                 this.cleanupSnap();
             }
+            this._mode = 0;
         }
     },
     
@@ -751,6 +766,11 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                 snapManager.enableGridSnap( snapManager.gridSnapEnabledAppLevel() );
                 this.eventManager.removeEventListener( "toolOptionsChange", this, false);
                 this.eventManager.removeEventListener( "toolDoubleClick", this, false);
+
+                if (this._targetedElement) {
+                    this._targetedElement.classList.remove("active-element-outline");
+                    this._targetedElement = null;
+                }
             }
         }
     },
@@ -764,20 +784,22 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
         captureSelectionDrawn: {
                 value: function(event){
                         this._targets = [];
+            this._origin = null;
+            this._delta = null;
 
                         var len = this.application.ninja.selectedElements.length;
                         if(len)
                         {
                                 if(len === 1)
                                 {
-                                        this.target = this.application.ninja.selectedElements[0]._element;
+                                        this.target = this.application.ninja.selectedElements[0];
                                         drawUtils.addElement(this.target);
                                 }
                                 else
                                 {
                                         this.target = this.application.ninja.currentDocument.documentRoot;
                                 }
-                                this._updateTargets();
+//                              this._updateTargets();
                         }
                         else
                         {
@@ -798,6 +820,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;
@@ -866,7 +890,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                     this._updateTargets(true);
                 }
 
-                this.endDraw(event);
                 this._hasDraw = false;
             }
             if(this._handleMode !== null)
@@ -874,6 +897,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                 this._handleMode = null;
                 this._delta = null;
             }
+            this.endDraw(event);
             this.DrawHandles();
         }
     },
@@ -998,19 +1022,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
         }
     },
 
-        _updateDelta: {
-                value: function(delta, handleMode){