diff options
author | Valerio Virgillito | 2012-02-09 11:57:35 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-09 11:57:35 -0800 |
commit | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (patch) | |
tree | 292934c613d7d6952cddac618a7db13a04c48bb3 /js/helper-classes/RDGE/Materials/MandelMaterial.js | |
parent | e78f4312c194d9e8188075cf1fe87e4be22b24e4 (diff) | |
parent | fba39dbb3bd64eddf6162fbf57232089e446fb06 (diff) | |
download | ninja-ce81a3f4387d80f9ac406e73b843fb5dbe9cf432.tar.gz |
Merge pull request #26 from pushkarjoshi/pentool
Pentool
Diffstat (limited to 'js/helper-classes/RDGE/Materials/MandelMaterial.js')
-rw-r--r-- | js/helper-classes/RDGE/Materials/MandelMaterial.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/Materials/MandelMaterial.js b/js/helper-classes/RDGE/Materials/MandelMaterial.js index 76083b76..25b08404 100644 --- a/js/helper-classes/RDGE/Materials/MandelMaterial.js +++ b/js/helper-classes/RDGE/Materials/MandelMaterial.js | |||
@@ -42,6 +42,7 @@ function MandelMaterial() | |||
42 | 42 | ||
43 | /////////////////////////////////////////////////////////////////////// | 43 | /////////////////////////////////////////////////////////////////////// |
44 | 44 | ||
45 | this.isAnimated = function() { return true; } | ||
45 | 46 | ||
46 | /////////////////////////////////////////////////////////////////////// | 47 | /////////////////////////////////////////////////////////////////////// |
47 | // Methods | 48 | // Methods |
@@ -64,6 +65,9 @@ function MandelMaterial() | |||
64 | 65 | ||
65 | this.init = function( world ) | 66 | this.init = function( world ) |
66 | { | 67 | { |
68 | // save the world | ||
69 | if (world) this.setWorld( world ); | ||
70 | |||
67 | // set up the shader | 71 | // set up the shader |
68 | this._shader = new jshader(); | 72 | this._shader = new jshader(); |
69 | this._shader.def = MandelMaterialDef; | 73 | this._shader.def = MandelMaterialDef; |