diff options
| author | Pushkar Joshi | 2012-02-09 13:42:59 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-09 13:42:59 -0800 |
| commit | 6bb00e69713bd7131b2bc0a15e4e0cb6071d616c (patch) | |
| tree | 08d43d3c3a6777032ce51c503947874c02bf3947 /js/helper-classes/RDGE/Materials/UberMaterial.js | |
| parent | 5f42bd1f7723483d374cdd3fe51ef8298c86a1a2 (diff) | |
| parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
| download | ninja-6bb00e69713bd7131b2bc0a15e4e0cb6071d616c.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/helper-classes/RDGE/Materials/UberMaterial.js')
| -rw-r--r-- | 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 100644 --- 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); |