diff options
author | hwc487 | 2012-02-01 16:18:26 -0800 |
---|---|---|
committer | hwc487 | 2012-02-01 16:18:26 -0800 |
commit | 4222db97e353fb65fab787ba5927d16d9fa4e1f7 (patch) | |
tree | 0034304dd8ece8ca2d97ae8e57dde77f5781a524 | |
parent | 30bc466a0ac80f8303e223c19704b90457293cdc (diff) | |
download | ninja-4222db97e353fb65fab787ba5927d16d9fa4e1f7.tar.gz |
Removed a console log and set the Plasma material to animating.
-rw-r--r-- | js/helper-classes/RDGE/GLWorld.js | 3 | ||||
-rw-r--r-- | js/helper-classes/RDGE/Materials/PlasmaMaterial.js | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js index 0dc34034..819f89db 100644 --- a/js/helper-classes/RDGE/GLWorld.js +++ b/js/helper-classes/RDGE/GLWorld.js | |||
@@ -240,7 +240,7 @@ function GLWorld( canvas, use3D ) | |||
240 | if (renderer != aRenderer) console.log( "***** DIFFERENT RENDERERS *****" ); | 240 | if (renderer != aRenderer) console.log( "***** DIFFERENT RENDERERS *****" ); |
241 | renderer.disableCulling(); | 241 | renderer.disableCulling(); |
242 | this.myScene.render(); | 242 | this.myScene.render(); |
243 | console.log( "render" ); | 243 | //console.log( "render" ); |
244 | 244 | ||
245 | if (this._firstRender) | 245 | if (this._firstRender) |
246 | { | 246 | { |
@@ -510,6 +510,7 @@ GLWorld.prototype.restartRenderLoop = function() | |||
510 | console.log( "restartRenderLoop" ); | 510 | console.log( "restartRenderLoop" ); |
511 | 511 | ||
512 | this._firstRender = true; | 512 | this._firstRender = true; |
513 | this._renderCount = -1; | ||
513 | if (this._canvas.task) | 514 | if (this._canvas.task) |
514 | { | 515 | { |
515 | if (this._allMapsLoaded) | 516 | if (this._allMapsLoaded) |
diff --git a/js/helper-classes/RDGE/Materials/PlasmaMaterial.js b/js/helper-classes/RDGE/Materials/PlasmaMaterial.js index f900b35a..a65f3a33 100644 --- a/js/helper-classes/RDGE/Materials/PlasmaMaterial.js +++ b/js/helper-classes/RDGE/Materials/PlasmaMaterial.js | |||
@@ -32,6 +32,8 @@ function PlasmaMaterial() | |||
32 | /////////////////////////////////////////////////////////////////////// | 32 | /////////////////////////////////////////////////////////////////////// |
33 | this.getShaderName = function() { return this._shaderName; } | 33 | this.getShaderName = function() { return this._shaderName; } |
34 | 34 | ||
35 | this.isAnimated = function() { return true; } | ||
36 | |||
35 | /////////////////////////////////////////////////////////////////////// | 37 | /////////////////////////////////////////////////////////////////////// |
36 | // Material Property Accessors | 38 | // Material Property Accessors |
37 | /////////////////////////////////////////////////////////////////////// | 39 | /////////////////////////////////////////////////////////////////////// |