diff options
author | hwc487 | 2012-05-14 15:11:22 -0700 |
---|---|---|
committer | hwc487 | 2012-05-14 15:11:22 -0700 |
commit | 904c7bfb65bb04400a0f63af1156cd9341958935 (patch) | |
tree | ca1b4f0dc9c42f4cd952766dbcce10704c3f3eeb | |
parent | 753765b604c954cea782d129e4ddd6a0ff42b2b9 (diff) | |
download | ninja-904c7bfb65bb04400a0f63af1156cd9341958935.tar.gz |
Drag plane not being set. Injection from a recent checkin of mine.
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 3 | ||||
-rwxr-xr-x | js/helper-classes/3D/view-utils.js | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 99ef5006..9bbbcf29 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -230,6 +230,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
230 | else | 230 | else |
231 | parentPt = [xScreen, yScreen, 0.0]; | 231 | parentPt = [xScreen, yScreen, 0.0]; |
232 | 232 | ||
233 | if (!snap3D && this._hasDragPlane) | ||
234 | this.activateDragPlane(); | ||
235 | |||
233 | var hitRec = this.snapToStage( parentPt, quadPt ); | 236 | var hitRec = this.snapToStage( parentPt, quadPt ); |
234 | 237 | ||
235 | // try snapping to the 3D grid, or to the stage boundaries if the grid is not displayed | 238 | // try snapping to the 3D grid, or to the stage boundaries if the grid is not displayed |
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js index 48d4cacf..00124900 100755 --- a/js/helper-classes/3D/view-utils.js +++ b/js/helper-classes/3D/view-utils.js | |||
@@ -156,14 +156,6 @@ exports.ViewUtils = Montage.create(Component, { | |||
156 | viewDir = MathUtils.transformVector( [0,0,1], stageInv ); | 156 | viewDir = MathUtils.transformVector( [0,0,1], stageInv ); |
157 | } | 157 | } |
158 | 158 | ||
159 | /* | ||
160 | if (elt === stage) | ||
161 | { | ||
162 | xVec = [1,0,0]; | ||
163 | yVec = [0,1,0]; | ||
164 | } | ||
165 | */ | ||
166 | |||
167 | var plane; | 159 | var plane; |
168 | var xDot, yDot, zDot; | 160 | var xDot, yDot, zDot; |
169 | switch (axis) | 161 | switch (axis) |