diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-04-24 16:23:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-24 10:23:49 -0400 |
| commit | fed9ac3e20eb1a6ab3ed41568e253e5dd763dbb5 (patch) | |
| tree | 4a9e90ec878a3113f0e78330617b08b97fa675dd /src/code/z_actor.c | |
| parent | ef870bdd11c07ade54f0c92fa3470eed43ba12e4 (diff) | |
Angle cleanup - macros names (#1193)
* Move binang utility macros out of angle conversion macros block
* `BINANG_TO_DEGF` -> `BINANG_TO_DEG_ALT` (it may even be warranted to name it _approx instead of _alt, unsure)
* Add `BINANG_TO_DEG` (unused by oot) (for completeness)
* `DEGF_TO_BINANG` -> `DEG_TO_BINANG_ALT` (again may even be _approx, or maybe _cam)
* Add `DEG_TO_BINANG` (unused by oot) (for completeness)
* `RADF_TO_BINANG` -> `RAD_TO_BINANG`
* `RADF_TO_DEGF` -> `RAD_TO_DEG`
* Cleanup argument names in angle conversion macros
* Format for angle macros changes
* Run formatter
* Move `DEG_TO_BINANG_ALT`, `BINANG_TO_DEG_ALT` to z64camera.h
* Remove `DEG_TO_BINANG`, `BINANG_TO_DEG`
* Remove `_ALT` from `DEG_TO_BINANG`, `BINANG_TO_DEG`
* Add comment about inaccuracy near `DEG_TO_BINANG`, `BINANG_TO_DEG`
* run formatter
* `CAM_` prefix on `DEG_TO_BINANG`, `BINANG_TO_DEG` macros
* Revert "Remove `DEG_TO_BINANG`, `BINANG_TO_DEG`"
This reverts commit 5321647e5b2e3538ef25325f41399e1dd3984656.
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 12432b802..f56105179 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4181,12 +4181,12 @@ void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2) { sp38 = Math_SinS(arg1); sp34 = Math_CosS(arg1); sp28 = (-(floorPolyNormalX * sp38) - (floorPolyNormalZ * sp34)); - arg2->x = -RADF_TO_BINANG(Math_FAtan2F(sp28 * floorPolyNormalY, 1.0f)); + arg2->x = -RAD_TO_BINANG(Math_FAtan2F(sp28 * floorPolyNormalY, 1.0f)); sp2C = Math_SinS(arg1 - 16375); sp30 = Math_CosS(arg1 - 16375); sp24 = (-(floorPolyNormalX * sp2C) - (floorPolyNormalZ * sp30)); - arg2->z = -RADF_TO_BINANG(Math_FAtan2F(sp24 * floorPolyNormalY, 1.0f)); + arg2->z = -RAD_TO_BINANG(Math_FAtan2F(sp24 * floorPolyNormalY, 1.0f)); } } |