diff options
author | Jose Antonio Marquez | 2012-03-26 15:37:41 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-26 15:37:41 -0700 |
commit | 9d88d2827c6c1cc10f64575bd3c2f5f21dd0d89d (patch) | |
tree | af3b114d6a83ae62dfcead8bd61bc62efe0c9516 /js/ninja.reel | |
parent | b1ba63e509f77b14c05b89ea193f4d706a28ac9b (diff) | |
parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
download | ninja-9d88d2827c6c1cc10f64575bd3c2f5f21dd0d89d.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.js | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 2a6e49f7..c76c7d46 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -166,6 +166,27 @@ exports.Ninja = Montage.create(Component, { | |||
166 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); | 166 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); |
167 | this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); | 167 | this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); |
168 | 168 | ||
169 | this._toggleWebGlAnimation(this.appModel.livePreview); | ||
170 | } | ||
171 | }, | ||
172 | |||
173 | // Turn on WebGL animation during preview | ||
174 | _toggleWebGlAnimation: { | ||
175 | value: function(inLivePreview) { | ||
176 | var glCanvases = this.currentDocument.iframe.contentWindow.document.querySelectorAll('[data-RDGE-id]'), | ||
177 | glShapeModel; | ||
178 | if(glCanvases) { | ||
179 | for(var i = 0, len = glCanvases.length; i<len; i++) { | ||
180 | glShapeModel = glCanvases[i].elementModel.shapeModel; | ||
181 | if(inLivePreview) { | ||
182 | glShapeModel.GLWorld._previewAnimation = true; | ||
183 | glShapeModel.GLWorld.restartRenderLoop(); | ||
184 | } else if (!glShapeModel.animate ) { | ||
185 | glShapeModel.GLWorld._previewAnimation = false; | ||
186 | glShapeModel.GLWorld._canvas.task.stop(); | ||
187 | } | ||
188 | } | ||
189 | } | ||
169 | } | 190 | } |
170 | }, | 191 | }, |
171 | 192 | ||