diff options
| author | fig02 <fig02srl@gmail.com> | 2020-03-21 21:46:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-21 21:46:44 -0400 |
| commit | a3bac9fbb2b6be510c73bd1c062022aa2842eb45 (patch) | |
| tree | 07782bb99bbd4cb7cd5ff015ac07aa688ae4d63a /src/code/sys_matrix.c | |
| parent | 65213ab140b36131660284fde8469010a29dac1e (diff) | |
| parent | 0cf75356a557e94f7919521ff9ad53e4b733ac20 (diff) | |
Merge pull request #17 from glankk/code_800FCE80
code_800FCE80 OK
Diffstat (limited to 'src/code/sys_matrix.c')
| -rw-r--r-- | src/code/sys_matrix.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index bd526cec7..75afbc5ee 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -792,22 +792,22 @@ void func_800D1FD4(MtxF* mf) // same differences as func_800D2264 void func_800D20CC(MtxF* mf, Vec3s* vec, s32 flag) { - vec->x = func_800FD250(-mf->zy, sqrtf(SQ(mf->zx) + SQ(mf->zz))) * (32768 / M_PI); + vec->x = Math_atan2f(-mf->zy, sqrtf(SQ(mf->zx) + SQ(mf->zz))) * (32768 / M_PI); if ((vec->x == 0x4000) || (vec->x == -0x4000)) { vec->z = 0; - vec->y = func_800FD250(-mf->xz, mf->xx) * (32768 / M_PI); + vec->y = Math_atan2f(-mf->xz, mf->xx) * (32768 / M_PI); return; } - vec->y = func_800FD250(mf->zx, mf->zz) * (32768 / M_PI); + vec->y = Math_atan2f(mf->zx, mf->zz) * (32768 / M_PI); if (!flag) - vec->z = func_800FD250(mf->xy, mf->yy) * (32768 / M_PI); + vec->z = Math_atan2f(mf->xy, mf->yy) * (32768 / M_PI); else - vec->z = func_800FD250(mf->xy / sqrtf(SQ(mf->xx) + SQ(mf->xz) + SQ(mf->xy)), - mf->yy / sqrtf(SQ(mf->yx) + SQ(mf->yz) + SQ(mf->yy))) * (32768 / M_PI); + vec->z = Math_atan2f(mf->xy / sqrtf(SQ(mf->xx) + SQ(mf->xz) + SQ(mf->xy)), + mf->yy / sqrtf(SQ(mf->yx) + SQ(mf->yz) + SQ(mf->yy))) * (32768 / M_PI); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_800D20CC.s") @@ -817,22 +817,22 @@ void func_800D20CC(MtxF* mf, Vec3s* vec, s32 flag) // same differences as func_800D20CC void func_800D2264(MtxF* mf, Vec3s* vec, s32 flag) { - vec->y = func_800FD250(-mf->xz, sqrtf(SQ(mf->xx) + SQ(mf->xy))) * (32768 / M_PI); + vec->y = Math_atan2f(-mf->xz, sqrtf(SQ(mf->xx) + SQ(mf->xy))) * (32768 / M_PI); if ((vec->y == 0x4000) || (vec->y == -0x4000)) { vec->x = 0; - vec->z = func_800FD250(-mf->yx, mf->yy) * (32768 / M_PI); + vec->z = Math_atan2f(-mf->yx, mf->yy) * (32768 / M_PI); return; } - vec->z = func_800FD250(mf->xy, mf->xx) * (32768 / M_PI); + vec->z = Math_atan2f(mf->xy, mf->xx) * (32768 / M_PI); if (!flag) - vec->x = func_800FD250(mf->yz, mf->zz) * (32768 / M_PI); + vec->x = Math_atan2f(mf->yz, mf->zz) * (32768 / M_PI); else - vec->x = func_800FD250(mf->yz / sqrtf(SQ(mf->yx) + SQ(mf->yy) + SQ(mf->yz)), - mf->zz / sqrtf(SQ(mf->zx) + SQ(mf->zy) + SQ(mf->zz))) * (32768 / M_PI); + vec->x = Math_atan2f(mf->yz / sqrtf(SQ(mf->yx) + SQ(mf->yy) + SQ(mf->yz)), + mf->zz / sqrtf(SQ(mf->zx) + SQ(mf->zy) + SQ(mf->zz))) * (32768 / M_PI); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_800D2264.s") |