aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-13 11:24:35 -0700
committerPushkar Joshi2012-03-13 11:24:35 -0700
commit4ad1650f629e7e345eade52ed6dadc233b27cc45 (patch)
tree0e7b925f4dedf27f2684915e7e247e79c4a74aff /js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
parent730c42e005b1ebd96448e3bc2dd700ffd8909cb5 (diff)
parent9f3307810541ca6f95d7ca6d1febe8afdcd2c101 (diff)
downloadninja-4ad1650f629e7e345eade52ed6dadc233b27cc45.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js')
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/RadialGradientMaterial.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js b/js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
index 12842798..45b260ef 100755
--- a/js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
@@ -146,15 +146,17 @@ function RadialGradientMaterial()
146 // duplcate method requirde 146 // duplcate method requirde
147 this.dup = function() { return new RadialGradientMaterial(); } 147 this.dup = function() { return new RadialGradientMaterial(); }
148 148
149 this.init = function() 149 this.init = function( world )
150 { 150 {
151 this.setWorld( world );
152
151 // set up the shader 153 // set up the shader
152 this._shader = new jshader(); 154 this._shader = new jshader();
153 this._shader.def = radialGradientMaterialDef; 155 this._shader.def = radialGradientMaterialDef;
154 this._shader.init(); 156 this._shader.init();
155 157
156 // set up the material node 158 // set up the material node
157 this._materialNode = createMaterialNode("radialGradientMaterial"); 159 this._materialNode = createMaterialNode("radialGradientMaterial_" + world.generateUniqueNodeID());
158 this._materialNode.setShader(this._shader); 160 this._materialNode.setShader(this._shader);
159 161
160 // set the shader values in the shader 162 // set the shader values in the shader