diff options
author | Jose Antonio Marquez | 2012-03-10 16:30:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-10 16:30:45 -0800 |
commit | 7d4d8651d059a91d29142d7f07d3122eb64532fa (patch) | |
tree | 6f180ddb9f631b49271670771144759c39f3c919 /js/helper-classes/RDGE/src/core/script/utilities.js | |
parent | 94ddbc239965cb39431708e78dde5127c64b0060 (diff) | |
parent | 615be47750fb86c07acd9354da12a76abe6c24e0 (diff) | |
download | ninja-7d4d8651d059a91d29142d7f07d3122eb64532fa.tar.gz |
Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate
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 | } |