diff options
Diffstat (limited to 'js/helper-classes/RDGE/Materials')
-rwxr-xr-x | js/helper-classes/RDGE/Materials/BumpMetalMaterial.js | 2 | ||||
-rwxr-xr-x | js/helper-classes/RDGE/Materials/RadialGradientMaterial.js | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js index 1a6c54c9..52332ab8 100755 --- a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js +++ b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js | |||
@@ -65,7 +65,7 @@ function BumpMetalMaterial() | |||
65 | this.setProperty = function( prop, value ) | 65 | this.setProperty = function( prop, value ) |
66 | { | 66 | { |
67 | // every material should do something with the "color" property | 67 | // every material should do something with the "color" property |
68 | if (prop === "color") prop = "lightDiff"; | 68 | if (prop === "color") return; //prop = "lightDiff"; |
69 | 69 | ||
70 | // make sure we have legitimate imput | 70 | // make sure we have legitimate imput |
71 | var ok = this.validateProperty( prop, value ); | 71 | var ok = this.validateProperty( prop, value ); |
diff --git a/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js b/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js index 4ebb1f30..45b260ef 100755 --- a/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js +++ b/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js | |||
@@ -146,8 +146,10 @@ 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; |