aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/helper-classes/RDGE/Materials/BumpMetalMaterial.js')
-rw-r--r--js/helper-classes/RDGE/Materials/BumpMetalMaterial.js10
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 17be0cd7..999d4676 100644
--- a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js
+++ b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js
@@ -51,7 +51,7 @@ function BumpMetalMaterial()
51 /////////////////////////////////////////////////////////////////////// 51 ///////////////////////////////////////////////////////////////////////
52 // Material Property Accessors 52 // Material Property Accessors
53 /////////////////////////////////////////////////////////////////////// 53 ///////////////////////////////////////////////////////////////////////
54 this._propNames = ["lightDiff", "diffuseMap", "normalMap", "specularMap"]; 54 this._propNames = ["lightDiff", "diffuseTexture", "normalMap", "specularTexture"];
55 this._propLabels = ["Diffuse Color", "Diffuse Map", "Bump Map", "Specular Map"]; 55 this._propLabels = ["Diffuse Color", "Diffuse Map", "Bump Map", "Specular Map"];
56 this._propTypes = ["color", "file", "file", "file"]; 56 this._propTypes = ["color", "file", "file", "file"];
57 this._propValues = []; 57 this._propValues = [];
@@ -151,7 +151,7 @@ function BumpMetalMaterial()
151 exportStr += "lightDiff: " + this.getLightDiff() + "\n"; 151 exportStr += "lightDiff: " + this.getLightDiff() + "\n";
152 exportStr += "diffuseTexture: " + this.getDiffuseTexture() + "\n"; 152 exportStr += "diffuseTexture: " + this.getDiffuseTexture() + "\n";
153 exportStr += "specularTexture: " + this.getSpecularTexture() + "\n"; 153 exportStr += "specularTexture: " + this.getSpecularTexture() + "\n";
154 exportStr += "normalTexture: " + this.getNormalTexture() + "\n"; 154 exportStr += "normalMap: " + this.getNormalTexture() + "\n";
155 155
156 // every material needs to terminate like this 156 // every material needs to terminate like this
157 exportStr += "endMaterial\n"; 157 exportStr += "endMaterial\n";
@@ -172,12 +172,12 @@ function BumpMetalMaterial()
172 var lightDiff = eval( "[" + pu.nextValue( "lightDiff: " ) + "]" ), 172 var lightDiff = eval( "[" + pu.nextValue( "lightDiff: " ) + "]" ),
173 dt = pu.nextValue( "diffuseTexture: " ), 173 dt = pu.nextValue( "diffuseTexture: " ),
174 st = pu.nextValue( "specularTexture: " ), 174 st = pu.nextValue( "specularTexture: " ),
175 nt = pu.nextValue( "normalTexture: " ); 175 nt = pu.nextValue( "normalMap: " );
176 176
177 this.setProperty( "lightDiff", lightDif); 177 this.setProperty( "lightDiff", lightDiff);
178 this.setProperty( "diffuseTexture", dt ); 178 this.setProperty( "diffuseTexture", dt );
179 this.setProperty( "specularTexture", st ); 179 this.setProperty( "specularTexture", st );
180 this.setProperty( "normalTexture", nt ); 180 this.setProperty( "normalMap", nt );
181 181
182 var endKey = "endMaterial\n"; 182 var endKey = "endMaterial\n";
183 var index = importStr.indexOf( endKey ); 183 var index = importStr.indexOf( endKey );