aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/Materials/MandelMaterial.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-09 13:41:45 -0800
committerValerio Virgillito2012-02-09 13:41:45 -0800
commitf5193cd04a2597051d88fced878efbc4802ea64c (patch)
treedc343dc98fa9f99133d9882bd9b92cfe81296d1a /js/helper-classes/RDGE/Materials/MandelMaterial.js
parente2539230b8a297fa972af6d53fe9de3ef2ad43fa (diff)
parent666ae3e9119410cbf7fa974274d95336aaff091c (diff)
downloadninja-f5193cd04a2597051d88fced878efbc4802ea64c.tar.gz
Merge branch 'refs/heads/master' into components
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;