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/lib/drawing | |
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/lib/drawing')
-rwxr-xr-x | js/lib/drawing/world.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js index 07a2c3ae..b87c6272 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js | |||
@@ -117,6 +117,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) { | |||
117 | 117 | ||
118 | this.getRenderer = function() { return this.renderer; }; | 118 | this.getRenderer = function() { return this.renderer; }; |
119 | 119 | ||
120 | // Flag to play/pause animation at authortime | ||
121 | this._previewAnimation = true; | ||
120 | //////////////////////////////////////////////////////////////////////////////////// | 122 | //////////////////////////////////////////////////////////////////////////////////// |
121 | // RDGE | 123 | // RDGE |
122 | // local variables | 124 | // local variables |
@@ -475,6 +477,10 @@ World.prototype.restartRenderLoop = function() { | |||
475 | if (this._allMapsLoaded) { | 477 | if (this._allMapsLoaded) { |
476 | //console.log( "starting task" ); | 478 | //console.log( "starting task" ); |
477 | 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 | } | ||
478 | } else { | 484 | } else { |
479 | //console.log( "stopping task" ); | 485 | //console.log( "stopping task" ); |
480 | this._canvas.task.stop(); | 486 | this._canvas.task.stop(); |