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.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c
index 42ca0b2a0..d4b457ef6 100644
--- a/src/code/sys_matrix.c
+++ b/src/code/sys_matrix.c
@@ -769,17 +769,17 @@ void Matrix_MtxFToYXZRotS(MtxF* mf, Vec3s* rotDest, s32 flag) {
     temp = mf->xz;
     temp *= temp;
     temp += SQ(mf->zz);
-    rotDest->x = RADF_TO_BINANG(Math_FAtan2F(-mf->yz, sqrtf(temp)));
+    rotDest->x = RAD_TO_BINANG(Math_FAtan2F(-mf->yz, sqrtf(temp)));
 
     if ((rotDest->x == 0x4000) || (rotDest->x == -0x4000)) {
         rotDest->z = 0;
 
-        rotDest->y = RADF_TO_BINANG(Math_FAtan2F(-mf->zx, mf->xx));
+        rotDest->y = RAD_TO_BINANG(Math_FAtan2F(-mf->zx, mf->xx));
     } else {
-        rotDest->y = RADF_TO_BINANG(Math_FAtan2F(mf->xz, mf->zz));
+        rotDest->y = RAD_TO_BINANG(Math_FAtan2F(mf->xz, mf->zz));
 
         if (!flag) {
-            rotDest->z = RADF_TO_BINANG(Math_FAtan2F(mf->yx, mf->yy));
+            rotDest->z = RAD_TO_BINANG(Math_FAtan2F(mf->yx, mf->yy));
         } else {
             temp = mf->xx;
             temp2 = mf->zx;
@@ -804,7 +804,7 @@ void Matrix_MtxFToYXZRotS(MtxF* mf, Vec3s* rotDest, s32 flag) {
 
             /* for a rotation matrix, temp == yx and temp2 == yy
              * which is the same as in the !flag branch */
-            rotDest->z = RADF_TO_BINANG(Math_FAtan2F(temp, temp2));
+            rotDest->z = RAD_TO_BINANG(Math_FAtan2F(temp, temp2));
         }
     }
 }
@@ -822,16 +822,16 @@ void Matrix_MtxFToZYXRotS(MtxF* mf, Vec3s* rotDest, s32 flag) {
     temp = mf->xx;
     temp *= temp;
     temp += SQ(mf->yx);
-    rotDest->y = RADF_TO_BINANG(Math_FAtan2F(-mf->zx, sqrtf(temp)));
+    rotDest->y = RAD_TO_BINANG(Math_FAtan2F(-mf->zx, sqrtf(temp)));
 
     if ((rotDest->y == 0x4000) || (rotDest->y == -0x4000)) {
         rotDest->x = 0;
-        rotDest->z = RADF_TO_BINANG(Math_FAtan2F(-mf->xy, mf->yy));
+        rotDest->z = RAD_TO_BINANG(Math_FAtan2F(-mf->xy, mf->yy));
     } else {
-        rotDest->z = RADF_TO_BINANG(Math_FAtan2F(mf->yx, mf->xx));
+        rotDest->z = RAD_TO_BINANG(Math_FAtan2F(mf->yx, mf->xx));
 
         if (!flag) {
-            rotDest->x = RADF_TO_BINANG(Math_FAtan2F(mf->zy, mf->zz));
+            rotDest->x = RAD_TO_BINANG(Math_FAtan2F(mf->zy, mf->zz));
         } else {
             // see Matrix_MtxFToYXZRotS
             temp = mf->xy;
@@ -853,7 +853,7 @@ void Matrix_MtxFToZYXRotS(MtxF* mf, Vec3s* rotDest, s32 flag) {
             temp2 = sqrtf(temp2);
             temp2 = temp3 / temp2;
 
-            rotDest->x = RADF_TO_BINANG(Math_FAtan2F(temp, temp2));
+            rotDest->x = RAD_TO_BINANG(Math_FAtan2F(temp, temp2));
         }
     }
 }