diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-10-14 11:00:12 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-10-14 11:00:12 -0700 |
| commit | 74e47602a9c28ff5b65f44889be76bf70c045937 (patch) | |
| tree | 26b6c754f029925e90bc79d99fa5bd8f082a1893 | |
| parent | 92ca8c4c6d03f6e30f202a1b20f7a575aa385d31 (diff) | |
| parent | 8dbbccb00fb76a42a05f96b75b83daf039cf5702 (diff) | |
Merge branch 'implemet_glcolor4ubv' of github.com:chino/emscripten into incoming
Conflicts:
AUTHORS
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/library_gl.js | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -101,4 +101,5 @@ a license to everyone to use it as detailed in LICENSE.) * Richard Quirk <richard.quirk@gmail.com> * Marcos Scriven <marcos@scriven.org> * Antoine Lambert <antoine.lambert33@gmail.com> +* Daniel Aquino <mr.danielaquino@gmail.com> diff --git a/src/library_gl.js b/src/library_gl.js index aace0678..1ea8efc2 100644 --- a/src/library_gl.js +++ b/src/library_gl.js @@ -4047,7 +4047,10 @@ var LibraryGL = { _glColor4f({{{ makeGetValue('p', '0', 'float') }}}, {{{ makeGetValue('p', '4', 'float') }}}, {{{ makeGetValue('p', '8', 'float') }}}, {{{ makeGetValue('p', '12', 'float') }}}); }, - glColor4ubv: function() { throw 'glColor4ubv not implemented' }, + glColor4ubv__deps: ['glColor4ub'], + glColor4ubv: function(p) { + _glColor4ub({{{ makeGetValue('p', '0', 'i8') }}}, {{{ makeGetValue('p', '1', 'i8') }}}, {{{ makeGetValue('p', '2', 'i8') }}}, {{{ makeGetValue('p', '3', 'i8') }}}); + }, glFogf: function(pname, param) { // partial support, TODO switch(pname) { |