diff options
author | Pushkar Joshi | 2012-05-02 14:29:02 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-02 14:29:02 -0700 |
commit | cd5d64aae3d0b0395e3163fab17e09e9eda01a85 (patch) | |
tree | 241bf19deb4c2ef5a8e6b0053aefcc9c52734260 /js/tools | |
parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
download | ninja-cd5d64aae3d0b0395e3163fab17e09e9eda01a85.tar.gz |
flip the action of the alt key when modifying anchor handles (this essentially forces the need for a keyboard...must be addressed by a fix later on)
Diffstat (limited to 'js/tools')
-rwxr-xr-x | js/tools/PenTool.js | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index d18f371a..2e2570e3 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js | |||
@@ -476,19 +476,18 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
476 | else if (this._editMode & this.EDIT_PREV) { | 476 | else if (this._editMode & this.EDIT_PREV) { |
477 | localTranslation = VecUtils.vecSubtract(3, localMousePos, selAnchorPos[0]); | 477 | localTranslation = VecUtils.vecSubtract(3, localMousePos, selAnchorPos[0]); |
478 | selAnchor.translatePrev(localTranslation[0], localTranslation[1], localTranslation[2]); | 478 | selAnchor.translatePrev(localTranslation[0], localTranslation[1], localTranslation[2]); |
479 | 479 | if (!this._isAltDown){ | |
480 | //move the next point if Alt key is down to ensure relative angle between prev and next | 480 | //selAnchor.translateNextFromPrev(localTranslation[0], localTranslation[1], localTranslation[2]); |
481 | if (this._isAltDown) { | 481 | selAnchor.setNextFromPrev(); |
482 | selAnchor.translateNextFromPrev(localTranslation[0], localTranslation[1], localTranslation[2]); | ||
483 | } | 482 | } |
484 | } | 483 | } |
485 | else if (this._editMode & this.EDIT_NEXT) { | 484 | else if (this._editMode & this.EDIT_NEXT) { |
486 | localTranslation = VecUtils.vecSubtract(3, localMousePos, selAnchorPos[2]); | 485 | localTranslation = VecUtils.vecSubtract(3, localMousePos, selAnchorPos[2]); |
487 | selAnchor.translateNext(localTranslation[0], localTranslation[1], localTranslation[2]); | ||
488 | |||
489 | //move the prev point if Alt key is down to ensure relative angle between prev and next | 486 | //move the prev point if Alt key is down to ensure relative angle between prev and next |
490 | if (this._isAltDown) { | 487 | selAnchor.translateNext(localTranslation[0], localTranslation[1], localTranslation[2]); |
491 | selAnchor.translatePrevFromNext(localTranslation[0], localTranslation[1], localTranslation[2]); | 488 | if (!this._isAltDown){ |
489 | //selAnchor.translatePrevFromNext(localTranslation[0], localTranslation[1], localTranslation[2]); | ||
490 | selAnchor.setPrevFromNext(); | ||
492 | } | 491 | } |
493 | } | 492 | } |
494 | else if (this._editMode & this.EDIT_PREV_NEXT) { | 493 | else if (this._editMode & this.EDIT_PREV_NEXT) { |