aboutsummaryrefslogtreecommitdiff
path: root/js/tools/ShapeTool.js
diff options
context:
space:
mode:
authorJonathan Duran2012-03-06 17:08:55 -0800
committerJonathan Duran2012-03-06 17:08:55 -0800
commitbb6a1d82b2884b410f5859cc0c2cafd380acbe6a (patch)
tree6ec3e960a0c38ce8fd88c9bc17f5227d072ebe76 /js/tools/ShapeTool.js
parent2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff)
parent2e3943a8f751ec572066f168b58464c24b9f29e5 (diff)
downloadninja-bb6a1d82b2884b410f5859cc0c2cafd380acbe6a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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