diff options
author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/lib/rdge/materials/radial-gradient-material.js | |
parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
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 |