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

Remove PS prefix from mtx function usages

Browse source
This commit is contained in:
dbalatoni13 2025-01-19 02:38:04 +01:00
parent 8ffb043940
commit b54aaa2273
66 changed files with 4567 additions and 4138 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/REL/m417Dll/main.c
View file

@ -79,7 +79,7 @@ void ObjectSetup(void)
sp8.x = sp8.z = 0.0f;
sp8.y = lbl_1_data_18.z;
mtxRot(sp38, lbl_1_data_18.x, lbl_1_data_18.y, 0.0f);
PSMTXMultVec(sp38, &sp8, &sp8);
MTXMultVec(sp38, &sp8, &sp8);
Hu3DGLightPosAimSetV(lbl_1_bss_8[0], &sp8, &sp14);
lbl_1_data_28.x = 200.0f;
lbl_1_data_28.y = 3000.0f;
@ -481,18 +481,18 @@ void fn_1_310C(float arg8, float arg9, float argA, float *arg0, float *arg1, flo
Mtx sp8;
if (arg8 != 0.0f) {
PSMTXRotRad(sp38, 88, 0.017453292f * arg8);
MTXRotRad(sp38, 88, 0.017453292f * arg8);
}
else {
PSMTXIdentity(sp38);
MTXIdentity(sp38);
}
if (arg9 != 0.0f) {
PSMTXRotRad(sp8, 89, 0.017453292f * arg9);
PSMTXConcat(sp38, sp8, sp38);
MTXRotRad(sp8, 89, 0.017453292f * arg9);
MTXConcat(sp38, sp8, sp38);
}
if (argA != 0.0f) {
PSMTXRotRad(sp8, 90, 0.017453292f * argA);
PSMTXConcat(sp38, sp8, sp38);
MTXRotRad(sp8, 90, 0.017453292f * argA);
MTXConcat(sp38, sp8, sp38);
}
fn_1_30D8(NULL, arg0, arg1, arg2);
}

34
src/REL/m417Dll/player.c
View file

