diff options
author | Nivesh Rajbhandari | 2012-02-22 11:58:45 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-22 11:58:45 -0800 |
commit | 75bca514358ed90b8b4274bafed9422c82695776 (patch) | |
tree | b956398809f7bf492a0eedea4993fad8f08a4f89 /js/helper-classes/3D | |
parent | 50bb05efbafc9a80f069dfde32988e5cd6826865 (diff) | |
download | ninja-75bca514358ed90b8b4274bafed9422c82695776.tar.gz |
Integrating Zoom tool fixes.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/helper-classes/3D')
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 1 | ||||
-rwxr-xr-x | js/helper-classes/3D/view-utils.js | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 0a950658..ada6960b 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -1087,6 +1087,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1087 | 1087 | ||
1088 | // we need to check the orientation of the bounds | 1088 | // we need to check the orientation of the bounds |
1089 | var nrm = MathUtils.getNormalFromBounds3D( bounds3D ); | 1089 | var nrm = MathUtils.getNormalFromBounds3D( bounds3D ); |
1090 | if (MathUtils.fpSign(nrm[2]) == 0) return null; | ||
1090 | var zNrm = nrm[2]; | 1091 | var zNrm = nrm[2]; |
1091 | var dist; | 1092 | var dist; |
1092 | 1093 | ||
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js index a2fac34f..bedda8bf 100755 --- a/js/helper-classes/3D/view-utils.js +++ b/js/helper-classes/3D/view-utils.js | |||
@@ -1226,6 +1226,14 @@ exports.ViewUtils = Montage.create(Component, { | |||
1226 | } | 1226 | } |
1227 | }, | 1227 | }, |
1228 | 1228 | ||
1229 | getCurrentDocument: | ||
1230 | { | ||
1231 | value: function() | ||
1232 | { | ||
1233 | return snapManagerModule.SnapManager.application.ninja.currentDocument; | ||
1234 | } | ||
1235 | }, | ||
1236 | |||
1229 | setStageZoom: { | 1237 | setStageZoom: { |
1230 | value:function( globalPt, zoomFactor ) { | 1238 | value:function( globalPt, zoomFactor ) { |
1231 | var localPt; | 1239 | var localPt; |