diff options
author | hwc487 | 2012-05-11 13:52:55 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 13:52:55 -0700 |
commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/tools/PenTool.js | |
parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/tools/PenTool.js')
-rwxr-xr-x | js/tools/PenTool.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index 8ecc9f79..16990ca7 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js | |||
@@ -557,17 +557,16 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
557 | return; | 557 | return; |
558 | } | 558 | } |
559 | 559 | ||
560 | w= Math.round(w); | 560 | w = Math.round(w); |
561 | h = Math.round(h); | 561 | h = Math.round(h); |
562 | var left = Math.round(midPt[0] - 0.5 * w); | 562 | var left = Math.round(midPt[0] - 0.5 * w); |
563 | var top = Math.round(midPt[1] - 0.5 * h); | 563 | var top = Math.round(midPt[1] - 0.5 * h); |
564 | 564 | ||
565 | if (!canvas) { | 565 | if (!canvas) { |
566 | var newCanvas = null; | 566 | var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
567 | newCanvas = NJUtils.makeNJElement("canvas", "Subpath", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); | 567 | document.application.njUtils.createModelWithShape(newCanvas, "Subpath"); |
568 | var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas, true); | 568 | var styles = document.application.njUtils.stylesFromDraw(newCanvas, parseInt(w), parseInt(h), {midPt: midPt, planeMat: planeMat}); |
569 | //note that we set the notify event to false because we send the event separately at end of this code block | 569 | this.application.ninja.elementMediator.addElements(newCanvas, styles, false); |
570 | ElementMediator.addElements(newCanvas, elementModel.data, false); | ||
571 | 570 | ||
572 | // create all the GL stuff | 571 | // create all the GL stuff |
573 | var world = this.getGLWorld(newCanvas, this._useWebGL);//this.options.use3D);//this.CreateGLWorld(planeMat, midPt, newCanvas, this._useWebGL);//fillMaterial, strokeMaterial); | 572 | var world = this.getGLWorld(newCanvas, this._useWebGL);//this.options.use3D);//this.CreateGLWorld(planeMat, midPt, newCanvas, this._useWebGL);//fillMaterial, strokeMaterial); |