falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

port: read command ids correctly when rendering in xray mode

This commit is contained in:
fgsfds 2023-08-13 21:04:00 +02:00
parent 7ec10febae
commit e0d4bf44b8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/bg.c
View File

@ -700,13 +700,13 @@ Gfx *bgRenderGdlInXray(Gfx *gdl, s8 *readgdl, Vtx *vertices, s16 arg3[3])
xraydata.numvertices = 0;
while (true) {
if (readgdl[0] == G_ENDDL) {
if (readgdl[GFX_W0_BYTE(0)] == G_ENDDL) {
break;
}
if (readgdl[0] == G_MTX) {
if (readgdl[GFX_W0_BYTE(0)] == G_MTX) {
// empty
} else if (readgdl[0] == G_VTX) {
} else if (readgdl[GFX_W0_BYTE(0)] == G_VTX) {
Gfx *cmd = (Gfx *) readgdl;
s32 dmemindex = cmd->bytes[GFX_W0_BYTE(1)] & 0xf;
s32 numvertices = ((u32) cmd->bytes[GFX_W0_BYTE(1)] >> 4) + 1;
@ -723,14 +723,14 @@ Gfx *bgRenderGdlInXray(Gfx *gdl, s8 *readgdl, Vtx *vertices, s16 arg3[3])
offset += sizeof(Vtx);
}
} else if (readgdl[0] == G_TRI1) {
} else if (readgdl[GFX_W0_BYTE(0)] == G_TRI1) {
Gfx *cmd = (Gfx *) readgdl;
s16 x = cmd->tri.tri.v[GFX_TRI_VTX(0)] / 10;
s16 y = cmd->tri.tri.v[GFX_TRI_VTX(1)] / 10;
s16 z = cmd->tri.tri.v[GFX_TRI_VTX(2)] / 10;
gdl = bgProcessXrayTri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]);
} else if (readgdl[0] == G_TRI4) {
} else if (readgdl[GFX_W0_BYTE(0)] == G_TRI4) {
Gfx *cmd = (Gfx *) readgdl;
s16 x;
s16 y;