aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/radial-gradient-material.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-13 11:36:11 -0700
committerPushkar Joshi2012-03-13 11:36:11 -0700
commit6023f7c8258e660388ee33730601f1161f9299e9 (patch)
tree632484428b398f71b8481aa8e30180895ff2483c /js/lib/rdge/materials/radial-gradient-material.js
parent76f2021618c0a6a99a1b855233e353e84ca99467 (diff)
parent4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff)
downloadninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/lib/rdge/materials/radial-gradient-material.js')
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js7
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