diff options
| author | Jose Antonio Marquez | 2012-02-09 15:02:51 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-09 15:02:51 -0800 |
| commit | 67a5b6a1fb352bdc69ff05297268c27e7e2ba795 (patch) | |
| tree | 8483701ec4d16143a2517b82a8148a7c5a456b0c /js/helper-classes/RDGE/Materials/UberMaterial.js | |
| parent | 74efc1238f51e9c0ffdeffe2a349f66011ef9f17 (diff) | |
| parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
| download | ninja-67a5b6a1fb352bdc69ff05297268c27e7e2ba795.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/helper-classes/RDGE/Materials/UberMaterial.js')
| -rwxr-xr-x | js/helper-classes/RDGE/Materials/UberMaterial.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/helper-classes/RDGE/Materials/UberMaterial.js b/js/helper-classes/RDGE/Materials/UberMaterial.js index afb745d1..73356b03 100755 --- a/js/helper-classes/RDGE/Materials/UberMaterial.js +++ b/js/helper-classes/RDGE/Materials/UberMaterial.js | |||
| @@ -45,9 +45,9 @@ function UberMaterial() | |||
| 45 | /////////////////////////////////////////////////////////////////////// | 45 | /////////////////////////////////////////////////////////////////////// |
| 46 | // Material Property Accessors | 46 | // Material Property Accessors |
| 47 | /////////////////////////////////////////////////////////////////////// | 47 | /////////////////////////////////////////////////////////////////////// |
| 48 | this._propNames = ["ambientColor", "diffuseColor", "specularColor", "specularPower" , "diffuseMap", "normalMap", "specularMap", "environmentMap", "environmentAmount", "dummy" ]; | 48 | this._propNames = ["ambientColor", "diffuseColor", "specularColor", "specularPower" , "diffuseMap", "normalMap", "specularMap", "environmentMap", "environmentAmount" ]; |
| 49 | this._propLabels = ["Ambient Color", "Diffuse Color", "Specular Color", "Specular Power", "Texture Map", "Bump Map", "Specular Map", "Environment Map", "Environment Map Amount", "Dummy" ]; | 49 | this._propLabels = ["Ambient Color", "Diffuse Color", "Specular Color", "Specular Power", "Texture Map", "Bump Map", "Specular Map", "Environment Map", "Environment Map Amount" ]; |
| 50 | this._propTypes = ["color", "color", "color", "float", "file", "file", "file", "file", "float", "checkbox"]; | 50 | this._propTypes = ["color", "color", "color", "float", "file", "file", "file", "file", "float" ]; |
| 51 | this._propValues = []; | 51 | this._propValues = []; |
| 52 | 52 | ||
| 53 | this._propValues[ this._propNames[0] ] = this._ambientColor.slice(0); | 53 | this._propValues[ this._propNames[0] ] = this._ambientColor.slice(0); |