aboutsummaryrefslogtreecommitdiff
path: root/js/tools/ShapeTool.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-06 14:09:44 -0800
committerNivesh Rajbhandari2012-03-06 14:09:44 -0800
commit792793cd3991032b4840ade67f98ae8eae2d30a0 (patch)
tree69d3df003d2bb58fa1ab562fbd1058ff91851f01 /js/tools/ShapeTool.js
parent2346d8ab9db06573d8672c64988c46b6c672e015 (diff)
parent1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f (diff)
downloadninja-792793cd3991032b4840ade67f98ae8eae2d30a0.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/tools/ShapeTool.js')
-rwxr-xr-xjs/tools/ShapeTool.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 29e9b99f..d3a36163 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -14,6 +14,8 @@ var Montage = require("montage/core/core").Montage,
14 ShapeModel = require("js/models/shape-model").ShapeModel, 14 ShapeModel = require("js/models/shape-model").ShapeModel,
15 TagTool = require("js/tools/TagTool").TagTool; 15 TagTool = require("js/tools/TagTool").TagTool;
16 16
17var World = require("js/lib/drawing/world").World;
18
17exports.ShapeTool = Montage.create(DrawingTool, { 19exports.ShapeTool = Montage.create(DrawingTool, {
18 drawingFeedback: { value: { mode: "Draw3D", type: "rectangle" } }, 20 drawingFeedback: { value: { mode: "Draw3D", type: "rectangle" } },
19 21
@@ -176,7 +178,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
176 if(!world) 178 if(!world)
177 { 179 {
178 // create all the GL stuff 180 // create all the GL stuff
179 var world = new GLWorld(canvas, use3D); 181 var world = new World(canvas, use3D);
180 ElementMediator.setShapeProperty(canvas, "GLWorld", world); 182 ElementMediator.setShapeProperty(canvas, "GLWorld", world);
181 } 183 }
182 184