diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-03-20 01:16:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-19 20:16:33 -0400 |
| commit | 0e5ecdcd73ab94eba28b49cbda111ed7caf88b38 (patch) | |
| tree | 405f054d2f71ea9addf1b6fefc3973b5f426a4e6 /src/code/z_player_lib.c | |
| parent | 4f6967b02778e61ed0e9fa471f9ba7d67524c908 (diff) | |
Angle cleanup - `BINANG_TO_RAD`, `BINANG_TO_RAD_ALT` (#1158)
* Run formatter
* Touch up angle macros (parentheses and hex constants)
* Add `BINANG_TO_RAD_ALT`
* Swap `BINANG_TO_RAD` and `BINANG_TO_RAD_ALT`
* Run formatter
Diffstat (limited to 'src/code/z_player_lib.c')
| -rw-r--r-- | src/code/z_player_lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index e3f95b7e9..74ce5ba99 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -906,7 +906,7 @@ s32 Player_OverrideLimbDrawGameplayCommon(GlobalContext* globalCtx, s32 limbInde if (this->unk_6C2 != 0) { Matrix_Translate(pos->x, ((Math_CosS(this->unk_6C2) - 1.0f) * 200.0f) + pos->y, pos->z, MTXMODE_APPLY); - Matrix_RotateX(this->unk_6C2 * (M_PI / 0x8000), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD(this->unk_6C2), MTXMODE_APPLY); Matrix_RotateZYX(rot->x, rot->y, rot->z, MTXMODE_APPLY); pos->x = pos->y = pos->z = 0.0f; rot->x = rot->y = rot->z = 0; @@ -922,17 +922,17 @@ s32 Player_OverrideLimbDrawGameplayCommon(GlobalContext* globalCtx, s32 limbInde rot->z += this->unk_6B6; } else if (limbIndex == PLAYER_LIMB_UPPER) { if (this->unk_6B0 != 0) { - Matrix_RotateZ(0x44C * (M_PI / 0x8000), MTXMODE_APPLY); - Matrix_RotateY(this->unk_6B0 * (M_PI / 0x8000), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD(0x44C), MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD(this->unk_6B0), MTXMODE_APPLY); } if (this->unk_6BE != 0) { - Matrix_RotateY(this->unk_6BE * (M_PI / 0x8000), MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD(this->unk_6BE), MTXMODE_APPLY); } if (this->unk_6BC != 0) { - Matrix_RotateX(this->unk_6BC * (M_PI / 0x8000), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD(this->unk_6BC), MTXMODE_APPLY); } if (this->unk_6C0 != 0) { - Matrix_RotateZ(this->unk_6C0 * (M_PI / 0x8000), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD(this->unk_6C0), MTXMODE_APPLY); } } else if (limbIndex == PLAYER_LIMB_L_THIGH) { func_8008F87C(globalCtx, this, &this->skelAnime, pos, rot, PLAYER_LIMB_L_THIGH, PLAYER_LIMB_L_SHIN, |