diff --git a/include/z64camera.h b/include/z64camera.h index 9d737455c6..ac54b430ec 100644 --- a/include/z64camera.h +++ b/include/z64camera.h @@ -4,6 +4,9 @@ #include "ultra64.h" #include "z64cutscene.h" +#define DEG_TO_BINANG_ALT(degrees) (s16)((degrees) * 182.04167f + .5f) +#define BINANG_TO_DEG_ALT(binang) ((f32)(binang) * (360.0001525f / 65535.0f)) + #define CAM_STAT_CUT 0 #define CAM_STAT_WAIT 1 #define CAM_STAT_UNK3 3 diff --git a/include/z64math.h b/include/z64math.h index 9278e7c86c..b674f62bf8 100644 --- a/include/z64math.h +++ b/include/z64math.h @@ -98,12 +98,10 @@ typedef struct { // Angle conversion macros #define DEG_TO_BINANG(degrees) (s16)((degrees) * (0x8000 / 180.0f)) -#define DEG_TO_BINANG_ALT(degrees) (s16)((degrees) * 182.04167f + .5f) #define RAD_TO_BINANG(radians) (s16)((radians) * (0x8000 / M_PI)) #define RAD_TO_DEG(radians) ((radians) * (180.0f / M_PI)) #define DEG_TO_RAD(degrees) ((degrees) * (M_PI / 180.0f)) #define BINANG_TO_DEG(binang) ((f32)(binang) * (180.0f / 0x8000)) -#define BINANG_TO_DEG_ALT(binang) ((f32)(binang) * (360.0001525f / 65535.0f)) #define BINANG_TO_RAD(binang) ((f32)(binang) * (M_PI / 0x8000)) #define BINANG_TO_RAD_ALT(binang) (((f32)(binang) / (f32)0x8000) * M_PI) #define BINANG_TO_RAD_ALT2(binang) (((f32)(binang) * M_PI) / 0x8000)