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

match m409dll, implement some cosd/sind

Browse source
This commit is contained in:
CreateSource 2024-07-27 12:48:18 -04:00
parent 13012f05ca
commit 9dfae92fe2
14 changed files with 1501 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/REL/m446Dll/camera.c
View file

@ -1,6 +1,7 @@
#include "REL/m446Dll.h"
#include "math.h"
#include "ext_math.h"
#include "game/hsfman.h"
#include "game/printfunc.h"
#include "game/pad.h"
@ -70,15 +71,15 @@ void fn_1_68DC(void) {
temp_f30 = lbl_1_bss_80.x;
temp_f29 = lbl_1_bss_80.y;
sp10 = lbl_1_bss_80.z;
sp2C.x = (lbl_1_bss_8C.x + (lbl_1_bss_7C * (sin((M_PI * temp_f29) / 180.0) * cos((M_PI * temp_f30) / 180.0))));
sp2C.y = (lbl_1_bss_8C.y + (lbl_1_bss_7C * -sin((M_PI * temp_f30) / 180.0)));
sp2C.z = (lbl_1_bss_8C.z + (lbl_1_bss_7C * (cos((M_PI * temp_f29) / 180.0) * cos((M_PI * temp_f30) / 180.0))));
sp2C.x = (lbl_1_bss_8C.x + (lbl_1_bss_7C * (sind(temp_f29) * cosd(temp_f30))));
sp2C.y = (lbl_1_bss_8C.y + (lbl_1_bss_7C * -sind(temp_f30)));
sp2C.z = (lbl_1_bss_8C.z + (lbl_1_bss_7C * (cosd(temp_f29) * cosd(temp_f30))));
sp20.x = lbl_1_bss_8C.x;
sp20.y = lbl_1_bss_8C.y;
sp20.z = lbl_1_bss_8C.z;
sp14.x = (sin((M_PI * temp_f29) / 180.0) * sin((M_PI * temp_f30) / 180.0));
sp14.y = cos((M_PI * temp_f30) / 180.0);
sp14.z = (cos((M_PI * temp_f29) / 180.0) * sin((M_PI * temp_f30) / 180.0));
sp14.x = (sind(temp_f29) * sind(temp_f30));
sp14.y = cosd(temp_f30);
sp14.z = (cosd(temp_f29) * sind(temp_f30));
Hu3DCameraPosSet(1, sp2C.x, sp2C.y, sp2C.z, sp14.x, sp14.y, sp14.z, sp20.x, sp20.y, sp20.z);
}

5
src/REL/m446Dll/deck.c
View file

@ -1,6 +1,7 @@
#include "REL/m446Dll.h"
#include "math.h"
#include "ext_math.h"
// bss
u32 lbl_1_bss_20;
@ -69,8 +70,8 @@ void fn_1_31D8(unkStruct2** arg0, unkStruct4** arg1, s32* arg2, s32 arg3) {
while (fn_1_1D6C(*arg0, &spC) != 0) {
if (arg3 != 0) {
sp10 = spC->unk10;
sp10.x = ((25.0 * cos((M_PI * var_f31) / 180.0)) - (25.0 * sin((M_PI * var_f31) / 180.0)));
sp10.z = ((25.0 * cos((M_PI * var_f31) / 180.0)) + (25.0 * sin((M_PI * var_f31) / 180.0)));
sp10.x = ((25.0 * cosd(var_f31)) - (25.0 * sind(var_f31)));
sp10.z = ((25.0 * cosd(var_f31)) + (25.0 * sind(var_f31)));
sp10.y = 81.0f + (0.1f * var_r31);
fn_1_2890(spC, &sp10, 0x12, var_r29 += 3);
var_f31 += var_f30;