diff options
Diffstat (limited to 'js/lib/rdge/materials/uber-material.js')
-rwxr-xr-x | js/lib/rdge/materials/uber-material.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js index 8bd44e60..34aa06bf 100755 --- a/js/lib/rdge/materials/uber-material.js +++ b/js/lib/rdge/materials/uber-material.js | |||
@@ -146,9 +146,9 @@ var UberMaterial = function UberMaterial() { | |||
146 | 'spotOuterCutoff': 15.0, // fragments outside the outer cutoff 'cone' are unlit. | 146 | 'spotOuterCutoff': 15.0, // fragments outside the outer cutoff 'cone' are unlit. |
147 | 'position': [8.0, 2.0, 8.0], // light position; ignored for directional lights | 147 | 'position': [8.0, 2.0, 8.0], // light position; ignored for directional lights |
148 | 'direction': [-1.0, -1.0, -1.0], // light direction; ignored for point lights | 148 | 'direction': [-1.0, -1.0, -1.0], // light direction; ignored for point lights |
149 | 'attenuation': [1.0, 0.025, 0.00125], // light attenuation; constant, linear, quadratic | 149 | 'attenuation': [1.0, 0.025, 0.00125], // light attenuation; constant, linear, quadratic |
150 | 'diffuseColor': [1.0, 0.5, 0.5, 1.0], // diffuse light color | 150 | 'diffuseColor': [1.0, 0.5, 0.5, 1.0], // diffuse light color |
151 | 'specularColor': [1.0, 1.0, 1.0, 1.0] // specular light color | 151 | 'specularColor': [1.0, 1.0, 1.0, 1.0] // specular light color |
152 | }, | 152 | }, |
153 | { | 153 | { |
154 | 'type': 'point', | 154 | 'type': 'point', |
@@ -184,7 +184,7 @@ var UberMaterial = function UberMaterial() { | |||
184 | 184 | ||
185 | this._ubershaderCaps = | 185 | this._ubershaderCaps = |
186 | { | 186 | { |
187 | // ubershader material properties. | 187 | // ubershader material properties. |
188 | 'material': { | 188 | 'material': { |
189 | 'ambientColor': this._ambientColor, // material ambient color | 189 | 'ambientColor': this._ambientColor, // material ambient color |
190 | 'diffuseColor': this._diffuseColor, // material diffuse color | 190 | 'diffuseColor': this._diffuseColor, // material diffuse color |
@@ -192,7 +192,7 @@ var UberMaterial = function UberMaterial() { | |||
192 | 'specularPower': this._specularPower // material specular power (shininess) | 192 | 'specularPower': this._specularPower // material specular power (shininess) |
193 | }, | 193 | }, |
194 | 194 | ||
195 | // ubershader supports up to four lights. | 195 | // ubershader supports up to four lights. |
196 | 'lighting': { | 196 | 'lighting': { |
197 | 'light0': this._lights[0], | 197 | 'light0': this._lights[0], |
198 | 'light1': this._lights[1], | 198 | 'light1': this._lights[1], |
@@ -386,7 +386,7 @@ var UberMaterial = function UberMaterial() { | |||
386 | // get the current values; | 386 | // get the current values; |
387 | var propNames = [], propValues = [], propTypes = [], propLabels = []; | 387 | var propNames = [], propValues = [], propTypes = [], propLabels = []; |
388 | this.getAllProperties(propNames, propValues, propTypes, propLabels); | 388 | this.getAllProperties(propNames, propValues, propTypes, propLabels); |
389 | 389 | ||
390 | // allocate a new material | 390 | // allocate a new material |
391 | var newMat = new UberMaterial(); | 391 | var newMat = new UberMaterial(); |
392 | newMat._useDiffuseMap = this._useDiffuseMap; | 392 | newMat._useDiffuseMap = this._useDiffuseMap; |
@@ -434,7 +434,7 @@ var UberMaterial = function UberMaterial() { | |||
434 | } | 434 | } |
435 | } | 435 | } |
436 | } | 436 | } |
437 | 437 | ||
438 | this.isAnimated = function() | 438 | this.isAnimated = function() |
439 | { | 439 | { |
440 | var anim = (this._diffuseTexture && this._diffuseTexture.isAnimated()); | 440 | var anim = (this._diffuseTexture && this._diffuseTexture.isAnimated()); |
@@ -687,7 +687,7 @@ var UberMaterial = function UberMaterial() { | |||
687 | var vshader = preproc + uberVShader; | 687 | var vshader = preproc + uberVShader; |
688 | var fshader = preproc + uberFShader; | 688 | var fshader = preproc + uberFShader; |
689 | 689 | ||
690 | // build output jshader | 690 | // build output jshader |
691 | var uberJShader = new RDGE.jshader(); | 691 | var uberJShader = new RDGE.jshader(); |
692 | uberJShader.def = { | 692 | uberJShader.def = { |
693 | 'shaders': { | 693 | 'shaders': { |