diff options
author | Jose Antonio Marquez | 2012-03-23 13:23:12 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-23 13:23:12 -0700 |
commit | 67aaba2e752ea1964356f487269cafc686abb9a7 (patch) | |
tree | c3794257facf5992aff796b1ef11ae661b2aa3cb /js/ninja.reel/ninja.js | |
parent | 7e61ce5aba0c8465595804da21e365baf4d8c15d (diff) | |
parent | 3ac73ef7f5de7fb3869c4b84537a6dc6ef86b859 (diff) | |
download | ninja-67aaba2e752ea1964356f487269cafc686abb9a7.tar.gz |
Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Components
Diffstat (limited to 'js/ninja.reel/ninja.js')
-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 | ||