From 7433f0bfbc3a7ea44320550ed2c1d90dc5e6f170 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 16:27:01 -0700
Subject: 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.

---
 js/helper-classes/RDGE/src/core/script/jshader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/helper-classes/RDGE/src/core/script/jshader.js')

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) {
 
     this.buildProgram = function (t) {
         window.console.log("building shader pair: <" + t.vshader + ", " + t.fshader + ">");
-        var vShaderDef = this.def.shaders[t.vshader];
-        var fShaderDef = this.def.shaders[t.fshader];
+        var vShaderDef = RDGE.globals.engine.remapAssetFolder(this.def.shaders[t.vshader]);
+        var fShaderDef = RDGE.globals.engine.remapAssetFolder(this.def.shaders[t.fshader]);
 
         this.ctx.useProgram(null);
 
@@ -494,7 +494,7 @@ RDGE.jshader = function (addr) {
             source = vShaderDef;
         } else {
             var vshaderRequest = new XMLHttpRequest();
-            var urlVertShader = vShaderDef;
+            var urlVertShader = vShaderDef;            
             vshaderRequest.open("GET", urlVertShader, false);
             vshaderRequest.send(null);
             source = vshaderRequest.responseText;
-- 
cgit v1.2.3