diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-12-13 17:44:21 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-13 17:45:20 -0800 |
commit | e657c74773dfa7834a0e56fd895649df15593d97 (patch) | |
tree | c34b36d8cb4a94c2b8c4d00060e8f1374049ef19 /src/library_gl.js | |
parent | d46071bcb61b555a51ee985c8b38e621a956bafa (diff) | |
parent | f7dd2645ee157a60cce28cb7db9327728699d544 (diff) |
Merge branch 'incoming' into asm_js
Diffstat (limited to 'src/library_gl.js')
-rw-r--r-- | src/library_gl.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/library_gl.js b/src/library_gl.js index 6927c3ec..e9e93b93 100644 --- a/src/library_gl.js +++ b/src/library_gl.js @@ -2100,6 +2100,11 @@ var LibraryGL = { }, glColor4f: function(r, g, b, a) { + r = Math.max(Math.min(r, 1), 0); + g = Math.max(Math.min(g, 1), 0); + b = Math.max(Math.min(b, 1), 0); + a = Math.max(Math.min(a, 1), 0); + // TODO: make ub the default, not f, save a few mathops if (GL.immediate.mode) { var start = GL.immediate.vertexCounter << 2; |