MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug in rlMatrixMode

Browse Source 
in GL_33 and ES2, the matrix mode would always set the model matrix to modelview matrix

this leads to incorrectly setting the matrix when a matrix has been pushed

when a matrix is pushed, the model matrix is set to the transform matrix

if a matrixMode is done on the model matrix then the model matrix is set to the modelview matrix instead of the transform matrix

when a matrix is popped, if zero count, the model matrix gets set to modelview

NOTE: GL_11 uses a seperate stack for each matrix, GL_33 and ES2 implementation combines this to a single stack making this not set in the following case

```
// set current matrix to model
rlMatrixMode(RL_MODELVIEW);
// push to model stack
// this sets current matrix to transform since we are in model
rlPushMatrix();

// set current matrix to projection
rlMatrixMode(RL_PROJECTION);
// push to projection stack
// this sets current matrix to projection
rlPushMatrix();

// set current matrix to transform
rlMatrixMode(RL_MODELVIEW);
// pop from model stack
// this fails to set the model back to model view since
// the stack depth is not 0 as the GL_33 and ES2
// stack implementation represents a combined stack
// instead of seperate stacks
// the matrix is instead set to the projection matrix that we just pushed
rlPopMatrix();
```
This commit is contained in:
mgood7123 2021-11-17 22:42:37 +10:00 committed by GitHub
parent 03f55d8f9e
commit 5e26deb12f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rlgl.h
View File

@ -1034,7 +1034,13 @@ void rlMultMatrixf(float *matf) { glMultMatrixf(matf); }
void rlMatrixMode(int mode)
{
if (mode == RL_PROJECTION) RLGL.State.currentMatrix = &RLGL.State.projection;
else if (mode == RL_MODELVIEW) RLGL.State.currentMatrix = &RLGL.State.modelview;
else if (mode == RL_MODELVIEW) {
if (RLGL.State.stackCounter == 0) {
RLGL.State.currentMatrix = &RLGL.State.modelview;
} else {
RLGL.State.currentMatrix = &RLGL.State.transform;
}
}
//else if (mode == RL_TEXTURE) // Not supported
RLGL.State.currentMatrixMode = mode;