aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-13 13:05:33 -0700
committerNivesh Rajbhandari2012-03-13 13:05:33 -0700
commit92fc2e3c4bca2edb04102431b4959aafe022f329 (patch)
treed48c090f71ed2cd6bd6ce38ff68c36ab69299985 /js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
parentefb92cf52680d31f05fed3757e74862592cc2d4c (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-92fc2e3c4bca2edb04102431b4959aafe022f329.tar.gz
Merge branch 'refs/heads/ninja-internal' into ToolFixes
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