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/helper-classes/backup-delete/Materials/RadialGradientMaterial.js | |
parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz |
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js')
-rwxr-xr-x | js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js | 6 |
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 |