diff options
author | Valerio Virgillito | 2012-08-20 23:36:05 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-08-20 23:36:05 -0700 |
commit | ebb22628692375ce3bfce21353aaf5b820723f40 (patch) | |
tree | a88c6b967549c557f0c0654e367dfd5908dc8361 /js | |
parent | 36d692a9fb216f2785a570d13c1beb27360c7305 (diff) | |
parent | 22191240b09a98d134cebe36f3bc79803c5ceab4 (diff) | |
download | ninja-ebb22628692375ce3bfce21353aaf5b820723f40.tar.gz |
Merge pull request #432 from mencio/cleanup
removing unnecessary references to the tag tool.
Diffstat (limited to 'js')
-rw-r--r-- | js/lib/rdge/materials/cloud-material.js | 4 | ||||
-rw-r--r-- | js/tools/BrushTool.js | 1 | ||||
-rwxr-xr-x | js/tools/LineTool.js | 1 | ||||
-rwxr-xr-x | js/tools/PenTool.js | 1 | ||||
-rwxr-xr-x | js/tools/ShapeTool.js | 3 |
5 files changed, 2 insertions, 8 deletions
diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js index 748e26dd..11372d12 100644 --- a/js/lib/rdge/materials/cloud-material.js +++ b/js/lib/rdge/materials/cloud-material.js | |||
@@ -34,7 +34,6 @@ var Material = require("js/lib/rdge/materials/material").Material; | |||
34 | var GLWorld = require("js/lib/drawing/world").World; | 34 | var GLWorld = require("js/lib/drawing/world").World; |
35 | var Texture = require("js/lib/rdge/texture").Texture; | 35 | var Texture = require("js/lib/rdge/texture").Texture; |
36 | var ElementMediator = require("js/mediators/element-mediator").ElementMediator; | 36 | var ElementMediator = require("js/mediators/element-mediator").ElementMediator; |
37 | var TagTool = require("js/tools/TagTool").TagTool; | ||
38 | 37 | ||
39 | /////////////////////////////////////////////////////////////////////// | 38 | /////////////////////////////////////////////////////////////////////// |
40 | // Class GLMaterial | 39 | // Class GLMaterial |
@@ -152,8 +151,7 @@ var CloudMaterial = function CloudMaterial() | |||
152 | 151 | ||
153 | ////////////////////////////////////////////////////////////////////////////////// | 152 | ////////////////////////////////////////////////////////////////////////////////// |
154 | // IS THIS NECESSARY?? | 153 | // IS THIS NECESSARY?? |
155 | // var elementModel = TagTool.makeElement(~~srcCanvas.width, ~~srcCanvas.height, | 154 | // var elementModel = TagTool.makeElement(~~srcCanvas.width, ~~srcCanvas.height, Matrix.I(4), [0,0,0], srcCanvas); |
156 | // Matrix.I(4), [0,0,0], srcCanvas); | ||
157 | // ElementMediator.addElement(srcCanvas, elementModel.data, true); | 155 | // ElementMediator.addElement(srcCanvas, elementModel.data, true); |
158 | ////////////////////////////////////////////////////////////////////////////////// | 156 | ////////////////////////////////////////////////////////////////////////////////// |
159 | 157 | ||
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index 17a99697..f9706277 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js | |||
@@ -36,7 +36,6 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve | |||
36 | var Montage = require("montage/core/core").Montage; | 36 | var Montage = require("montage/core/core").Montage; |
37 | var NJUtils = require("js/lib/NJUtils").NJUtils; | 37 | var NJUtils = require("js/lib/NJUtils").NJUtils; |
38 | var ElementMediator = require("js/mediators/element-mediator").ElementMediator; | 38 | var ElementMediator = require("js/mediators/element-mediator").ElementMediator; |
39 | var TagTool = require("js/tools/TagTool").TagTool; | ||
40 | var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; | 39 | var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; |
41 | var ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; | 40 | var ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; |
42 | var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke; | 41 | var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke; |
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 4ec327b5..26222bc7 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
@@ -33,7 +33,6 @@ var Montage = require("montage/core/core").Montage, | |||
33 | ShapeTool = require("js/tools/ShapeTool").ShapeTool, | 33 | ShapeTool = require("js/tools/ShapeTool").ShapeTool, |
34 | DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase, | 34 | DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase, |
35 | NJUtils = require("js/lib/NJUtils").NJUtils, | 35 | NJUtils = require("js/lib/NJUtils").NJUtils, |
36 | TagTool = require("js/tools/TagTool").TagTool, | ||
37 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, | 36 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, |
38 | ShapeModel = require("js/models/shape-model").ShapeModel; | 37 | ShapeModel = require("js/models/shape-model").ShapeModel; |
39 | 38 | ||
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index a44438ac..1ebc7e83 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js | |||
@@ -36,7 +36,6 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve | |||
36 | var Montage = require("montage/core/core").Montage; | 36 | var Montage = require("montage/core/core").Montage; |
37 | var NJUtils = require("js/lib/NJUtils").NJUtils; | 37 | var NJUtils = require("js/lib/NJUtils").NJUtils; |
38 | var ElementMediator = require("js/mediators/element-mediator").ElementMediator; | 38 | var ElementMediator = require("js/mediators/element-mediator").ElementMediator; |
39 | var TagTool = require("js/tools/TagTool").TagTool; | ||
40 | var ElementController = require("js/controllers/elements/element-controller").ElementController; | 39 | var ElementController = require("js/controllers/elements/element-controller").ElementController; |
41 | var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; | 40 | var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; |
42 | var ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; | 41 | var ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; |
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index e1ca31e6..a4fd98e6 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
@@ -33,8 +33,7 @@ var Montage = require("montage/core/core").Montage, | |||
33 | DrawingTool = require("js/tools/drawing-tool").DrawingTool, | 33 | DrawingTool = require("js/tools/drawing-tool").DrawingTool, |
34 | NJUtils = require("js/lib/NJUtils").NJUtils, | 34 | NJUtils = require("js/lib/NJUtils").NJUtils, |
35 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, | 35 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, |
36 | ShapeModel = require("js/models/shape-model").ShapeModel, | 36 | ShapeModel = require("js/models/shape-model").ShapeModel; |
37 | TagTool = require("js/tools/TagTool").TagTool; | ||
38 | 37 | ||
39 | var World = require("js/lib/drawing/world").World; | 38 | var World = require("js/lib/drawing/world").World; |
40 | 39 | ||