aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/Materials/MandelMaterial.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-02 11:28:45 -0800
committerPushkar Joshi2012-02-02 11:28:45 -0800
commitacc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9 (patch)
tree877f8ca734228c11050b037ce82fc0d1e1303193 /js/helper-classes/RDGE/Materials/MandelMaterial.js
parent4d4de64472603426a73b26cc98ba8206190949b8 (diff)
parent4222db97e353fb65fab787ba5927d16d9fa4e1f7 (diff)
downloadninja-acc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9.tar.gz
Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool
Diffstat (limited to 'js/helper-classes/RDGE/Materials/MandelMaterial.js')
-rw-r--r--js/helper-classes/RDGE/Materials/MandelMaterial.js4
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;