mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
Code Issues Projects Releases Wiki Activity

Move DEG_TO_BINANG_ALT, BINANG_TO_DEG_ALT to z64camera.h

Browse source
This commit is contained in:
Dragorn421 2022-04-09 09:19:20 +02:00
parent 946a14add0
commit 06a4aa2818
No known key found for this signature in database
GPG key ID: C182A3A3996E8201
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/z64camera.h
View file

@ -4,6 +4,9 @@
#include "ultra64.h" #include "ultra64.h"
#include "z64cutscene.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_CUT 0
#define CAM_STAT_WAIT 1 #define CAM_STAT_WAIT 1
#define CAM_STAT_UNK3 3 #define CAM_STAT_UNK3 3

2
include/z64math.h
View file

@ -98,12 +98,10 @@ typedef struct {
// Angle conversion macros // Angle conversion macros
#define DEG_TO_BINANG(degrees) (s16)((degrees) * (0x8000 / 180.0f)) #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_BINANG(radians) (s16)((radians) * (0x8000 / M_PI))
#define RAD_TO_DEG(radians) ((radians) * (180.0f / M_PI)) #define RAD_TO_DEG(radians) ((radians) * (180.0f / M_PI))
#define DEG_TO_RAD(degrees) ((degrees) * (M_PI / 180.0f)) #define DEG_TO_RAD(degrees) ((degrees) * (M_PI / 180.0f))
#define BINANG_TO_DEG(binang) ((f32)(binang) * (180.0f / 0x8000)) #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(binang) ((f32)(binang) * (M_PI / 0x8000))
#define BINANG_TO_RAD_ALT(binang) (((f32)(binang) / (f32)0x8000) * M_PI) #define BINANG_TO_RAD_ALT(binang) (((f32)(binang) / (f32)0x8000) * M_PI)
#define BINANG_TO_RAD_ALT2(binang) (((f32)(binang) * M_PI) / 0x8000) #define BINANG_TO_RAD_ALT2(binang) (((f32)(binang) * M_PI) / 0x8000)