diff options
author | Jose Antonio Marquez | 2012-02-09 12:09:09 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-09 12:09:09 -0800 |
commit | 44c65bc6bbd5b754f9073f93a3afca8dd9acc864 (patch) | |
tree | 0e9ac4c8b2f8ce3246739ab06053e9986e8c9b51 /js/helper-classes/RDGE/Materials/MandelMaterial.js | |
parent | d7e198f5a95011679fa2c536780edbdc533a4893 (diff) | |
parent | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff) | |
download | ninja-44c65bc6bbd5b754f9073f93a3afca8dd9acc864.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/helper-classes/RDGE/Materials/MandelMaterial.js')
-rwxr-xr-x | 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 100755 --- 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; |