diff options
author | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
commit | 85f21e020ac281e8e545df1cf269034de99a00b1 (patch) | |
tree | 441834fa8b02b1cc2a970210020d27e06d2c99be /js/lib/rdge/materials/radial-gradient-material.js | |
parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz |
Merge pull request #29 from ericmueller/integration
Integration
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 |