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

would you believe there are still bugs in our @#&*@#ing matrix stack? fixes a bug that causes overwrite of matrix stack when offset==31; and apply fixed point logic for texCoordinateTransform==3

This commit is contained in:
zeromus 2010-08-08 22:46:13 +00:00
parent 56ea49a9e3
commit 29acd2d238
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
desmume/src/gfx3d.cpp
View File

@ -619,18 +619,17 @@ static void SetVertex()
if (texCoordinateTransform == 3) if (texCoordinateTransform == 3)
{ {
//UNTESTED since fixed point conversion, and almost certainly wrong. //Tested by: Eledees The Adventures of Kai and Zero (E) [title screen and frontend menus]
last_s =((coord[0]*mtxCurrent[3][0] + last_s = (s32)(((s64)s16coord[0] * mtxCurrent[3][0] +
coord[1]*mtxCurrent[3][4] + (s64)s16coord[1] * mtxCurrent[3][4] +
coord[2]*mtxCurrent[3][8]) + _s * 16.0f) / 16.0f; (s64)s16coord[2] * mtxCurrent[3][8] +
last_t =((coord[0]*mtxCurrent[3][1] + (((s64)(_s))<<24))>>24);
coord[1]*mtxCurrent[3][5] + last_t = (s32)(((s64)s16coord[0] * mtxCurrent[3][1] +
coord[2]*mtxCurrent[3][9]) + _t * 16.0f) / 16.0f; (s64)s16coord[1] * mtxCurrent[3][5] +
last_s /= 4096.0f; (s64)s16coord[2] * mtxCurrent[3][9] +
last_t /= 4096.0f; (((s64)(_t))<<24))>>24);
} }
//refuse to do anything if we have too many verts or polys //refuse to do anything if we have too many verts or polys
polygonListCompleted = 0; polygonListCompleted = 0;
if(vertlist->count >= VERTLIST_SIZE) if(vertlist->count >= VERTLIST_SIZE)
@ -889,7 +888,7 @@ static void gfx3d_glStoreMatrix(u32 v)
if(mymode==0 || mymode==3) if(mymode==0 || mymode==3)
v = 0; v = 0;
if (v > 31) return; if (v >= 31) return;
MatrixStackLoadMatrix (&mtxStack[mymode], v, mtxCurrent[mymode]); MatrixStackLoadMatrix (&mtxStack[mymode], v, mtxCurrent[mymode]);
@ -909,7 +908,7 @@ static void gfx3d_glRestoreMatrix(u32 v)
if(mymode==0 || mymode==3) if(mymode==0 || mymode==3)
v = 0; v = 0;
if (v > 31) return; if (v >= 31) return;
MatrixCopy (mtxCurrent[mymode], MatrixStackGetPos(&mtxStack[mymode], v)); MatrixCopy (mtxCurrent[mymode], MatrixStackGetPos(&mtxStack[mymode], v));