ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

matrix stacks: fix new asserts in nanostray2 weapon shooting and dual strike combat anims (re #39)

This commit is contained in:
zeromus 2017-02-22 17:42:11 -06:00
parent 093ce4b05d
commit 7031bd9c0c
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
desmume/src/gfx3d.cpp
View File

@ -949,12 +949,12 @@ static void gfx3d_glPushMatrix()
if(mode == MATRIXMODE_PROJECTION || mode == MATRIXMODE_TEXTURE)
{
u32& index = mtxStack[mode].position;
MatrixCopy(MatrixStackGetPos(&mtxStack[mode], index&1), mtxCurrent[mode]);
MatrixCopy(MatrixStackGetPos(&mtxStack[mode], 0), mtxCurrent[mode]);
u32& index = mtxStack[mode].position;
if(index == 1) MMU_new.gxstat.se = 1; //unknown if this applies to the texture matrix
index += 1;
index &= 3;
if(index >= 2) MMU_new.gxstat.se = 1; //unknown if this applies to the texture matrix
index &= 1;
}
else
{
@ -979,16 +979,12 @@ static void gfx3d_glPopMatrix(u32 v)
if(mode == MATRIXMODE_PROJECTION || mode == MATRIXMODE_TEXTURE)
{
//parameter ignored and treated as sensible, as a pop argument anyway
v = 1;
//parameter is ignored and treated as sensible (always 1)
u32& index = mtxStack[mode].position;
index -= v;
index &= 3;
if(index >= 2) MMU_new.gxstat.se = 1; //unknown if this applies to the texture matrix
MatrixCopy(mtxCurrent[mode], MatrixStackGetPos(&mtxStack[mode], index&1));
index ^= 1;
if(index == 1) MMU_new.gxstat.se = 1; //unknown if this applies to the texture matrix
MatrixCopy(mtxCurrent[mode], MatrixStackGetPos(&mtxStack[mode], 0));
}
else
{