diff options
Diffstat (limited to 'js/helper-classes/RDGE/Materials/BumpMetalMaterial.js')
-rw-r--r-- | js/helper-classes/RDGE/Materials/BumpMetalMaterial.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js index 0aa3ee78..59720611 100644 --- a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js +++ b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js | |||
@@ -52,7 +52,7 @@ function BumpMetalMaterial() | |||
52 | /////////////////////////////////////////////////////////////////////// | 52 | /////////////////////////////////////////////////////////////////////// |
53 | // Material Property Accessors | 53 | // Material Property Accessors |
54 | /////////////////////////////////////////////////////////////////////// | 54 | /////////////////////////////////////////////////////////////////////// |
55 | this._propNames = ["lightDiff", "diffuseMap", "normalMap", "specularMap"]; | 55 | this._propNames = ["lightDiff", "diffuseTexture", "normalMap", "specularTexture"]; |
56 | this._propLabels = ["Diffuse Color", "Diffuse Map", "Bump Map", "Specular Map"]; | 56 | this._propLabels = ["Diffuse Color", "Diffuse Map", "Bump Map", "Specular Map"]; |
57 | this._propTypes = ["color", "file", "file", "file"]; | 57 | this._propTypes = ["color", "file", "file", "file"]; |
58 | this._propValues = []; | 58 | this._propValues = []; |
@@ -122,7 +122,7 @@ function BumpMetalMaterial() | |||
122 | exportStr += "lightDiff: " + this.getLightDiff() + "\n"; | 122 | exportStr += "lightDiff: " + this.getLightDiff() + "\n"; |
123 | exportStr += "diffuseTexture: " + this.getDiffuseTexture() + "\n"; | 123 | exportStr += "diffuseTexture: " + this.getDiffuseTexture() + "\n"; |
124 | exportStr += "specularTexture: " + this.getSpecularTexture() + "\n"; | 124 | exportStr += "specularTexture: " + this.getSpecularTexture() + "\n"; |
125 | exportStr += "normalTexture: " + this.getNormalTexture() + "\n"; | 125 | exportStr += "normalMap: " + this.getNormalTexture() + "\n"; |
126 | 126 | ||
127 | // every material needs to terminate like this | 127 | // every material needs to terminate like this |
128 | exportStr += "endMaterial\n"; | 128 | exportStr += "endMaterial\n"; |
@@ -143,12 +143,12 @@ function BumpMetalMaterial() | |||
143 | var lightDiff = eval( "[" + pu.nextValue( "lightDiff: " ) + "]" ), | 143 | var lightDiff = eval( "[" + pu.nextValue( "lightDiff: " ) + "]" ), |
144 | dt = pu.nextValue( "diffuseTexture: " ), | 144 | dt = pu.nextValue( "diffuseTexture: " ), |
145 | st = pu.nextValue( "specularTexture: " ), | 145 | st = pu.nextValue( "specularTexture: " ), |
146 | nt = pu.nextValue( "normalTexture: " ); | 146 | nt = pu.nextValue( "normalMap: " ); |
147 | 147 | ||
148 | this.setProperty( "lightDiff", lightDif); | 148 | this.setProperty( "lightDiff", lightDiff); |
149 | this.setProperty( "diffuseTexture", dt ); | 149 | this.setProperty( "diffuseTexture", dt ); |
150 | this.setProperty( "specularTexture", st ); | 150 | this.setProperty( "specularTexture", st ); |
151 | this.setProperty( "normalTexture", nt ); | 151 | this.setProperty( "normalMap", nt ); |
152 | 152 | ||
153 | var endKey = "endMaterial\n"; | 153 | var endKey = "endMaterial\n"; |
154 | var index = importStr.indexOf( endKey ); | 154 | var index = importStr.indexOf( endKey ); |