kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use proper function names when specifying vertex attributes

Browse source
This commit is contained in:
Alberto Mardegan 2025-01-13 18:46:16 +03:00
parent e69bf29a08
commit 0736f9bbb2
2 changed files with 56 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/dolphin/gx/GXVert.h
View file

@ -114,6 +114,12 @@ static inline void GXPosition3f32(const f32 x, const f32 y, const f32 z) {
GXWGFifo.f32 = z; GXWGFifo.f32 = z;
} }
static inline void GXNormal3s16(const s16 x, const s16 y, const s16 z) {
GXWGFifo.s16 = x;
GXWGFifo.s16 = y;
GXWGFifo.s16 = z;
}
static inline void GXNormal3f32(const f32 x, const f32 y, const f32 z) { static inline void GXNormal3f32(const f32 x, const f32 y, const f32 z) {
GXWGFifo.f32 = x; GXWGFifo.f32 = x;
GXWGFifo.f32 = y; GXWGFifo.f32 = y;

100
src/game/hsfdraw.c
View file

@ -2523,53 +2523,53 @@ static void MDFaceDraw(HsfObject *arg0, HsfFace *arg1) {
case 2: case 2:
GXBegin(GX_TRIANGLES, GX_VTXFMT0, faceNumBuf[drawCnt]); GXBegin(GX_TRIANGLES, GX_VTXFMT0, faceNumBuf[drawCnt]);
for (var_r27 = 0; var_r27 < faceNumBuf[drawCnt] / 3; var_r27++, arg1++) { for (var_r27 = 0; var_r27 < faceNumBuf[drawCnt] / 3; var_r27++, arg1++) {
GXUnknownu16(arg1->indices[0][0]); GXPosition1x16(arg1->indices[0][0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(arg1->indices[0][1]); GXNormal1x16(arg1->indices[0][1]);
} else { } else {
MakeCalcNBT(arg0, arg1, 0, 1); MakeCalcNBT(arg0, arg1, 0, 1);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = arg1->indices[0][2]; temp_r28 = arg1->indices[0][2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(arg1->indices[0][3]); GXTexCoord1x16(arg1->indices[0][3]);
} }
GXUnknownu16(arg1->indices[2][0]); GXPosition1x16(arg1->indices[2][0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(arg1->indices[2][1]); GXNormal1x16(arg1->indices[2][1]);
} else { } else {
MakeNBT(arg0, arg1, 2, 0); MakeNBT(arg0, arg1, 2, 0);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = arg1->indices[2][2]; temp_r28 = arg1->indices[2][2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(arg1->indices[2][3]); GXTexCoord1x16(arg1->indices[2][3]);
} }
GXUnknownu16(arg1->indices[1][0]); GXPosition1x16(arg1->indices[1][0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(arg1->indices[1][1]); GXNormal1x16(arg1->indices[1][1]);
} else { } else {
MakeNBT(arg0, arg1, 1, 2); MakeNBT(arg0, arg1, 1, 2);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = arg1->indices[1][2]; temp_r28 = arg1->indices[1][2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(arg1->indices[1][3]); GXTexCoord1x16(arg1->indices[1][3]);
} }
} }
faceCnt = faceNumBuf[drawCnt] / 3; faceCnt = faceNumBuf[drawCnt] / 3;
@ -2577,140 +2577,140 @@ static void MDFaceDraw(HsfObject *arg0, HsfFace *arg1) {
case 3: case 3:
GXBegin(GX_QUADS, GX_VTXFMT0, faceNumBuf[drawCnt]); GXBegin(GX_QUADS, GX_VTXFMT0, faceNumBuf[drawCnt]);
for (var_r27 = 0; var_r27 < faceNumBuf[drawCnt] / 4; var_r27++, arg1++) { for (var_r27 = 0; var_r27 < faceNumBuf[drawCnt] / 4; var_r27++, arg1++) {
GXUnknownu16(arg1->indices[0][0]); GXPosition1x16(arg1->indices[0][0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(arg1->indices[0][1]); GXNormal1x16(arg1->indices[0][1]);
} else { } else {
MakeCalcNBT(arg0, arg1, 0, 1); MakeCalcNBT(arg0, arg1, 0, 1);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = arg1->indices[0][2]; temp_r28 = arg1->indices[0][2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(arg1->indices[0][3]); GXTexCoord1x16(arg1->indices[0][3]);
} }
GXUnknownu16(arg1->indices[2][0]); GXPosition1x16(arg1->indices[2][0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(arg1->indices[2][1]); GXNormal1x16(arg1->indices[2][1]);
} else { } else {
MakeNBT(arg0, arg1, 2, 0); MakeNBT(arg0, arg1, 2, 0);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = arg1->indices[2][2]; temp_r28 = arg1->indices[2][2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(arg1->indices[2][3]); GXTexCoord1x16(arg1->indices[2][3]);
} }
GXUnknownu16(arg1->indices[3][0]); GXPosition1x16(arg1->indices[3][0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(arg1->indices[3][1]); GXNormal1x16(arg1->indices[3][1]);
} else { } else {
MakeNBT(arg0, arg1, 3, 2); MakeNBT(arg0, arg1, 3, 2);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = arg1->indices[3][2]; temp_r28 = arg1->indices[3][2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(arg1->indices[3][3]); GXTexCoord1x16(arg1->indices[3][3]);
} }
GXUnknownu16(arg1->indices[1][0]); GXPosition1x16(arg1->indices[1][0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(arg1->indices[1][1]); GXNormal1x16(arg1->indices[1][1]);
} else { } else {
MakeNBT(arg0, arg1, 1, 3); MakeNBT(arg0, arg1, 1, 3);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = arg1->indices[1][2]; temp_r28 = arg1->indices[1][2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(arg1->indices[1][3]); GXTexCoord1x16(arg1->indices[1][3]);
} }
} }
faceCnt = faceNumBuf[drawCnt] / 4; faceCnt = faceNumBuf[drawCnt] / 4;
break; break;
case 4: case 4:
GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, faceNumBuf[drawCnt]); GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, faceNumBuf[drawCnt]);
GXUnknownu16(arg1->indices[0][0]); GXPosition1x16(arg1->indices[0][0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(arg1->indices[0][1]); GXNormal1x16(arg1->indices[0][1]);
} else { } else {
MakeCalcNBT(arg0, arg1, 0, 1); MakeCalcNBT(arg0, arg1, 0, 1);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = arg1->indices[0][2]; temp_r28 = arg1->indices[0][2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(arg1->indices[0][3]); GXTexCoord1x16(arg1->indices[0][3]);
} }
GXUnknownu16(arg1->indices[2][0]); GXPosition1x16(arg1->indices[2][0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(arg1->indices[2][1]); GXNormal1x16(arg1->indices[2][1]);
} else { } else {
MakeNBT(arg0, arg1, 2, 0); MakeNBT(arg0, arg1, 2, 0);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = arg1->indices[2][2]; temp_r28 = arg1->indices[2][2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(arg1->indices[2][3]); GXTexCoord1x16(arg1->indices[2][3]);
} }
GXUnknownu16(arg1->indices[1][0]); GXPosition1x16(arg1->indices[1][0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(arg1->indices[1][1]); GXNormal1x16(arg1->indices[1][1]);
} else { } else {
MakeNBT(arg0, arg1, 1, 2); MakeNBT(arg0, arg1, 1, 2);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = arg1->indices[1][2]; temp_r28 = arg1->indices[1][2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(arg1->indices[1][3]); GXTexCoord1x16(arg1->indices[1][3]);
} }
var_r24 = arg1->strip.data; var_r24 = arg1->strip.data;
for (var_r27 = 0; var_r27 < arg1->strip.count; var_r27++, var_r24 += 4) { for (var_r27 = 0; var_r27 < arg1->strip.count; var_r27++, var_r24 += 4) {
GXUnknownu16(var_r24[0]); GXPosition1x16(var_r24[0]);
if (var_r26 == -1) { if (var_r26 == -1) {
GXUnknownu16(var_r24[1]); GXNormal1x16(var_r24[1]);
} else { } else {
MakeCalcNBT(arg0, arg1, 0, 1); MakeCalcNBT(arg0, arg1, 0, 1);
} }
if (temp_r30->vtxMode == 5) { if (temp_r30->vtxMode == 5) {
temp_r28 = var_r24[2]; temp_r28 = var_r24[2];
GXUnknownu16(temp_r28); GXColor1x16(temp_r28);
if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) { if (((GXColor*) arg0->data.color->data)[temp_r28].a != 0xFF) {
Hu3DObjInfoP->flags |= 0x4001; Hu3DObjInfoP->flags |= 0x4001;
} }
} }
if (var_r25 != 0) { if (var_r25 != 0) {
GXUnknownu16(var_r24[3]); GXTexCoord1x16(var_r24[3]);
} }
} }
faceCnt = arg1->strip.count + 1; faceCnt = arg1->strip.count + 1;
@ -2755,9 +2755,9 @@ static s32 MakeCalcNBT(HsfObject *arg0, HsfFace *arg1, s16 arg2, s16 arg3) {
NBTB.z = temp_r31[temp_r25].z - temp_r31[temp_r24].z; NBTB.z = temp_r31[temp_r25].z - temp_r31[temp_r24].z;
VECNormalize(&NBTB, &NBTB); VECNormalize(&NBTB, &NBTB);
VECCrossProduct(&NBTB, &sp10, &NBTT); VECCrossProduct(&NBTB, &sp10, &NBTT);
GXPosition3s16(sp10.x * 256.0f, sp10.y * 256.0f, sp10.z * 256.0f); GXNormal3s16(sp10.x * 256.0f, sp10.y * 256.0f, sp10.z * 256.0f);
GXPosition3s16(NBTB.x * 256.0f, NBTB.y * 256.0f, NBTB.z * 256.0f); GXNormal3s16(NBTB.x * 256.0f, NBTB.y * 256.0f, NBTB.z * 256.0f);
GXPosition3s16(NBTT.x * 256.0f, NBTT.y * 256.0f, NBTT.z * 256.0f); GXNormal3s16(NBTT.x * 256.0f, NBTT.y * 256.0f, NBTT.z * 256.0f);
} }
static s32 MakeNBT(HsfObject *arg0, HsfFace *arg1, s16 arg2, s16 arg3) { static s32 MakeNBT(HsfObject *arg0, HsfFace *arg1, s16 arg2, s16 arg3) {
@ -2781,9 +2781,9 @@ static s32 MakeNBT(HsfObject *arg0, HsfFace *arg1, s16 arg2, s16 arg3) {
sp10.z = temp_r29[temp_r28][2]; sp10.z = temp_r29[temp_r28][2];
VECNormalize(&sp10, &sp10); VECNormalize(&sp10, &sp10);
} }
GXPosition3s16(sp10.x * 256.0f, sp10.y * 256.0f, sp10.z * 256.0f); GXNormal3s16(sp10.x * 256.0f, sp10.y * 256.0f, sp10.z * 256.0f);
GXPosition3s16(NBTB.x * 256.0f, NBTB.y * 256.0f, NBTB.z * 256.0f); GXNormal3s16(NBTB.x * 256.0f, NBTB.y * 256.0f, NBTB.z * 256.0f);
GXPosition3s16(NBTT.x * 256.0f, NBTT.y * 256.0f, NBTT.z * 256.0f); GXNormal3s16(NBTT.x * 256.0f, NBTT.y * 256.0f, NBTT.z * 256.0f);
} }
static void MDFaceCnt(HsfObject *arg0, HsfFace *arg1) { static void MDFaceCnt(HsfObject *arg0, HsfFace *arg1) {