diff options
Diffstat (limited to 'js/helper-classes/3D')
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 2 | ||||
-rwxr-xr-x | js/helper-classes/3D/vec-utils.js | 2 | ||||
-rwxr-xr-x | js/helper-classes/3D/view-utils.js | 13 |
3 files changed, 14 insertions, 3 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index a755e9e2..5b467b41 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -1411,6 +1411,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1411 | case glObj.GEOM_TYPE_PATH: | 1411 | case glObj.GEOM_TYPE_PATH: |
1412 | // Snapping not implemented for these type, but don't throw an error... | 1412 | // Snapping not implemented for these type, but don't throw an error... |
1413 | break; | 1413 | break; |
1414 | case glObj.GEOM_TYPE_BRUSH_STROKE: | ||
1415 | break; //don't throw error because snapping not yet implemented | ||
1414 | case glObj.GEOM_TYPE_CUBIC_BEZIER: | 1416 | case glObj.GEOM_TYPE_CUBIC_BEZIER: |
1415 | { | 1417 | { |
1416 | var nearVrt = glObj.getNearVertex( eyePt, dir ); | 1418 | var nearVrt = glObj.getNearVertex( eyePt, dir ); |
diff --git a/js/helper-classes/3D/vec-utils.js b/js/helper-classes/3D/vec-utils.js index e6db4a8d..4eacd856 100755 --- a/js/helper-classes/3D/vec-utils.js +++ b/js/helper-classes/3D/vec-utils.js | |||
@@ -259,6 +259,6 @@ var VecUtils = exports.VecUtils = Object.create(Object.prototype, | |||
259 | glmat4.rotate(mat, angle, axis); | 259 | glmat4.rotate(mat, angle, axis); |
260 | return mat; | 260 | return mat; |
261 | } | 261 | } |
262 | }, | 262 | } |
263 | 263 | ||
264 | }); \ No newline at end of file | 264 | }); \ No newline at end of file |
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js index 5a820fc2..a72b7906 100755 --- a/js/helper-classes/3D/view-utils.js +++ b/js/helper-classes/3D/view-utils.js | |||
@@ -1200,10 +1200,19 @@ exports.ViewUtils = Montage.create(Component, { | |||
1200 | // MISCELLANEOUS | 1200 | // MISCELLANEOUS |
1201 | // event.layerX/Y: var pt = viewUtils.getMousePoint(event); | 1201 | // event.layerX/Y: var pt = viewUtils.getMousePoint(event); |
1202 | 1202 | ||
1203 | getStageDimension: { | ||
1204 | value: function() | ||
1205 | { | ||
1206 | var width = parseInt(this.application.ninja.stage.documentRoot.elementModel.stageDimension.style.getProperty("width")); | ||
1207 | var height= parseInt(this.application.ninja.stage.documentRoot.elementModel.stageDimension.style.getProperty("height")); | ||
1208 | return[width,height]; | ||
1209 | } | ||
1210 | }, | ||
1211 | |||
1203 | getStage: { | 1212 | getStage: { |
1204 | value: function() | 1213 | value: function() |
1205 | { | 1214 | { |
1206 | return snapManagerModule.SnapManager.getStage(); | 1215 | return this.application.ninja.stage.snapManager.getStage(); |
1207 | } | 1216 | } |
1208 | }, | 1217 | }, |
1209 | 1218 | ||
@@ -1303,7 +1312,7 @@ exports.ViewUtils = Montage.create(Component, { | |||
1303 | { | 1312 | { |
1304 | value: function() | 1313 | value: function() |
1305 | { | 1314 | { |
1306 | return this.application.ninjs.stage.canvas; | 1315 | return this.application.ninja.stage.canvas; |
1307 | } | 1316 | } |
1308 | }, | 1317 | }, |
1309 | 1318 | ||