diff options
| author | shawlucas <lgs84@cornell.edu> | 2020-03-24 11:13:30 -0700 |
|---|---|---|
| committer | shawlucas <lgs84@cornell.edu> | 2020-03-24 11:13:30 -0700 |
| commit | 8fa6b94dca734d67fb9aefd6a930d17ba2fb8a9c (patch) | |
| tree | 3cbbac4cc24bf81c4a35fe270ba8fddc993f23bf /src/code/sys_matrix.c | |
| parent | 09afb8d5528118e287d3b126dd9f8a4e803b5ea7 (diff) | |
| parent | 4eb7f023f348151fb73f4a0850a6f348280d7805 (diff) | |
Merge branch 'master' of https://github.com/zeldaret/oot
Diffstat (limited to 'src/code/sys_matrix.c')
| -rw-r--r-- | src/code/sys_matrix.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index b300f189d..b0735109a 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -738,12 +738,13 @@ void func_800D20CC(MtxF* mf, Vec3s* vec, s32 flag) { vec->y = Math_atan2f(mf->zx, mf->zz) * (32768 / M_PI); - if (!flag) + if (!flag) { vec->z = Math_atan2f(mf->xy, mf->yy) * (32768 / M_PI); - else + } else { 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") @@ -762,12 +763,13 @@ void func_800D2264(MtxF* mf, Vec3s* vec, s32 flag) { vec->z = Math_atan2f(mf->xy, mf->xx) * (32768 / M_PI); - if (!flag) + if (!flag) { vec->x = Math_atan2f(mf->yz, mf->zz) * (32768 / M_PI); - else + } else { 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") |