diff options
Diffstat (limited to 'js/tools/TranslateObject3DTool.js')
-rwxr-xr-x | js/tools/TranslateObject3DTool.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js index 72a55322..f8b32d23 100755 --- a/js/tools/TranslateObject3DTool.js +++ b/js/tools/TranslateObject3DTool.js | |||
@@ -54,10 +54,10 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, { | |||
54 | else | 54 | else |
55 | { | 55 | { |
56 | this._delta = null; | 56 | this._delta = null; |
57 | // special case for z-translation | 57 | //if(this._handleMode === 2) |
58 | if(this._handleMode === 2) | ||
59 | { | 58 | { |
60 | this._dragPlane = viewUtils.getNormalToUnprojectedElementPlane(this._target); | 59 | this._dragPlane = viewUtils.getNormalToUnprojectedElementPlane(this._target, this._handleMode, this._inLocalMode); |
60 | //console.log( "dragPlane: " + this._dragPlane ); | ||
61 | snapManager.setupDragPlaneFromPlane(this._dragPlane); | 61 | snapManager.setupDragPlaneFromPlane(this._dragPlane); |
62 | do3DSnap = false; | 62 | do3DSnap = false; |
63 | 63 | ||
@@ -83,10 +83,11 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, { | |||
83 | // Check that hitRec's element matches element that browser says we clicked on | 83 | // Check that hitRec's element matches element that browser says we clicked on |
84 | // TODO - This is still not working when using a handle that is on top of an | 84 | // TODO - This is still not working when using a handle that is on top of an |
85 | // element that is not currently selected | 85 | // element that is not currently selected |
86 | var elt = this.application.ninja.stage.GetSelectableElement(event); | 86 | var elt = this.application.ninja.stage.getElement(event, true); |
87 | if(elt && (elt !== hitRec.getElement())) | 87 | if(elt && (elt !== hitRec.getElement())) |
88 | { | 88 | { |
89 | hitRec = snapManager.findHitRecordForElement(elt); | 89 | var otherSnap = snapManager.findHitRecordForElement(elt); |
90 | if (otherSnap) hitRec = otherSnap; | ||
90 | } | 91 | } |
91 | if(elt === this.application.ninja.currentSelectedContainer) | 92 | if(elt === this.application.ninja.currentSelectedContainer) |
92 | { | 93 | { |