@ -270,22 +270,22 @@ void fn_1_7C8C(omObjData *object)
var_r31->unk_70 = 0.02f;
if (var_r31->unk_0C) {
Vec sp18 = { 0.0f, 1.0f, 0.0f };
PSMTXRotAxisRad(var_r31->unk_1C4, &sp18, 0.017453292f * var_r31->unk_64);
MTXRotAxisRad(var_r31->unk_1C4, &sp18, 0.017453292f * var_r31->unk_64);
}
else {
Vec spC = { 0.0f, 1.0f, 0.0f };
PSMTXIdentity(var_r31->unk_1C4);
MTXIdentity(var_r31->unk_1C4);
C_QUATRotAxisRad(&var_r31->unk_184, &spC, 0.0f);
var_r31->unk_194 = var_r31->unk_184;
PSQUATInverse(&var_r31->unk_194, &var_r31->unk_1A4);
QUATInverse(&var_r31->unk_194, &var_r31->unk_1A4);
var_r31->unk_1B4 = var_r31->unk_1A4;
var_r31->unk_164 = var_r31->unk_194;
var_r31->unk_174 = var_r31->unk_194;
var_r31->unk_144 = 1.0f;
var_r31->unk_D4.z += 50.0f;
}
PSMTXInverse(var_r31->unk_1C4, var_r31->unk_1F4);
PSMTXCopy(var_r31->unk_1F4, var_r31->unk_224);
MTXInverse(var_r31->unk_1C4, var_r31->unk_1F4);
MTXCopy(var_r31->unk_1F4, var_r31->unk_224);
var_r31->unk_134 = var_r31->unk_138 = 0.0f;
var_r31->unk_12C = 1.0f;
var_r31->unk_08 = -1;
@ -634,7 +634,7 @@ void fn_1_9298(omObjData *object)
else if (var_r31->unk_B4.x < 0.0f) {
var_r31->unk_B4.x += 360.0f;
}
PSMTXRotAxisRad(var_r31->unk_1C4, &sp8, 0.017453292f * var_r31->unk_B4.x);
MTXRotAxisRad(var_r31->unk_1C4, &sp8, 0.017453292f * var_r31->unk_B4.x);
}
object->rot.y = var_r31->unk_68 = var_r31->unk_B4.x - 180.0f;
object->trans.x = var_r31->unk_D4.x = var_r31->unk_F8.x = var_r31->unk_C8.x = var_r31->unk_B4.z * sind(var_r31->unk_B4.x);
@ -836,7 +836,7 @@ void fn_1_9C14(omObjData *object)
if (fn_1_26F8() == 2) {
sp1C.y += -5.8333335f * var_r31->unk_148;
}
PSMTXMultVec(var_r31->unk_224, &sp1C, &sp1C);
MTXMultVec(var_r31->unk_224, &sp1C, &sp1C);
VECAdd(&sp1C, &var_r31->unk_E0, &sp1C);
sp10 = sp1C;
sp10.y = 0.0f;
@ -849,13 +849,13 @@ void fn_1_9C14(omObjData *object)
sp1C.y = 80.0f;
var_r31->unk_EC = sp1C;
spC = atan2d(sp1C.x, sp1C.z);
PSMTXMultVec(var_r31->unk_1C4, &sp1C, &sp1C);
MTXMultVec(var_r31->unk_1C4, &sp1C, &sp1C);
VECAdd(&sp1C, &var_r31->unk_F8, &var_r31->unk_D4);
if (var_r31->unk_13C >= 0.95f) {
var_r31->unk_3C = 1;
return;
}
PSQUATNormalize(&var_r31->unk_194, &sp28);
QUATNormalize(&var_r31->unk_194, &sp28);
if (sp28.w < cosd(25)) {
var_r31->unk_3C = 1;
}
@ -893,7 +893,7 @@ void fn_1_9FF0(omObjData *object)
}
}
var_r31->unk_1B4 = var_r31->unk_1A4;
PSMTXCopy(var_r31->unk_1F4, var_r31->unk_224);
MTXCopy(var_r31->unk_1F4, var_r31->unk_224);
var_r31->unk_104 = var_r31->unk_F8;
var_f31 = fn_1_75BC();
for (var_r30 = 0; var_r30 < 8; var_r30++) {
@ -1054,12 +1054,12 @@ void fn_1_9FF0(omObjData *object)
C_QUATRotAxisRad(&sp3C, &sp8, M_PI);
C_QUATSlerp(&var_r31->unk_184, &sp3C, &var_r31->unk_184, 0.027777778f);
}
PSQUATMultiply(&var_r31->unk_174, &var_r31->unk_184, &var_r31->unk_194);
PSQUATMultiply(&var_r31->unk_164, &var_r31->unk_194, &var_r31->unk_194);
PSQUATMultiply(&sp2C, &var_r31->unk_194, &var_r31->unk_194);
PSMTXQuat(var_r31->unk_1C4, &var_r31->unk_194);
PSMTXInverse(var_r31->unk_1C4, var_r31->unk_1F4);
PSQUATInverse(&var_r31->unk_194, &var_r31->unk_1A4);
QUATMultiply(&var_r31->unk_174, &var_r31->unk_184, &var_r31->unk_194);
QUATMultiply(&var_r31->unk_164, &var_r31->unk_194, &var_r31->unk_194);
QUATMultiply(&sp2C, &var_r31->unk_194, &var_r31->unk_194);
MTXQuat(var_r31->unk_1C4, &var_r31->unk_194);
MTXInverse(var_r31->unk_1C4, var_r31->unk_1F4);
QUATInverse(&var_r31->unk_194, &var_r31->unk_1A4);
}
}
@ -1071,7 +1071,7 @@ void fn_1_AD24(omObjData *object)
Hu3DModelPosSetV(object->model[0], &var_r30->unk_D4);
Hu3DModelRotSet(object->model[0], 0.0f, var_r30->unk_64, 0.0f);
Hu3DModelPosSetV(object->model[1], &var_r30->unk_F8);
PSMTXCopy(var_r30->unk_1C4, Hu3DData[object->model[1]].unk_F0);
MTXCopy(var_r30->unk_1C4, Hu3DData[object->model[1]].unk_F0);
}
void fn_1_ADC4(omObjData *object)

