diff options
author | Pushkar Joshi | 2012-03-13 11:24:35 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-13 11:24:35 -0700 |
commit | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (patch) | |
tree | 0e7b925f4dedf27f2684915e7e247e79c4a74aff /js/lib/rdge/materials/radial-gradient-material.js | |
parent | 730c42e005b1ebd96448e3bc2dd700ffd8909cb5 (diff) | |
parent | 9f3307810541ca6f95d7ca6d1febe8afdcd2c101 (diff) | |
download | ninja-4ad1650f629e7e345eade52ed6dadc233b27cc45.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/lib/rdge/materials/radial-gradient-material.js')
-rwxr-xr-x | js/lib/rdge/materials/radial-gradient-material.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js index 13be50f5..d19b44b7 100755 --- a/js/lib/rdge/materials/radial-gradient-material.js +++ b/js/lib/rdge/materials/radial-gradient-material.js | |||
@@ -193,14 +193,17 @@ var RadialGradientMaterial = function RadialGradientMaterial() { | |||
193 | return new RadialGradientMaterial(); | 193 | return new RadialGradientMaterial(); |
194 | }; | 194 | }; |
195 | 195 | ||
196 | this.init = function() { | 196 | this.init = function( world ) |
197 | { | ||
198 | this.setWorld( world ); | ||
199 | |||
197 | // set up the shader | 200 | // set up the shader |
198 | this._shader = new jshader(); | 201 | this._shader = new jshader(); |
199 | this._shader.def = radialGradientMaterialDef; | 202 | this._shader.def = radialGradientMaterialDef; |
200 | this._shader.init(); | 203 | this._shader.init(); |
201 | 204 | ||
202 | // set up the material node | 205 | // set up the material node |
203 | this._materialNode = createMaterialNode("radialGradientMaterial"); | 206 | this._materialNode = createMaterialNode("radialGradientMaterial" + "_" + world.generateUniqueNodeID()); |
204 | this._materialNode.setShader(this._shader); | 207 | this._materialNode.setShader(this._shader); |
205 | 208 | ||
206 | // set the shader values in the shader | 209 | // set the shader values in the shader |