aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-01-11 15:53:09 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-01-11 15:53:09 -0800
commit8c2c4e790515bd97ec81b7f3f78b73e532712386 (patch)
treec76f785e52ba0c6b05ffc79b5165743b76fbddc4
parentf064ac431c1d69d536984d8d0c4d96adbbedd81b (diff)
fix gl lib alias calling from js lib code
-rw-r--r--src/library_gl.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/library_gl.js b/src/library_gl.js
index 55f9600e..03e5b1d0 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -2069,7 +2069,7 @@ var LibraryGL = {
#endif
GL.immediate.vertexData[GL.immediate.vertexCounter++] = x;
GL.immediate.vertexData[GL.immediate.vertexCounter++] = y;
- GL.immediate.vertexData[GL.immediate.vertexCounter++] = z || 0;
+ GL.immediate.vertexData[GL.immediate.vertexCounter++] = z;
#if ASSERTIONS
assert(GL.immediate.vertexCounter << 2 < GL.immediate.MAX_TEMP_BUFFER_SIZE);
#endif
@@ -2081,8 +2081,9 @@ var LibraryGL = {
glVertex3fv: function(p) {
_glVertex3f({{{ makeGetValue('p', '0', 'float') }}}, {{{ makeGetValue('p', '4', 'float') }}}, {{{ makeGetValue('p', '8', 'float') }}});
},
+ glVertex2fv__deps: ['glVertex3f'],
glVertex2fv: function(p) {
- _glVertex2f({{{ makeGetValue('p', '0', 'float') }}}, {{{ makeGetValue('p', '4', 'float') }}});
+ _glVertex3f({{{ makeGetValue('p', '0', 'float') }}}, {{{ makeGetValue('p', '4', 'float') }}}, 0);
},
glTexCoord2i: function(u, v) {
@@ -2095,9 +2096,9 @@ var LibraryGL = {
},
glTexCoord2f: 'glTexCoord2i',
- glTexCoord2fv__deps: ['glTexCoord2f'],
+ glTexCoord2fv__deps: ['glTexCoord2i'],
glTexCoord2fv: function(v) {
- _glTexCoord2f({{{ makeGetValue('v', '0', 'float') }}}, {{{ makeGetValue('v', '4', 'float') }}});
+ _glTexCoord2i({{{ makeGetValue('v', '0', 'float') }}}, {{{ makeGetValue('v', '4', 'float') }}});
},
glColor4f: function(r, g, b, a) {