aboutsummaryrefslogtreecommitdiff
path: root/js/tools/modifier-tool-base.js
diff options
context:
space:
mode:
authorJon Reid2012-04-19 14:30:38 -0700
committerJon Reid2012-04-19 14:30:38 -0700
commit71e1e65d6aaa64afc9fffba9b1fd6d19904b52b0 (patch)
tree78292a128cd79f2aa7fbc7a7077dea83389a52e8 /js/tools/modifier-tool-base.js
parentfc22cd3b5c65dc6f137fbb59443e2061cbbcac26 (diff)
parent4465a66996f2b022ab9e838e028415fd87cfa405 (diff)
downloadninja-71e1e65d6aaa64afc9fffba9b1fd6d19904b52b0.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine.
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-xjs/tools/modifier-tool-base.js17
1 files changed, 16 insertions, 1 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 8cd21a29..2e006c35 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -402,7 +402,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
402 { 402 {
403 var index = this._snapIndex; 403 var index = this._snapIndex;
404 var pt0; 404 var pt0;
405 var useViewPoint = (this._inLocalMode && (this.application.ninja.selectedElements.length === 1)); 405 var useViewPoint = this.rotateStage || (this._inLocalMode && (this.application.ninja.selectedElements.length === 1));
406 if (this._useQuadPt) 406 if (this._useQuadPt)
407 { 407 {
408 pt0 = this.GetQuadrantPoint(useViewPoint); 408 pt0 = this.GetQuadrantPoint(useViewPoint);
@@ -425,6 +425,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
425 pt1 = MathUtils.transformPoint( pt1, this._startMat ); 425 pt1 = MathUtils.transformPoint( pt1, this._startMat );
426 } 426 }
427 427
428 //console.log( "getMousePoints, useViewPoint: " + useViewPoint + ", " + pt0 + " => " + pt1 );
428 return {pt0:pt0, pt1:pt1}; 429 return {pt0:pt0, pt1:pt1};
429 } 430 }
430 else 431 else
@@ -562,6 +563,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
562 var pt = hitRec.getScreenPoint(); 563 var pt = hitRec.getScreenPoint();
563 this.upPoint.x = pt[0]; 564 this.upPoint.x = pt[0];
564 this.upPoint.y = pt[1]; 565 this.upPoint.y = pt[1];
566 this.upPoint.z = pt[2];
565 } 567 }
566 } 568 }
567 } 569 }
@@ -838,7 +840,9 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
838 } 840 }
839 } 841 }
840 842
843 if (!this._isDrawing || (this.application.ninja.selectedElements.length == 1))
841 this.DrawHandles(this._delta); 844 this.DrawHandles(this._delta);
845
842 if(this._canSnap) 846 if(this._canSnap)
843 { 847 {
844 snapManager.drawLastHit(); 848 snapManager.drawLastHit();
@@ -878,10 +882,21 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
878 this._delta = null; 882 this._delta = null;
879 } 883 }
880 this.endDraw(event); 884 this.endDraw(event);
885
886 this.application.ninja.stage.draw();
887 if (this.application.ninja.selectedElements.length > 1)
888 {
889 //this._origin = null;
890 this._updateHandlesOrigin();
891 }
881 this.DrawHandles(); 892 this.DrawHandles();
882 } 893 }
883 }, 894 },
884 895
896 _updateHandlesOrigin: {
897 value: function () { }
898 },
899
885 handleToolDoubleClick: { 900 handleToolDoubleClick: {
886 value: function(event) { 901 value: function(event) {
887 if(!this._target) 902 if(!this._target)