46
src/REL/m417Dll/water.c
View file

@ -567,13 +567,13 @@ void fn_1_4E64(omObjData *object)
var_r31->unk_24 = 1.0f;
}
}
PSMTXTrans(spC8, var_r31->unk_04.x, var_r31->unk_04.y, var_r31->unk_04.z);
PSMTXRotRad(sp98, 89, 0.017453292f * var_r31->unk_10);
PSMTXConcat(spC8, sp98, sp68);
MTXTrans(spC8, var_r31->unk_04.x, var_r31->unk_04.y, var_r31->unk_04.z);
MTXRotRad(sp98, 89, 0.017453292f * var_r31->unk_10);
MTXConcat(spC8, sp98, sp68);
var_f31 = var_r31->unk_18 * var_r31->unk_1C;
PSMTXScale(spC8, var_f31, var_f31, var_f31 * var_r31->unk_28);
PSMTXConcat(sp68, spC8, sp98);
PSMTXInverse(sp98, spC8);
MTXScale(spC8, var_f31, var_f31, var_f31 * var_r31->unk_28);
MTXConcat(sp68, spC8, sp98);
MTXInverse(sp98, spC8);
PSMTXReorder(spC8, sp38);
PSMTXROMultVecArray(sp38, lbl_1_bss_178.unk_2C, lbl_1_bss_178.unk_34, lbl_1_bss_178.unk_18);
sp2C.x = (0.15f * var_r31->unk_18) * (var_r31->unk_24 * sind(var_r31->unk_10));
@ -761,7 +761,7 @@ void fn_1_604C(ModelData *arg0, Mtx arg1)
DCStoreRangeNoSync(&sp10, 4);
PPCSync();
GXLoadPosMtxImm(arg1, 0);
PSMTXInvXpose(arg1, sp98);
MTXInvXpose(arg1, sp98);
GXLoadNrmMtxImm(sp98, 0);
GXSetNumChans(1);
GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE);
@ -773,29 +773,29 @@ void fn_1_604C(ModelData *arg0, Mtx arg1)
HuSprTexLoad(lbl_1_bss_60, 0, 3, GX_MIRROR, GX_MIRROR, GX_LINEAR);
GXSetNumTexGens(5);
C_MTXLightPerspective(sp38, 35.0f, 1.2f, 0.5f, -0.5f, 0.5f, 0.5f);
PSMTXInverse(Hu3DCameraMtx, sp98);
PSMTXConcat(sp98, arg1, sp98);
PSMTXConcat(sp38, Hu3DCameraMtx, sp68);
PSMTXConcat(sp68, sp98, sp68);
MTXInverse(Hu3DCameraMtx, sp98);
MTXConcat(sp98, arg1, sp98);
MTXConcat(sp38, Hu3DCameraMtx, sp68);
MTXConcat(sp68, sp98, sp68);
sp68[1][3] -= 44.0f;
GXLoadTexMtxImm(sp68, 30, GX_MTX3x4);
GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, 30, GX_FALSE, 125);
C_MTXLightPerspective(sp38, 70.0f, 1.0f, 0.5f, -0.5f, 0.5f, 0.5f);
PSMTXInverse(Hu3DCameraMtx, sp98);
PSMTXConcat(sp98, arg1, sp98);
PSMTXConcat(sp38, Hu3DCameraMtx, sp68);
PSMTXConcat(sp68, sp98, sp68);
MTXInverse(Hu3DCameraMtx, sp98);
MTXConcat(sp98, arg1, sp98);
MTXConcat(sp38, Hu3DCameraMtx, sp68);
MTXConcat(sp68, sp98, sp68);
GXLoadTexMtxImm(sp68, 36, GX_MTX3x4);
GXSetTexCoordGen2(GX_TEXCOORD2, GX_TG_MTX3x4, GX_TG_POS, 36, GX_FALSE, 125);
PSMTXRotRad(sp68, 90, 0.017453292f * lbl_1_bss_178.unk_6B8);
MTXRotRad(sp68, 90, 0.017453292f * lbl_1_bss_178.unk_6B8);
GXLoadTexMtxImm(sp68, 39, GX_MTX2x4);
GXSetTexCoordGen2(GX_TEXCOORD3, GX_TG_MTX2x4, GX_TG_TEXCOORD0, 39, GX_FALSE, 125);
PSMTXScale(sp98, 1.2f, -1.2f, 1.2f);
PSMTXConcat(sp68, sp98, sp68);
MTXScale(sp98, 1.2f, -1.2f, 1.2f);
MTXConcat(sp68, sp98, sp68);
GXLoadTexMtxImm(sp68, 42, GX_MTX2x4);
GXSetTexCoordGen2(GX_TEXCOORD4, GX_TG_MTX2x4, GX_TG_TEXCOORD0, 42, GX_FALSE, 125);
PSMTXScale(sp98, 0.49f, -0.49f, 0.49f);
PSMTXConcat(sp98, Hu3DCameraMtx, sp68);
MTXScale(sp98, 0.49f, -0.49f, 0.49f);
MTXConcat(sp98, Hu3DCameraMtx, sp68);
sp68[0][3] = 0.5f;
sp68[1][3] = 0.5f;
GXLoadTexMtxImm(sp68, 33, GX_MTX2x4);
@ -804,18 +804,18 @@ void fn_1_604C(ModelData *arg0, Mtx arg1)
GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD1, GX_TEXMAP1);
GXSetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_1, GX_ITS_1);
GXSetTevIndWarp(GX_TEVSTAGE0, GX_INDTEXSTAGE0, GX_TRUE, GX_FALSE, GX_ITM_0);
PSMTXScale(sp68, -0.5f, -0.5f, 0.5f);
MTXScale(sp68, -0.5f, -0.5f, 0.5f);
GXSetIndTexMtx(GX_ITM_0, (float(*)[3])sp68, -2);
GXSetIndTexOrder(GX_INDTEXSTAGE1, GX_TEXCOORD1, GX_TEXMAP1);
GXSetIndTexCoordScale(GX_INDTEXSTAGE1, GX_ITS_1, GX_ITS_1);
GXSetTevIndWarp(GX_TEVSTAGE1, GX_INDTEXSTAGE1, GX_TRUE, GX_FALSE, GX_ITM_1);
PSMTXScale(sp68, 0.5f, 0.5f, 0.5f);
MTXScale(sp68, 0.5f, 0.5f, 0.5f);
GXSetIndTexMtx(GX_ITM_1, (float(*)[3])sp68, 0);
GXSetIndTexOrder(GX_INDTEXSTAGE2, GX_TEXCOORD1, GX_TEXMAP1);
GXSetIndTexCoordScale(GX_INDTEXSTAGE2, GX_ITS_1, GX_ITS_1);
GXSetTevIndWarp(GX_TEVSTAGE2, GX_INDTEXSTAGE2, GX_TRUE, GX_FALSE, GX_ITM_2);
GXSetTevIndWarp(GX_TEVSTAGE3, GX_INDTEXSTAGE2, GX_TRUE, GX_FALSE, GX_ITM_2);
PSMTXScale(sp68, -0.65f, -0.65f, 0.65f);
MTXScale(sp68, -0.65f, -0.65f, 0.65f);
GXSetIndTexMtx(GX_ITM_2, (float(*)[3])sp68, -3);
GXSetNumTevStages(5);
GXSetTevColor(GX_TEVREG0, sp14);