diff options
author | Valerio Virgillito | 2012-06-20 15:30:21 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-20 15:30:21 -0700 |
commit | d21185cecb8a1ddf9c6aeeb6e4d9f8745c90058c (patch) | |
tree | e76e776b8e1211b6696a7b1b4951d80f4b4e5714 /js/tools | |
parent | b3767590598fb5c102c8c3d40167653cd5961348 (diff) | |
parent | 6a0a5f6e7dec5e8ced6e228e7bbfcc1181f46c26 (diff) | |
download | ninja-d21185cecb8a1ddf9c6aeeb6e4d9f8745c90058c.tar.gz |
Merge pull request #315 from mqg734/IKNinja_1671
IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated in negative space.
Diffstat (limited to 'js/tools')
-rwxr-xr-x | js/tools/SelectionTool.js | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 9bd885a4..a0d5bc26 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
@@ -47,6 +47,20 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
47 | } | 47 | } |
48 | }, | 48 | }, |
49 | 49 | ||
50 | _areElementsIn2D : { | ||
51 | value: function () { | ||
52 | if(this.application.ninja.selectedElements.length) { | ||
53 | var len = this.application.ninja.selectedElements.length; | ||
54 | for(var i = 0; i < len; i++) { | ||
55 | if(!MathUtils.isIdentityMatrix(this.application.ninja.selectedElements[i].elementModel.getProperty("mat"))) { | ||
56 | return false; | ||
57 | } | ||
58 | } | ||
59 | } | ||
60 | return true; | ||
61 | } | ||
62 | }, | ||
63 | |||
50 | startDraw: { | 64 | startDraw: { |
51 | value: function(event) { | 65 | value: function(event) { |
52 | this.drawData = null; | 66 | this.drawData = null; |
@@ -70,7 +84,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
70 | if(this._canSnap) | 84 | if(this._canSnap) |
71 | { | 85 | { |
72 | this.initializeSnapping(event); | 86 | this.initializeSnapping(event); |
73 | this._use3DMode = !this._areElementsOnSamePlane(); | 87 | // this._use3DMode = !this._areElementsOnSamePlane(); |
88 | this._use3DMode = !this._areElementsIn2D(); | ||
74 | // console.log("use3DMode = " + this._use3DMode); | 89 | // console.log("use3DMode = " + this._use3DMode); |
75 | } | 90 | } |
76 | else | 91 | else |