From 84332ab81c1b445195f1d9be8bbeae0725c8e758 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 6 Mar 2012 10:58:25 -0800 Subject: Squashed commit of preload-fix into Master - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito --- js/tools/ShapeTool.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'js/tools/ShapeTool.js') 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, ShapeModel = require("js/models/shape-model").ShapeModel, TagTool = require("js/tools/TagTool").TagTool; +var World = require("js/lib/drawing/world").World; + exports.ShapeTool = Montage.create(DrawingTool, { drawingFeedback: { value: { mode: "Draw3D", type: "rectangle" } }, @@ -176,7 +178,7 @@ exports.ShapeTool = Montage.create(DrawingTool, { if(!world) { // create all the GL stuff - var world = new GLWorld(canvas, use3D); + var world = new World(canvas, use3D); ElementMediator.setShapeProperty(canvas, "GLWorld", world); } -- cgit v1.2.3