aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-23 13:37:31 -0700
committerNivesh Rajbhandari2012-03-23 13:37:31 -0700
commit2946d01666ff81f913bd06d1ac1381ed42b4a010 (patch)
tree022a7c57860cde73655be63b52d84578400f00bf /js
parent8e9ac98ea1001289cb3834b262200eee253cb408 (diff)
downloadninja-2946d01666ff81f913bd06d1ac1381ed42b4a010.tar.gz
Check for a authortime animation setting in the draw routine for WebGL.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-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 b87c6272..fb787256 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();