diff options
author | Valerio Virgillito | 2012-03-23 12:19:22 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-23 12:19:22 -0700 |
commit | 80aa8696aca8df6081e4e5d23bf35ed6e3155a7a (patch) | |
tree | 7263d112fb30137e3122c4ca9405097fa8bd9d13 /js/controllers/elements/shapes-controller.js | |
parent | 388d8e469e4641553b67aece4fc1d56d9789fff5 (diff) | |
parent | 8e9ac98ea1001289cb3834b262200eee253cb408 (diff) | |
download | ninja-80aa8696aca8df6081e4e5d23bf35ed6e3155a7a.tar.gz |
Merge pull request #135 from mqg734/WebGL-Animation-CheckBox
We have to add a flag in GLWorld so that any changes in geometry that forces a render will only render once.
Diffstat (limited to 'js/controllers/elements/shapes-controller.js')
-rwxr-xr-x | js/controllers/elements/shapes-controller.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index 9b2fa618..b060b751 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js | |||
@@ -109,11 +109,13 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
109 | if(value) | 109 | if(value) |
110 | { | 110 | { |
111 | el.elementModel.shapeModel.animate = true; | 111 | el.elementModel.shapeModel.animate = true; |
112 | el.elementModel.shapeModel.GLWorld._previewAnimation = true; | ||
112 | el.elementModel.shapeModel.GLWorld.restartRenderLoop(); | 113 | el.elementModel.shapeModel.GLWorld.restartRenderLoop(); |
113 | } | 114 | } |
114 | else | 115 | else |
115 | { | 116 | { |
116 | el.elementModel.shapeModel.animate = false; | 117 | el.elementModel.shapeModel.animate = false; |
118 | el.elementModel.shapeModel.GLWorld._previewAnimation = false; | ||
117 | el.elementModel.shapeModel.GLWorld._canvas.task.stop(); | 119 | el.elementModel.shapeModel.GLWorld._canvas.task.stop(); |
118 | } | 120 | } |
119 | break; | 121 | break; |