diff options
Diffstat (limited to 'js/tools/Rotate3DToolBase.js')
-rwxr-xr-x | js/tools/Rotate3DToolBase.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js index 6e805e28..a7a28217 100755 --- a/js/tools/Rotate3DToolBase.js +++ b/js/tools/Rotate3DToolBase.js | |||
@@ -232,7 +232,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
232 | } | 232 | } |
233 | 233 | ||
234 | this.DrawHandles(this._delta); | 234 | this.DrawHandles(this._delta); |
235 | 235 | ||
236 | if(this._canSnap) | 236 | if(this._canSnap) |
237 | { | 237 | { |
238 | snapManager.drawLastHit(); | 238 | snapManager.drawLastHit(); |
@@ -380,7 +380,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
380 | var tMat = Matrix.I(4); | 380 | var tMat = Matrix.I(4); |
381 | 381 | ||
382 | // _startOriginArray is the location of the center of rotation | 382 | // _startOriginArray is the location of the center of rotation |
383 | // in view space of the element. | 383 | // in view space of the element. |
384 | var transformCtr = this._startOriginArray[i]; | 384 | var transformCtr = this._startOriginArray[i]; |
385 | 385 | ||
386 | tMat[12] = transformCtr[0]; | 386 | tMat[12] = transformCtr[0]; |
@@ -497,7 +497,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
497 | eltCtr[2] = 0; | 497 | eltCtr[2] = 0; |
498 | eltCtr = vecUtils.vecAdd(3, eltCtr, ctrOffset); | 498 | eltCtr = vecUtils.vecAdd(3, eltCtr, ctrOffset); |
499 | } | 499 | } |
500 | 500 | ||
501 | this._origin = viewUtils.localToGlobal(eltCtr, this.target); | 501 | this._origin = viewUtils.localToGlobal(eltCtr, this.target); |
502 | //console.log( "Rotate3DToolBase.captureSelectionDrawn _origin: " + this._origin ); | 502 | //console.log( "Rotate3DToolBase.captureSelectionDrawn _origin: " + this._origin ); |
503 | this._updateTargets(); | 503 | this._updateTargets(); |
@@ -579,7 +579,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
579 | } | 579 | } |
580 | }, | 580 | }, |
581 | 581 | ||
582 | calculateMultiSelOrigin: | 582 | calculateMultiSelOrigin: |
583 | { | 583 | { |
584 | value: function() | 584 | value: function() |
585 | { | 585 | { |
@@ -637,9 +637,9 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
637 | } else { | 637 | } else { |
638 | element = this.application.ninja.selectedElements[0]; | 638 | element = this.application.ninja.selectedElements[0]; |
639 | } | 639 | } |
640 | 640 | ||
641 | if(shouldUpdateCenter) { | 641 | if(shouldUpdateCenter) { |
642 | 642 | ||
643 | // eltCtr = element.elementModel.getProperty("ctr"); | 643 | // eltCtr = element.elementModel.getProperty("ctr"); |
644 | // ctrOffset = vecUtils.vecSubtract(3, this._origin, eltCtr); | 644 | // ctrOffset = vecUtils.vecSubtract(3, this._origin, eltCtr); |
645 | 645 | ||
@@ -667,7 +667,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
667 | this._startOriginArray[i] = ctrOffset; | 667 | this._startOriginArray[i] = ctrOffset; |
668 | } | 668 | } |
669 | */ | 669 | */ |
670 | 670 | ||
671 | // Update transform ctr for all elements if transform origin was modified | 671 | // Update transform ctr for all elements if transform origin was modified |
672 | if (!this._origin) this._origin = this.calculateMultiSelOrigin(); | 672 | if (!this._origin) this._origin = this.calculateMultiSelOrigin(); |
673 | var globalCtr = this._origin; | 673 | var globalCtr = this._origin; |