diff options
author | Pushkar Joshi | 2012-03-23 14:32:46 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-23 14:32:46 -0700 |
commit | 9b7dac9215fbd7c0fe7a80d3e8f1ff378332fec3 (patch) | |
tree | cf0cad815fe98ee8d493cbf42c4d8e13a3e0aaac /js/helper-classes/3D | |
parent | 92bc54df4acfec849568ab619150a5da49c087fa (diff) | |
download | ninja-9b7dac9215fbd7c0fe7a80d3e8f1ff378332fec3.tar.gz |
Almost working version of brush tool that uses only local coordinates to store the brush stroke points. Current version does not yet update the width and height of the brush stroke canvas upon changing the brush stroke through the PI. Also, current version does not obtain 3D position of points properly from the drawing tool base (see BrushTool _getUnsnappedPosition)
Diffstat (limited to 'js/helper-classes/3D')
-rwxr-xr-x | js/helper-classes/3D/vec-utils.js | 2 | ||||
-rwxr-xr-x | js/helper-classes/3D/view-utils.js | 13 |
2 files changed, 12 insertions, 3 deletions
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 | ||