aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials
diff options
context:
space:
mode:
authorJose Antonio Marquez Russo2012-03-09 13:44:58 -0800
committerJose Antonio Marquez Russo2012-03-09 13:44:58 -0800
commitaf4b43723df785c946abae90d44269e819d55d71 (patch)
tree761159dc0056354c231d3bfb4f851bfdcea4b462 /js/lib/rdge/materials
parent5da69dfd30f353ff753cba9322744e2f33f32a1a (diff)
parente92a6da7b84c58803489d70efedf74837ddfe4cd (diff)
downloadninja-af4b43723df785c946abae90d44269e819d55d71.tar.gz
Merge pull request #32 from ericmueller/integration
Added asset folder replacement to runtime load.
Diffstat (limited to 'js/lib/rdge/materials')
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js6
-rw-r--r--js/lib/rdge/materials/pulse-material.js2
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js2
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js8
4 files changed, 9 insertions, 9 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";
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 8ad78bd4..81db36c6 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -183,7 +183,7 @@ var PulseMaterial = function PulseMaterial() {
183 if (!world) 183 if (!world)
184 throw new Error( "no world in material.export, " + this.getName() ); 184 throw new Error( "no world in material.export, " + this.getName() );
185 185
186 var texMapName = world.cleansePath( this._propValues[this._propNames[0]] ); 186 var texMapName = this._propValues[this._propNames[0]];
187 exportStr += "texture: " +texMapName + "\n"; 187 exportStr += "texture: " +texMapName + "\n";
188 188
189 // every material needs to terminate like this 189 // every material needs to terminate like this
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index f23f0712..46cdda74 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -166,7 +166,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
166 if (!world) 166 if (!world)
167 throw new Error( "no world in material.export, " + this.getName() ); 167 throw new Error( "no world in material.export, " + this.getName() );
168 168
169 var texMapName = world.cleansePath( this._propValues[this._propNames[0]] ); 169 var texMapName = this._propValues[this._propNames[0]];
170 exportStr += "texture: " + texMapName + "\n"; 170 exportStr += "texture: " + texMapName + "\n";
171 171
172 // every material needs to terminate like this 172 // every material needs to terminate like this
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index d120ffa1..655d8e2a 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -457,16 +457,16 @@ var UberMaterial = function UberMaterial() {
457 throw new Error( "no world in material.export, " + this.getName() ); 457 throw new Error( "no world in material.export, " + this.getName() );
458 458
459 if(typeof caps.diffuseMap != 'undefined') 459 if(typeof caps.diffuseMap != 'undefined')
460 exportStr += "diffuseMap: " + world.cleansePath(caps.diffuseMap.texture) + "\n"; 460 exportStr += "diffuseMap: " + caps.diffuseMap.texture + "\n";
461 461
462 if(typeof caps.normalMap != 'undefined') 462 if(typeof caps.normalMap != 'undefined')
463 exportStr += "normalMap: " + world.cleansePath(caps.normalMap.texture) + "\n"; 463 exportStr += "normalMap: " + caps.normalMap.texture + "\n";
464 464
465 if(typeof caps.specularMap != 'undefined') 465 if(typeof caps.specularMap != 'undefined')
466 exportStr += "specularMap: " + world.cleansePath(caps.specularMap.texture) + "\n"; 466 exportStr += "specularMap: " + caps.specularMap.texture + "\n";
467 467
468 if(typeof caps.environmentMap != 'undefined') 468 if(typeof caps.environmentMap != 'undefined')
469 exportStr += "environmentMap: " + world.cleansePath(caps.environmentMap.texture) + "\n"; 469 exportStr += "environmentMap: " + caps.environmentMap.texture + "\n";
470 470
471 // every material needs to terminate like this 471 // every material needs to terminate like this
472 exportStr += "endMaterial\n"; 472 exportStr += "endMaterial\n";