diff options
author | Jose Antonio Marquez Russo | 2012-03-09 13:44:58 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-09 13:44:58 -0800 |
commit | af4b43723df785c946abae90d44269e819d55d71 (patch) | |
tree | 761159dc0056354c231d3bfb4f851bfdcea4b462 /js/lib/rdge/materials/bump-metal-material.js | |
parent | 5da69dfd30f353ff753cba9322744e2f33f32a1a (diff) | |
parent | e92a6da7b84c58803489d70efedf74837ddfe4cd (diff) | |
download | ninja-af4b43723df785c946abae90d44269e819d55d71.tar.gz |
Merge pull request #32 from ericmueller/integration
Added asset folder replacement to runtime load.
Diffstat (limited to 'js/lib/rdge/materials/bump-metal-material.js')
-rwxr-xr-x | js/lib/rdge/materials/bump-metal-material.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js index 70873885..fa6f5300 100755 --- a/js/lib/rdge/materials/bump-metal-material.js +++ b/js/lib/rdge/materials/bump-metal-material.js | |||
@@ -163,9 +163,9 @@ var BumpMetalMaterial = function BumpMetalMaterial() { | |||
163 | throw new Error( "no world in material.export, " + this.getName() ); | 163 | throw new Error( "no world in material.export, " + this.getName() ); |
164 | 164 | ||
165 | exportStr += "lightDiff: " + this.getLightDiff() + "\n"; | 165 | exportStr += "lightDiff: " + this.getLightDiff() + "\n"; |
166 | exportStr += "diffuseTexture: " + world.cleansePath(this.getDiffuseTexture()) + "\n"; | 166 | exportStr += "diffuseTexture: " + this.getDiffuseTexture() + "\n"; |
167 | exportStr += "specularTexture: " + world.cleansePath(this.getSpecularTexture()) + "\n"; | 167 | exportStr += "specularTexture: " + this.getSpecularTexture() + "\n"; |
168 | exportStr += "normalMap: " + world.cleansePath(this.getNormalTexture()) + "\n"; | 168 | exportStr += "normalMap: " + this.getNormalTexture() + "\n"; |
169 | 169 | ||
170 | // every material needs to terminate like this | 170 | // every material needs to terminate like this |
171 | exportStr += "endMaterial\n"; | 171 | exportStr += "endMaterial\n"; |