aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/src/core/script/jshader.js
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-03 16:27:01 -0700
committerJohn Mayhew2012-04-03 16:27:01 -0700
commit7433f0bfbc3a7ea44320550ed2c1d90dc5e6f170 (patch)
treeb0f2b79c8624e26327995991077a89b7969ded94 /js/helper-classes/RDGE/src/core/script/jshader.js
parent18609d375e7aab9cb48c9b3f5b291f85cbd28683 (diff)
downloadninja-7433f0bfbc3a7ea44320550ed2c1d90dc5e6f170.tar.gz
Removed the dependence on an "assets" directory for the RDGE runtime. Now Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/jshader.js')
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/jshader.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/jshader.js b/js/helper-classes/RDGE/src/core/script/jshader.js
index 2bccaa80..22180344 100755
--- a/js/helper-classes/RDGE/src/core/script/jshader.js
+++ b/js/helper-classes/RDGE/src/core/script/jshader.js
@@ -482,8 +482,8 @@ RDGE.jshader = function (addr) {
482 482
483 this.buildProgram = function (t) { 483 this.buildProgram = function (t) {
484 window.console.log("building shader pair: <" + t.vshader + ", " + t.fshader + ">"); 484 window.console.log("building shader pair: <" + t.vshader + ", " + t.fshader + ">");
485 var vShaderDef = this.def.shaders[t.vshader]; 485 var vShaderDef = RDGE.globals.engine.remapAssetFolder(this.def.shaders[t.vshader]);
486 var fShaderDef = this.def.shaders[t.fshader]; 486 var fShaderDef = RDGE.globals.engine.remapAssetFolder(this.def.shaders[t.fshader]);
487 487
488 this.ctx.useProgram(null); 488 this.ctx.useProgram(null);
489 489
@@ -494,7 +494,7 @@ RDGE.jshader = function (addr) {
494 source = vShaderDef; 494 source = vShaderDef;
495 } else { 495 } else {
496 var vshaderRequest = new XMLHttpRequest(); 496 var vshaderRequest = new XMLHttpRequest();
497 var urlVertShader = vShaderDef; 497 var urlVertShader = vShaderDef;
498 vshaderRequest.open("GET", urlVertShader, false); 498 vshaderRequest.open("GET", urlVertShader, false);
499 vshaderRequest.send(null); 499 vshaderRequest.send(null);
500 source = vshaderRequest.responseText; 500 source = vshaderRequest.responseText;