diff options
author | hwc487 | 2012-02-08 14:46:35 -0800 |
---|---|---|
committer | hwc487 | 2012-02-08 14:46:35 -0800 |
commit | ab4b753907bc80a969b0d4104d0b0731597e3bf0 (patch) | |
tree | 693e901a8bb1f760523492ea36bd30226d33be4b /js/helper-classes/RDGE/Materials | |
parent | 064d74fb2694318615f513c83772276cec34bb86 (diff) | |
download | ninja-ab4b753907bc80a969b0d4104d0b0731597e3bf0.tar.gz |
Removed unused rdge files from the compiler.
switched the preloader to use the compiled version of rdge
Updated the rdge binary.
Diffstat (limited to 'js/helper-classes/RDGE/Materials')
-rw-r--r-- | js/helper-classes/RDGE/Materials/UberMaterial.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/helper-classes/RDGE/Materials/UberMaterial.js b/js/helper-classes/RDGE/Materials/UberMaterial.js index afb745d1..aa4c3d1c 100644 --- a/js/helper-classes/RDGE/Materials/UberMaterial.js +++ b/js/helper-classes/RDGE/Materials/UberMaterial.js | |||
@@ -151,10 +151,10 @@ function UberMaterial() | |||
151 | { | 151 | { |
152 | // ubershader material properties. | 152 | // ubershader material properties. |
153 | 'material' : { | 153 | 'material' : { |
154 | 'ambientColor' : this._ambientColor, // material ambient color | 154 | 'ambientColor' : this._ambientColor, // material ambient color |
155 | 'diffuseColor' : this._diffuseColor, // material diffuse color | 155 | 'diffuseColor' : this._diffuseColor, // material diffuse color |
156 | 'specularColor' : this._specularColor, // material specular color | 156 | 'specularColor' : this._specularColor, // material specular color |
157 | 'specularPower' : this._specularPower, // material specular power (shininess) | 157 | 'specularPower' : this._specularPower // material specular power (shininess) |
158 | }, | 158 | }, |
159 | 159 | ||
160 | // ubershader supports up to four lights. | 160 | // ubershader supports up to four lights. |
@@ -162,7 +162,7 @@ function UberMaterial() | |||
162 | 'light0' : this._lights[0], | 162 | 'light0' : this._lights[0], |
163 | 'light1' : this._lights[1], | 163 | 'light1' : this._lights[1], |
164 | 'light2' : this._lights[2], | 164 | 'light2' : this._lights[2], |
165 | 'light3' : this._lights[3], | 165 | 'light3' : this._lights[3] |
166 | }, | 166 | }, |
167 | 167 | ||
168 | // uvTransform can be used to scale or offset the texture coordinates. | 168 | // uvTransform can be used to scale or offset the texture coordinates. |
@@ -178,7 +178,7 @@ function UberMaterial() | |||
178 | 'specularMap' : this._specularMapOb, | 178 | 'specularMap' : this._specularMapOb, |
179 | 179 | ||
180 | // optional environment map | 180 | // optional environment map |
181 | 'environmentMap' : this._environmentMapOb, | 181 | 'environmentMap' : this._environmentMapOb |
182 | }; | 182 | }; |
183 | 183 | ||
184 | this.updateAmbientColor = function() | 184 | this.updateAmbientColor = function() |