diff options
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-x | js/tools/modifier-tool-base.js | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index 23185989..2363745b 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
@@ -81,7 +81,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
81 | } | 81 | } |
82 | } | 82 | } |
83 | }, | 83 | }, |
84 | 84 | ||
85 | _getObjectBeingTracked : | 85 | _getObjectBeingTracked : |
86 | { | 86 | { |
87 | value: function(hitRec) | 87 | value: function(hitRec) |
@@ -103,7 +103,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
103 | // override in subclasses | 103 | // override in subclasses |
104 | } | 104 | } |
105 | }, | 105 | }, |
106 | 106 | ||
107 | initializeSnapping: | 107 | initializeSnapping: |
108 | { | 108 | { |
109 | value: function(event) | 109 | value: function(event) |
@@ -222,7 +222,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
222 | } | 222 | } |
223 | } | 223 | } |
224 | }, | 224 | }, |
225 | 225 | ||
226 | /* | 226 | /* |
227 | * The parameterization is based on the position of the | 227 | * The parameterization is based on the position of the |
228 | * snap point in pre-transformed element screen space | 228 | * snap point in pre-transformed element screen space |
@@ -313,7 +313,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
313 | var localPt = [x,y,z]; | 313 | var localPt = [x,y,z]; |
314 | 314 | ||
315 | globalPt = viewUtils.localToGlobal( localPt, elt ); | 315 | globalPt = viewUtils.localToGlobal( localPt, elt ); |
316 | 316 | ||
317 | // add in the delta | 317 | // add in the delta |
318 | var hitPt = this.GetObjectHitPoint(); | 318 | var hitPt = this.GetObjectHitPoint(); |
319 | var scrPt = viewUtils.localToGlobal( hitPt, this._clickedObject ); | 319 | var scrPt = viewUtils.localToGlobal( hitPt, this._clickedObject ); |
@@ -375,7 +375,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
375 | viewUtils.pushViewportObj( elt ); | 375 | viewUtils.pushViewportObj( elt ); |
376 | var viewPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] ); | 376 | var viewPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] ); |
377 | viewUtils.popViewportObj(); | 377 | viewUtils.popViewportObj(); |
378 | 378 | ||
379 | if(useViewPoint) | 379 | if(useViewPoint) |
380 | { | 380 | { |
381 | return viewPt; | 381 | return viewPt; |
@@ -405,7 +405,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
405 | viewUtils.pushViewportObj( elt ); | 405 | viewUtils.pushViewportObj( elt ); |
406 | var viewPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] ); | 406 | var viewPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] ); |
407 | viewUtils.popViewportObj(); | 407 | viewUtils.popViewportObj(); |
408 | 408 | ||
409 | if(useViewPoint) | 409 | if(useViewPoint) |
410 | { | 410 | { |
411 | return viewPt; | 411 | return viewPt; |
@@ -593,7 +593,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
593 | } | 593 | } |
594 | } | 594 | } |
595 | }, | 595 | }, |
596 | 596 | ||
597 | doDraw: { | 597 | doDraw: { |
598 | value: function(event) | 598 | value: function(event) |
599 | { | 599 | { |
@@ -627,12 +627,12 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
627 | this._mode = 0; | 627 | this._mode = 0; |
628 | } | 628 | } |
629 | }, | 629 | }, |
630 | 630 | ||
631 | cleanupSnap: { | 631 | cleanupSnap: { |
632 | value: function() { | 632 | value: function() { |
633 | this.mouseDownHitRec = null; | 633 | this.mouseDownHitRec = null; |
634 | this.mouseUpHitRec = null; | 634 | this.mouseUpHitRec = null; |
635 | 635 | ||
636 | this._dragPlane = null; | 636 | this._dragPlane = null; |
637 | this._useQuadPt = false; | 637 | this._useQuadPt = false; |
638 | 638 | ||
@@ -742,7 +742,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
742 | } | 742 | } |
743 | }, | 743 | }, |
744 | //------------------------------------------------------------------------- | 744 | //------------------------------------------------------------------------- |
745 | 745 | ||
746 | //------------------------------------------------------------------------- | 746 | //------------------------------------------------------------------------- |
747 | // Routines to run when tool is selected/deselected | 747 | // Routines to run when tool is selected/deselected |
748 | Configure: { | 748 | Configure: { |
@@ -867,7 +867,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
867 | 867 | ||
868 | if (!this._isDrawing || (this.application.ninja.selectedElements.length == 1)) | 868 | if (!this._isDrawing || (this.application.ninja.selectedElements.length == 1)) |
869 | this.DrawHandles(this._delta); | 869 | this.DrawHandles(this._delta); |
870 | 870 | ||
871 | if(this._canSnap) | 871 | if(this._canSnap) |
872 | { | 872 | { |
873 | snapManager.drawLastHit(); | 873 | snapManager.drawLastHit(); |