diff options
author | Valerio Virgillito | 2012-05-04 15:31:40 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-04 15:31:40 -0700 |
commit | 3ebed34665fa73b0ce613b400f3029ebf4476439 (patch) | |
tree | 09a3c592035030bda7bb62d1f908ce263377d74c /js/tools/BrushTool.js | |
parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-3ebed34665fa73b0ce613b400f3029ebf4476439.tar.gz |
Merge branch 'refs/heads/master' into dom-architecture
Diffstat (limited to 'js/tools/BrushTool.js')
-rw-r--r-- | js/tools/BrushTool.js | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index ded56ecc..5c334b92 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js | |||
@@ -374,13 +374,11 @@ exports.BrushTool = Montage.create(ShapeTool, { | |||
374 | return; | 374 | return; |
375 | } | 375 | } |
376 | 376 | ||
377 | var left = Math.round(midPt[0] - 0.5 * w); | ||
378 | var top = Math.round(midPt[1] - 0.5 * h); | ||
379 | |||
380 | if (!canvas) { | 377 | if (!canvas) { |
381 | var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); | 378 | var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
382 | var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas, true); | 379 | document.application.njUtils.createModelWithShape(newCanvas, "Brushstroke"); |
383 | ElementMediator.addElements(newCanvas, elementModel.data, false); | 380 | var styles = document.application.njUtils.stylesFromDraw(newCanvas, w, h, {midPt: midPt, planeMat: planeMat}); |
381 | this.application.ninja.elementMediator.addElements(newCanvas, styles, false); | ||
384 | 382 | ||
385 | // create all the GL stuff | 383 | // create all the GL stuff |
386 | var world = this.getGLWorld(newCanvas, this._useWebGL); | 384 | var world = this.getGLWorld(newCanvas, this._useWebGL); |