diff options
author | Jose Antonio Marquez | 2012-03-11 11:29:56 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-11 11:29:56 -0700 |
commit | 49e4c8695941f6bdd15893534ffb3ccce92c5396 (patch) | |
tree | 9e8327be823441717ad44684d0e3714c56116f39 /js/helper-classes/RDGE/src/core/script/utilities.js | |
parent | 9ab4b4306343ec2a20094c7626abb524b7720ce8 (diff) | |
parent | 242bddd5b64c4a5226daa2f4caa10bf63c56403a (diff) | |
download | ninja-49e4c8695941f6bdd15893534ffb3ccce92c5396.tar.gz |
Merge branch 'refs/heads/FileIO-Integration' into FileIO
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/utilities.js')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/utilities.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/utilities.js b/js/helper-classes/RDGE/src/core/script/utilities.js index e19c727f..e55f2b33 100755 --- a/js/helper-classes/RDGE/src/core/script/utilities.js +++ b/js/helper-classes/RDGE/src/core/script/utilities.js | |||
@@ -159,7 +159,7 @@ function createShader(ctx, strVertShaderName, strFragShaderName, attribs) | |||
159 | } else | 159 | } else |
160 | { | 160 | { |
161 | var vshaderRequest = new XMLHttpRequest(); | 161 | var vshaderRequest = new XMLHttpRequest(); |
162 | vshaderRequest.open("GET", 'assets/shaders/' + strVertShaderName + '.glsl', false); | 162 | vshaderRequest.open("GET", g_Engine._assetPath+'shaders/' + strVertShaderName + '.glsl', false); |
163 | vshaderRequest.send(null); | 163 | vshaderRequest.send(null); |
164 | vShader = vshaderRequest.responseText; | 164 | vShader = vshaderRequest.responseText; |
165 | } | 165 | } |
@@ -169,7 +169,7 @@ function createShader(ctx, strVertShaderName, strFragShaderName, attribs) | |||
169 | } else | 169 | } else |
170 | { | 170 | { |
171 | var fshaderRequest = new XMLHttpRequest(); | 171 | var fshaderRequest = new XMLHttpRequest(); |
172 | fshaderRequest.open("GET", 'assets/shaders/' + strFragShaderName + '.glsl', false); | 172 | fshaderRequest.open("GET", g_Engine._assetPath+'shaders/' + strFragShaderName + '.glsl', false); |
173 | fshaderRequest.send(null); | 173 | fshaderRequest.send(null); |
174 | fShader = fshaderRequest.responseText; | 174 | fShader = fshaderRequest.responseText; |
175 | } | 175 | } |