diff options
author | hwc487 | 2012-05-08 15:54:15 -0700 |
---|---|---|
committer | hwc487 | 2012-05-08 15:54:15 -0700 |
commit | 7af54816bb6311421f976661d07b7776d5cd37c9 (patch) | |
tree | fd5b734778b01a9c938b0094b8dd7291f6648d3d /js/tools | |
parent | 91a9e02bff0397ec9b1f55fdf61cef72eb0d8a0f (diff) | |
parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
download | ninja-7af54816bb6311421f976661d07b7776d5cd37c9.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Diffstat (limited to 'js/tools')
-rwxr-xr-x | js/tools/SelectionTool.js | 2 | ||||
-rwxr-xr-x | js/tools/TranslateObject3DTool.js | 9 | ||||
-rwxr-xr-x | js/tools/drawing-tool-base.js | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 855c7b8c..07c26b8c 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
@@ -504,7 +504,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
504 | delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 ); | 504 | delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 ); |
505 | delta[0] = ~~delta[0]; | 505 | delta[0] = ~~delta[0]; |
506 | delta[1] = ~~delta[1]; | 506 | delta[1] = ~~delta[1]; |
507 | delta[2] = 0; | 507 | //delta[2] = 0; |
508 | var transMat = Matrix.Translation( delta ); | 508 | var transMat = Matrix.Translation( delta ); |
509 | this._moveElements(transMat); | 509 | this._moveElements(transMat); |
510 | } | 510 | } |
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 | { |
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js index 376b3a27..84641754 100755 --- a/js/tools/drawing-tool-base.js +++ b/js/tools/drawing-tool-base.js | |||
@@ -36,9 +36,8 @@ exports.DrawingToolBase = Montage.create(Montage, { | |||
36 | * 2 - Y value converted to screen point | 36 | * 2 - Y value converted to screen point |
37 | */ | 37 | */ |
38 | getInitialSnapPoint: { | 38 | getInitialSnapPoint: { |
39 | value: function(x, y, shapeCanvas) { | 39 | value: function(x, y, shapeCanvas) |
40 | snapManager.clearDragPlane(); | 40 | { |
41 | |||
42 | // update the snap settings | 41 | // update the snap settings |
43 | snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() ); | 42 | snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() ); |
44 | snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() ); | 43 | snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() ); |