aboutsummaryrefslogtreecommitdiff
path: root/js/lib/drawing
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-24 14:17:09 -0700
committerValerio Virgillito2012-03-24 14:17:09 -0700
commit63f0cab872879f72021692f064b044a0cde2459a (patch)
treedf04e1800aa99a2b5ea62eb76c03ef32277e01ba /js/lib/drawing
parent7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff)
parenta806c422905adf0fa5c244d751535c615ec5d8c7 (diff)
downloadninja-63f0cab872879f72021692f064b044a0cde2459a.tar.gz
Merge pull request #141 from mqg734/WebGL-Animation-CheckBox
Changing where we check for _previewAnimation flag.
Diffstat (limited to 'js/lib/drawing')
-rwxr-xr-xjs/lib/drawing/world.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 73273adc..781695b6 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -238,7 +238,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
238 if (this._canvas.task) { 238 if (this._canvas.task) {
239 this._firstRender = false; 239 this._firstRender = false;
240 240
241 if (!this.hasAnimatedMaterials()) { 241 if (!this.hasAnimatedMaterials() || !this._previewAnimation) {
242 this._canvas.task.stop(); 242 this._canvas.task.stop();
243 //this._renderCount = 10; 243 //this._renderCount = 10;
244 } 244 }
@@ -477,10 +477,6 @@ World.prototype.restartRenderLoop = function() {
477 if (this._allMapsLoaded) { 477 if (this._allMapsLoaded) {
478 //console.log( "starting task" ); 478 //console.log( "starting task" );
479 this._canvas.task.start(); 479 this._canvas.task.start();
480 if(!this._previewAnimation) {
481 //render only once if authortime animation is turned off
482 this._canvas.task.stop();
483 }
484 } else { 480 } else {
485 //console.log( "stopping task" ); 481 //console.log( "stopping task" );
486 this._canvas.task.stop(); 482 this._canvas.task.stop();