mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-15 03:16:16 +00:00
Code Issues Projects Releases Wiki Activity

RADF_TO_DEGF -> RAD_TO_DEG

Browse source
This commit is contained in:
Dragorn421 2022-04-03 21:17:07 +02:00
parent aff0379da7
commit 21cbe53936
No known key found for this signature in database
GPG key ID: C182A3A3996E8201
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/z64math.h
View file

@ -100,7 +100,7 @@ typedef struct {
#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(degreesf) (s16)((degreesf) * 182.04167f + .5f) #define DEG_TO_BINANG_ALT(degreesf) (s16)((degreesf) * 182.04167f + .5f)
#define RAD_TO_BINANG(radf) (s16)((radf) * (0x8000 / M_PI)) #define RAD_TO_BINANG(radf) (s16)((radf) * (0x8000 / M_PI))
#define RADF_TO_DEGF(radf) ((radf) * (180.0f / M_PI)) #define RAD_TO_DEG(radf) ((radf) * (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_DEG_ALT(binang) ((f32)(binang) * (360.0001525f / 65535.0f))

6
src/code/z_camera.c
View file

@ -565,7 +565,7 @@ f32 Camera_GetWaterSurface(Camera* camera, Vec3f* chkPos, s32* envProp) {
* Calculates the angle between points `from` and `to` * Calculates the angle between points `from` and `to`
*/ */
s16 Camera_XZAngle(Vec3f* to, Vec3f* from) { s16 Camera_XZAngle(Vec3f* to, Vec3f* from) {
return DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(from->x - to->x, from->z - to->z))); return DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(from->x - to->x, from->z - to->z)));
} }
s16 func_80044ADC(Camera* camera, s16 yaw, s16 arg2) { s16 func_80044ADC(Camera* camera, s16 yaw, s16 arg2) {
@ -630,8 +630,8 @@ s16 func_80044ADC(Camera* camera, s16 yaw, s16 arg2) {
} }
phi_f16 = PCT(OREG(20)) * (D_8015CE50 - camera->playerGroundY); phi_f16 = PCT(OREG(20)) * (D_8015CE50 - camera->playerGroundY);
phi_f18 = (1.0f - PCT(OREG(20))) * (D_8015CE54 - camera->playerGroundY); phi_f18 = (1.0f - PCT(OREG(20))) * (D_8015CE54 - camera->playerGroundY);
temp_s0 = DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(phi_f16, sp30))); temp_s0 = DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(phi_f16, sp30)));
temp_s1 = DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(phi_f18, sp2C))); temp_s1 = DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(phi_f18, sp2C)));
return temp_s0 + temp_s1; return temp_s0 + temp_s1;
} }

12
src/code/z_olib.c
View file

@ -117,14 +117,14 @@ VecSph* OLib_Vec3fToVecSph(VecSph* dest, Vec3f* vec) {
if ((dist == 0.0f) && (vec->y == 0.0f)) { if ((dist == 0.0f) && (vec->y == 0.0f)) {
sph.pitch = 0; sph.pitch = 0;
} else { } else {
sph.pitch = DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(dist, vec->y))); sph.pitch = DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(dist, vec->y)));
} }
sph.r = sqrtf(SQ(vec->y) + distSquared); sph.r = sqrtf(SQ(vec->y) + distSquared);
if ((vec->x == 0.0f) && (vec->z == 0.0f)) { if ((vec->x == 0.0f) && (vec->z == 0.0f)) {
sph.yaw = 0; sph.yaw = 0;
} else { } else {
sph.yaw = DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(vec->x, vec->z))); sph.yaw = DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(vec->x, vec->z)));
} }
*dest = sph; *dest = sph;
@ -196,8 +196,8 @@ Vec3f* OLib_Vec3fDiffDegF(Vec3f* dest, Vec3f* a, Vec3f* b) {
OLib_Vec3fDiffRad(&anglesRad, a, b); OLib_Vec3fDiffRad(&anglesRad, a, b);
anglesDegrees.x = RADF_TO_DEGF(anglesRad.x); anglesDegrees.x = RAD_TO_DEG(anglesRad.x);
anglesDegrees.y = RADF_TO_DEGF(anglesRad.y); anglesDegrees.y = RAD_TO_DEG(anglesRad.y);
anglesDegrees.z = 0.0f; anglesDegrees.z = 0.0f;
*dest = anglesDegrees; *dest = anglesDegrees;
@ -214,8 +214,8 @@ Vec3s* OLib_Vec3fDiffBinAng(Vec3s* dest, Vec3f* a, Vec3f* b) {
OLib_Vec3fDiffRad(&anglesRad, a, b); OLib_Vec3fDiffRad(&anglesRad, a, b);
anglesBinAng.x = DEG_TO_BINANG_ALT(RADF_TO_DEGF(anglesRad.x)); anglesBinAng.x = DEG_TO_BINANG_ALT(RAD_TO_DEG(anglesRad.x));
anglesBinAng.y = DEG_TO_BINANG_ALT(RADF_TO_DEGF(anglesRad.y)); anglesBinAng.y = DEG_TO_BINANG_ALT(RAD_TO_DEG(anglesRad.y));
anglesBinAng.z = 0.0f; anglesBinAng.z = 0.0f;
*dest = anglesBinAng; *dest = anglesBinAng;

2
src/code/z_onepointdemo.c
View file

@ -22,7 +22,7 @@ void OnePointCutscene_AddVecSphToVec3f(Vec3f* dst, Vec3f* src, VecSph* vecSph) {
} }
s16 OnePointCutscene_Vec3fYaw(Vec3f* vec1, Vec3f* vec2) { s16 OnePointCutscene_Vec3fYaw(Vec3f* vec1, Vec3f* vec2) {
return DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(vec2->x - vec1->x, vec2->z - vec1->z))); return DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(vec2->x - vec1->x, vec2->z - vec1->z)));
} }
void OnePointCutscene_Vec3sToVec3f(Vec3f* src, Vec3s* dst) { void OnePointCutscene_Vec3sToVec3f(Vec3f* src, Vec3s* dst) {