diff options
Diffstat (limited to 'js/tools/ShapeTool.js')
-rwxr-xr-x | js/tools/ShapeTool.js | 46 |
1 files changed, 6 insertions, 40 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index 26ed9c6f..e1ca31e6 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
@@ -70,7 +70,6 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
70 | this.doDraw(event); | 70 | this.doDraw(event); |
71 | } else { | 71 | } else { |
72 | this.doSnap(event); | 72 | this.doSnap(event); |
73 | this._showFeedbackOnMouseMove(event); | ||
74 | } | 73 | } |
75 | 74 | ||
76 | this.drawLastSnap(); // Required cleanup for both Draw/Feedbacks | 75 | this.drawLastSnap(); // Required cleanup for both Draw/Feedbacks |
@@ -159,39 +158,6 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
159 | } | 158 | } |
160 | }, | 159 | }, |
161 | 160 | ||
162 | /** Show a border when mousing | ||
163 | * over existing canvas elements to signal to the user that | ||
164 | * the drawing operation will act on the targeted canvas. | ||
165 | **/ | ||
166 | _showFeedbackOnMouseMove: { | ||
167 | value: function (event) { | ||
168 | // TODO - This call is causing the canvas to redraw 3 times per mouse move | ||
169 | var targetedObject = this.application.ninja.stage.getElement(event, true); | ||
170 | |||
171 | if (targetedObject) { | ||
172 | if((targetedObject.nodeName === "CANVAS") && !ShapesController.isElementAShape(targetedObject)) | ||
173 | { | ||
174 | if (targetedObject !== this._targetedElement) { | ||
175 | if(this._targetedElement) | ||
176 | { | ||
177 | this._targetedElement.classList.remove("active-element-outline"); | ||
178 | } | ||
179 | this._targetedElement = targetedObject; | ||
180 | this._targetedElement.classList.add("active-element-outline"); | ||
181 | } | ||
182 | } | ||
183 | else if (this._targetedElement) { | ||
184 | this._targetedElement.classList.remove("active-element-outline"); | ||
185 | this._targetedElement = null; | ||
186 | } | ||
187 | } | ||
188 | else if (this._targetedElement) { | ||
189 | this._targetedElement.classList.remove("elem-red-outline"); | ||
190 | this._targetedElement = null; | ||
191 | } | ||
192 | } | ||
193 | }, | ||
194 | |||
195 | RenderShape: | 161 | RenderShape: |
196 | { | 162 | { |
197 | value: function (w, h, planeMat, midPt) | 163 | value: function (w, h, planeMat, midPt) |
@@ -201,13 +167,13 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
201 | }, | 167 | }, |
202 | 168 | ||
203 | getGLWorld: { | 169 | getGLWorld: { |
204 | value: function (canvas, use3D) | 170 | value: function (canvas, use3D) { |
205 | { | 171 | var world; |
206 | var world = this.application.ninja.elementMediator.getShapeProperty(canvas, "GLWorld"); | 172 | |
207 | if(!world) | 173 | world = this.application.ninja.elementMediator.getShapeProperty(canvas, "GLWorld"); |
208 | { | 174 | if(!world) { |
209 | // create all the GL stuff | 175 | // create all the GL stuff |
210 | var world = new World(canvas, use3D); | 176 | world = new World(canvas, use3D); |
211 | this.application.ninja.elementMediator.setShapeProperty(canvas, "GLWorld", world); | 177 | this.application.ninja.elementMediator.setShapeProperty(canvas, "GLWorld", world); |
212 | } | 178 | } |
213 | 179 | ||