aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/src/core/script/utilities.js
diff options
context:
space:
mode:
authorKris Kowal2012-07-06 11:52:06 -0700
committerKris Kowal2012-07-06 15:01:48 -0700
commit648ee61ae84216d0236e0dbc211addc13b2cfa3a (patch)
tree8f0f55557bd0c47a84e49c1977c950645d284607 /js/helper-classes/RDGE/src/core/script/utilities.js
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-648ee61ae84216d0236e0dbc211addc13b2cfa3a.tar.gz
Expand tabs
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/utilities.js')
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/utilities.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/utilities.js b/js/helper-classes/RDGE/src/core/script/utilities.js
index 7dfe5e44..ff67868c 100755
--- a/js/helper-classes/RDGE/src/core/script/utilities.js
+++ b/js/helper-classes/RDGE/src/core/script/utilities.js
@@ -68,7 +68,7 @@ RDGE.unProject = function (winx, winy, winz, modelMatrix, projMatrix, viewport)
68 var v4Out = RDGE.mat4.transformPoint(finalMatrix, inVal); 68 var v4Out = RDGE.mat4.transformPoint(finalMatrix, inVal);
69 69
70 if (v4Out[3] <= 0.0001) 70 if (v4Out[3] <= 0.0001)
71 return null; 71 return null;
72 72
73 v4Out[0] /= v4Out[3]; 73 v4Out[0] /= v4Out[3];
74 v4Out[1] /= v4Out[3]; 74 v4Out[1] /= v4Out[3];
@@ -181,19 +181,19 @@ RDGE.createShader = function (ctx, strVertShaderName, strFragShaderName, attribs
181 if (strVertShaderName.indexOf('{') != -1) { 181 if (strVertShaderName.indexOf('{') != -1) {
182 vShader = strVertShaderName; 182 vShader = strVertShaderName;
183 } else { 183 } else {
184 var vshaderRequest = new XMLHttpRequest(); 184 var vshaderRequest = new XMLHttpRequest();
185 vshaderRequest.open("GET", RDGE.globals.engine._assetPath+'shaders/' + strVertShaderName + '.glsl', false); 185 vshaderRequest.open("GET", RDGE.globals.engine._assetPath+'shaders/' + strVertShaderName + '.glsl', false);
186 vshaderRequest.send(null); 186 vshaderRequest.send(null);
187 vShader = vshaderRequest.responseText; 187 vShader = vshaderRequest.responseText;
188 } 188 }
189 189
190 if (strFragShaderName.indexOf('{') != -1) { 190 if (strFragShaderName.indexOf('{') != -1) {
191 fShader = strFragShaderName; 191 fShader = strFragShaderName;
192 } else { 192 } else {
193 var fshaderRequest = new XMLHttpRequest(); 193 var fshaderRequest = new XMLHttpRequest();
194 fshaderRequest.open("GET", RDGE.globals.engine._assetPath+'shaders/' + strFragShaderName + '.glsl', false); 194 fshaderRequest.open("GET", RDGE.globals.engine._assetPath+'shaders/' + strFragShaderName + '.glsl', false);
195 fshaderRequest.send(null); 195 fshaderRequest.send(null);
196 fShader = fshaderRequest.responseText; 196 fShader = fshaderRequest.responseText;
197 } 197 }
198 198
199 ctx.useProgram(null); 199 ctx.useProgram(null);