aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-04-15 12:11:03 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-04-15 12:11:03 -0700
commit925df4b874a52616590fb8cefa02d8f010258c5e (patch)
tree996c90fd026ac18a77a604dbf3d7057a5f3e515d /src
parentb4ba22e7ed9448d8459244af29cc93bf2e1fe083 (diff)
small gl cleanup
Diffstat (limited to 'src')
-rw-r--r--src/library_gl.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/library_gl.js b/src/library_gl.js
index 74d032e2..4ef75fb1 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -1014,9 +1014,6 @@ var LibraryGL = {
Module.ctx.bufferData(Module.ctx.ELEMENT_ARRAY_BUFFER, this.indexData.subarray(0, this.indexCounter), Module.ctx.STATIC_DRAW);
// Render
- //Module.ctx.viewport(0, 0, Module.canvas.width, Module.canvas.height);
- //Module.ctx.clear(Module.ctx.COLOR_BUFFER_BIT);
-
Module.ctx.useProgram(this.program);
Module.ctx.bindBuffer(Module.ctx.ARRAY_BUFFER, this.vertexObject);
@@ -1026,14 +1023,13 @@ var LibraryGL = {
Module.ctx.enableVertexAttribArray(this.texCoordLocation);
Module.ctx.enableVertexAttribArray(this.positionLocation);
- // Assume the texture is bound
var texture = Module.ctx.getParameter(Module.ctx.TEXTURE_BINDING_2D);
Module.ctx.activeTexture(Module.ctx.TEXTURE0);
Module.ctx.bindTexture(Module.ctx.TEXTURE_2D, texture);
Module.ctx.uniform1i(this.textureLocation, 0);
- Module.ctx.uniformMatrix4fv(this.modelViewLocation, 0 /* GL_FALSE */, GL.immediate.matrix["m"]);
- Module.ctx.uniformMatrix4fv(this.projectionLocation, 0 /* GL_FALSE */, GL.immediate.matrix["p"]);
+ Module.ctx.uniformMatrix4fv(this.modelViewLocation, false, GL.immediate.matrix["m"]);
+ Module.ctx.uniformMatrix4fv(this.projectionLocation, false, GL.immediate.matrix["p"]);
Module.ctx.bindBuffer(Module.ctx.ELEMENT_ARRAY_BUFFER, this.indexObject);
Module.ctx.drawElements(Module.ctx.TRIANGLES, this.indexCounter, Module.ctx.UNSIGNED_SHORT, 0);