diff options
author | hwc487 | 2012-05-11 13:52:55 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 13:52:55 -0700 |
commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/tools/TranslateObject3DTool.js | |
parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/tools/TranslateObject3DTool.js')
-rwxr-xr-x | js/tools/TranslateObject3DTool.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js index b4f55bd9..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 | ||
@@ -86,7 +86,8 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, { | |||
86 | var elt = this.application.ninja.stage.getElement(event, true); | 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 | { |