aboutsummaryrefslogtreecommitdiff
path: root/js/tools/ShapeTool.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-06 11:05:00 -0800
committerValerio Virgillito2012-03-06 11:05:00 -0800
commit4540b5b4ea2065c3e0d67b46bba8b6764801fbea (patch)
tree4e1561530b1b90ea497bac8e41d193fa605e98b4 /js/tools/ShapeTool.js
parent4e35725e6c9044c37bef28b8c8d36f4b5c89bfd9 (diff)
parent84332ab81c1b445195f1d9be8bbeae0725c8e758 (diff)
downloadninja-4540b5b4ea2065c3e0d67b46bba8b6764801fbea.tar.gz
Merge branch 'refs/heads/master' into panels
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