diff options
author | Sven Gothel <[email protected]> | 2012-11-11 21:01:26 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-11-11 21:01:26 +0100 |
commit | 263452439c10540776545c12255bf3b75c7fbd2b (patch) | |
tree | bfdd832c474c02ee291bb0aae87f419f9d184ee2 /src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java | |
parent | f67d310743cd6dee3d3005b96b61e9adae628899 (diff) |
Frustum: Passing Mv*P (column major order)
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java')
-rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java index 18129ba09..237596a81 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java +++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java @@ -275,7 +275,7 @@ public class PMVMatrix implements GLMatrixFunc { requestMask = 0; matrixMode = GL_MODELVIEW; - mulPMV = null; + mulMVP = null; frustum = null; } @@ -1040,10 +1040,10 @@ public class PMVMatrix implements GLMatrixFunc { if( 0 != ( dirtyBits & ( DIRTY_FRUSTUM & requestMask ) ) ) { if( null == frustum ) { frustum = new Frustum(); - mulPMV = new float[16]; + mulMVP = new float[16]; } - FloatUtil.multMatrixf(matrixP, matrixMv, mulPMV, 0); - frustum.update(mulPMV, 0); + FloatUtil.multMatrixf(matrixMv, matrixP, mulMVP, 0); + frustum.update(mulMVP, 0); dirtyBits &= ~DIRTY_FRUSTUM; mod = true; } @@ -1128,6 +1128,6 @@ public class PMVMatrix implements GLMatrixFunc { protected int dirtyBits = DIRTY_ALL; // contains the dirty bits, i.e. hinting for update operation protected int requestMask = 0; // may contain the requested dirty bits: DIRTY_INVERSE_MODELVIEW | DIRTY_INVERSE_TRANSPOSED_MODELVIEW protected ProjectFloat projectFloat; - protected float[] mulPMV; // premultiplied PMV + protected float[] mulMVP; // premultiplied PMV protected Frustum frustum; } |