diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-05-13 15:13:18 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-05-13 15:13:18 -0700 |
commit | 6b9545c1d244b5509ee592cbc38988fdd8350b4f (patch) | |
tree | 5d2586ff6e266f7006339541084da3c405eb45d8 /src | |
parent | b90a590f024d12650112ee15fbbf24cdea082ed1 (diff) |
fix order in gl_ModelViewProjectionMatrix and add working cube_explosion test
Diffstat (limited to 'src')
-rw-r--r-- | src/library_gl.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library_gl.js b/src/library_gl.js index 209f2133..5b5f8e76 100644 --- a/src/library_gl.js +++ b/src/library_gl.js @@ -973,7 +973,7 @@ var LibraryGL = { source = source.replace(/gl_Vertex/g, 'a_position'); if (old != source) need_pv = 1; old = source; - source = source.replace(/gl_ModelViewProjectionMatrix/g, '(u_modelView * u_projection)'); + source = source.replace(/gl_ModelViewProjectionMatrix/g, '(u_projection * u_modelView)'); if (old != source) need_pm = need_mm = 1; old = source; source = source.replace(/gl_ModelViewMatrixTranspose\[2\]/g, 'vec3(u_modelView[0][0], u_modelView[1][0], u_modelView[2][0])'); // XXX extremely inefficient |