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

rename PSVEC to VEC

Browse source 
This is the correct name for the Vec functions for Dolphin. This also applies to PSMTX...
This commit is contained in:
CreateSource 2024-08-09 23:53:58 -04:00
parent 64413586b9
commit afa9c0a4b5
82 changed files with 968 additions and 968 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/REL/m403Dll/main.c
View file

@ -934,8 +934,8 @@ static void fn_1_2598(omObjData *arg0) {
case 4:
temp_r24 = fn_1_82D0(&sp38[0]);
for (i = 0; i < temp_r24; i++) {
PSVECSubtract(&sp38[i], &temp_r31->unk2C, &sp8);
sp20[i] = PSVECMag(&sp8);
VECSubtract(&sp38[i], &temp_r31->unk2C, &sp8);
sp20[i] = VECMag(&sp8);
}
for (i = 0; i < temp_r24 - 1; i++) {
for (var_r29 = i + 1; var_r29 < temp_r24; var_r29++) {
@ -1127,14 +1127,14 @@ static s32 fn_1_3894(void) {
for (j = i + 1; j < 4; j++) {
temp_r27 = lbl_1_bss_34[j]->data;
if (temp_r27->unk07 != 0) {
PSVECSubtract(&temp_r28->unk2C, &temp_r27->unk2C, &sp8);
var_f31 = PSVECMag(&sp8);
VECSubtract(&temp_r28->unk2C, &temp_r27->unk2C, &sp8);
var_f31 = VECMag(&sp8);
if (var_f31 < 80.0f) {
PSVECNormalize(&sp8, &sp8);
VECNormalize(&sp8, &sp8);
var_f30 = 0.0001f + 0.5f * (80.0f - var_f31);
PSVECScale(&sp8, &sp8, var_f30);
PSVECAdd(&sp14[i], &sp8, &sp14[i]);
PSVECSubtract(&sp14[j], &sp8, &sp14[j]);
VECScale(&sp8, &sp8, var_f30);
VECAdd(&sp14[i], &sp8, &sp14[i]);
VECSubtract(&sp14[j], &sp8, &sp14[j]);
temp_r28->unk0E++;
temp_r27->unk0E++;
var_r26++;
@ -1147,7 +1147,7 @@ static s32 fn_1_3894(void) {
temp_r25 = lbl_1_bss_34[i];
temp_r31 = temp_r25->data;
if (temp_r31->unk07 != 0) {
PSVECAdd(&temp_r31->unk2C, &sp14[i], &temp_r31->unk2C);
VECAdd(&temp_r31->unk2C, &sp14[i], &temp_r31->unk2C);
if (temp_r31->unk2C.x > 660.0f) {
temp_r31->unk2C.x = 660.0f;
}
@ -1204,8 +1204,8 @@ static void fn_1_3D6C(Vec *arg0, Vec *arg1) {
temp_r30 = fn_1_8470(sp18);
var_f31 = 2000.0f;
for (i = 0; i < temp_r30; i++) {
PSVECSubtract(&sp18[i], arg0, &spC);
var_f30 = PSVECMag(&spC);
VECSubtract(&sp18[i], arg0, &spC);
var_f30 = VECMag(&spC);
if (var_f30 >= var_f31) {
continue;
}
@ -1489,8 +1489,8 @@ static void fn_1_5400(float *arg0, Vec *arg1, float arg2[][3], s32 arg3) {
arg0[0] = 0.0f;
for (i = 1; i < arg3; i++) {
PSVECSubtract(&arg1[i], &arg1[i - 1], &sp8);
arg0[i] = arg0[i - 1] + PSVECMag(&sp8);
VECSubtract(&arg1[i], &arg1[i - 1], &sp8);
arg0[i] = arg0[i - 1] + VECMag(&sp8);
}
for (j = 0; j < 3; j++) {
for (i = 0; i < arg3; i++) {

40
src/REL/m403Dll/scene.c
View file

@ -932,7 +932,7 @@ s32 fn_1_86A0(Vec *arg0, Vec *arg1) {
if (temp_r28->rot.x > 0.0f || temp_r28->rot.x <= -90.0f) {
return 0;
}
PSVECSubtract(arg0, &temp_r28->trans, &sp3C);
VECSubtract(arg0, &temp_r28->trans, &sp3C);
sp3C.z /= cosd(temp_r28->rot.x);
temp_r17 = fn_1_7B20(arg0->x, arg0->z);
temp_r24 = fn_1_7C20(temp_r18, temp_r17);
@ -941,50 +941,50 @@ s32 fn_1_86A0(Vec *arg0, Vec *arg1) {
}
temp_r24 -= 6;
sp48 = lbl_1_data_A88[temp_r17];
PSVECSubtract(&sp3C, &sp48, &sp3C);
VECSubtract(&sp3C, &sp48, &sp3C);
temp_r30 = lbl_1_data_B74[temp_r24][0];
temp_r29 = lbl_1_data_B74[temp_r24][1];
temp_r21 = lbl_1_data_BA4[temp_r24];
for (i = 0; i < temp_r21; i++) {
temp_r27 = (i + 1) % temp_r21;
PSVECSubtract(&temp_r30[temp_r27], &temp_r30[i], &sp24);
PSVECSubtract(&sp3C, &temp_r30[temp_r27], &sp18);
PSVECCrossProduct(&sp24, &sp18, &spC);
VECSubtract(&temp_r30[temp_r27], &temp_r30[i], &sp24);
VECSubtract(&sp3C, &temp_r30[temp_r27], &sp18);
VECCrossProduct(&sp24, &sp18, &spC);
if (spC.y < 0.0f) {
continue;
}
PSVECSubtract(&temp_r29[temp_r27], &temp_r30[temp_r27], &sp24);
PSVECSubtract(&sp3C, &temp_r29[temp_r27], &sp18);
PSVECCrossProduct(&sp24, &sp18, &spC);
VECSubtract(&temp_r29[temp_r27], &temp_r30[temp_r27], &sp24);
VECSubtract(&sp3C, &temp_r29[temp_r27], &sp18);
VECCrossProduct(&sp24, &sp18, &spC);
if (spC.y < 0.0f) {
continue;
}
PSVECSubtract(&temp_r29[i], &temp_r29[temp_r27], &sp24);
PSVECSubtract(&sp3C, &temp_r29[i], &sp18);
PSVECCrossProduct(&sp24, &sp18, &spC);
VECSubtract(&temp_r29[i], &temp_r29[temp_r27], &sp24);
VECSubtract(&sp3C, &temp_r29[i], &sp18);
VECCrossProduct(&sp24, &sp18, &spC);
if (spC.y < 0.0f) {
continue;
}
PSVECSubtract(&temp_r30[i], &temp_r29[i], &sp24);
PSVECSubtract(&sp3C, &temp_r30[i], &sp18);
PSVECCrossProduct(&sp24, &sp18, &spC);
VECSubtract(&temp_r30[i], &temp_r29[i], &sp24);
VECSubtract(&sp3C, &temp_r30[i], &sp18);
VECCrossProduct(&sp24, &sp18, &spC);
if (spC.y < 0.0f) {
continue;
}
PSVECSubtract(&temp_r30[temp_r27], &temp_r30[i], &sp24);
VECSubtract(&temp_r30[temp_r27], &temp_r30[i], &sp24);
temp_f30 = (sp3C.x * sp24.x - sp24.x * temp_r30[i].x + sp3C.y * sp24.y - sp24.y * temp_r30[i].y + sp3C.z * sp24.z - sp24.z * temp_r30[i].z) / (sp24.x * sp24.x + sp24.y * sp24.y + sp24.z * sp24.z);
sp30.x = temp_r30[i].x + temp_f30 * sp24.x;
sp30.y = temp_r30[i].y + temp_f30 * sp24.y;
sp30.z = temp_r30[i].z + temp_f30 * sp24.z;
PSVECSubtract(&sp30, &sp3C, &spC);
temp_f28 = PSVECMag(&spC);
PSVECSubtract(&temp_r29[temp_r27], &temp_r29[i], &sp18);
VECSubtract(&sp30, &sp3C, &spC);
temp_f28 = VECMag(&spC);
VECSubtract(&temp_r29[temp_r27], &temp_r29[i], &sp18);
temp_f29 = (sp3C.x * sp18.x - sp18.x * temp_r29[i].x + sp3C.y * sp18.y - sp18.y * temp_r29[i].y + sp3C.z * sp18.z - sp18.z * temp_r29[i].z) / (sp18.x * sp18.x + sp18.y * sp18.y + sp18.z * sp18.z);
sp30.x = temp_r29[i].x + temp_f29 * sp18.x;
sp30.y = temp_r29[i].y + temp_f29 * sp18.y;
sp30.z = temp_r29[i].z + temp_f29 * sp18.z;
PSVECSubtract(&sp30, &sp3C, &spC);
temp_f27 = PSVECMag(&spC);
VECSubtract(&sp30, &sp3C, &spC);
temp_f27 = VECMag(&spC);
if (temp_f28 == 0.0f) {
var_f31 = temp_f30;
} else if (temp_f27 == 0.0f) {