webgl-tools
diff sanegl.js @ 2:9eb4c37ce415
- added set_uniform functions in glass.js
- added normal matrix uniform in sanegl.js
| author | John Tsiombikas <nuclear@member.fsf.org> |
|---|---|
| date | Thu, 16 Jun 2011 07:13:20 +0300 |
| parents | 4fe036e28796 |
| children | 56ae66e32998 |
line diff
1.1 --- a/sanegl.js Wed Jun 15 20:45:50 2011 +0300 1.2 +++ b/sanegl.js Thu Jun 16 07:13:20 2011 +0300 1.3 @@ -164,17 +164,26 @@ 1.4 1.5 var loc = gl.getUniformLocation(prog, "mvmat"); 1.6 if(loc != -1) { 1.7 - gl.uniformMatrix4fv(loc, gl.FALSE, gl_mat[GL_MODELVIEW][mvtop]); 1.8 + gl.uniformMatrix4fv(loc, false, gl_mat[GL_MODELVIEW][mvtop]); 1.9 } 1.10 1.11 loc = gl.getUniformLocation(prog, "projmat"); 1.12 if(loc != -1) { 1.13 - gl.uniformMatrix4fv(loc, gl.FALSE, gl_mat[GL_PROJECTION][ptop]); 1.14 + gl.uniformMatrix4fv(loc, false, gl_mat[GL_PROJECTION][ptop]); 1.15 } 1.16 1.17 loc = gl.getUniformLocation(prog, "texmat"); 1.18 if(loc != -1) { 1.19 - gl.uniformMatrix4fv(loc, gl.FALSE, gl_mat[GL_TEXTURE][ttop]); 1.20 + gl.uniformMatrix4fv(loc, false, gl_mat[GL_TEXTURE][ttop]); 1.21 + } 1.22 + 1.23 + loc = gl.getUniformLocation(prog, "normmat"); 1.24 + if(loc != -1) { 1.25 + var normmat = new Float32Array(16); 1.26 + m4_copy(normmat, gl_mat[GL_MODELVIEW][mvtop]); 1.27 + normmat[3] = normmat[7] = normmat[11] = normmat[12] = normmat[13] = normmat[14] = 0.0; 1.28 + normmat[15] = 1.0; 1.29 + gl.uniformMatrix4fv(loc, false, normmat); 1.30 } 1.31 } 1.32