mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 02:54:24 +00:00
Code Issues Projects Releases Wiki Activity

Angle cleanup - DEG_TO_RAD (#1157)

Browse source 
* Run formatter

* Touch up angle macros (parentheses and hex constants)

* Remove `DEGF_TO_RADF`, use `DEG_TO_RAD` instead

* Remove `DEGTORAD`, use `DEG_TO_RAD` instead

* Use `DEG_TO_RAD` more
This commit is contained in:
Dragorn421 2022-03-21 00:33:29 +01:00 • committed by GitHub
parent c42c172e72
commit 4729ac131a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/libc/math.h
View file

@ -8,7 +8,6 @@
#define FLT_MAX 340282346638528859811704183484516925440.0f
#define SHT_MAX 32767.0f
#define SHT_MINV (1.0f / SHT_MAX)
#define DEGTORAD(x) (x * M_PI / 180.0f)
typedef union {
struct {

1
include/z64math.h
View file

@ -97,7 +97,6 @@ typedef struct {
#define DEGF_TO_BINANG(degreesf) (s16)((degreesf) * 182.04167f + .5f)
#define RADF_TO_BINANG(radf) (s16)((radf) * (0x8000 / M_PI))
#define RADF_TO_DEGF(radf) ((radf) * (180.0f / M_PI))
#define DEGF_TO_RADF(degf) ((degf) * (M_PI / 180.0f))
#define BINANG_ROT180(angle) ((s16)((angle) - 0x7FFF))
#define BINANG_SUB(a, b) ((s16)((a) - (b)))
#define DEG_TO_RAD(degrees) ((degrees) * (M_PI / 180.0f))

8
src/code/z_camera.c
View file

@ -949,11 +949,11 @@ s32 func_800458D4(Camera* camera, VecSph* eyeAtDir, f32 arg2, f32* arg3, s16 arg
deltaY = playerPosRot->pos.y - *arg3;
eyeAtAngle = Math_FAtan2F(deltaY, OLib_Vec3fDistXZ(&camera->at, &camera->eye));
if (eyeAtAngle > DEGF_TO_RADF(OREG(32))) {
if (eyeAtAngle > DEG_TO_RAD(OREG(32))) {
if (1) {}
phi_f2 = 1.0f - sinf(eyeAtAngle - DEGF_TO_RADF(OREG(32)));
} else if (eyeAtAngle < DEGF_TO_RADF(OREG(33))) {
phi_f2 = 1.0f - sinf(DEGF_TO_RADF(OREG(33)) - eyeAtAngle);
phi_f2 = 1.0f - sinf(eyeAtAngle - DEG_TO_RAD(OREG(32)));
} else if (eyeAtAngle < DEG_TO_RAD(OREG(33))) {
phi_f2 = 1.0f - sinf(DEG_TO_RAD(OREG(33)) - eyeAtAngle);
} else {
phi_f2 = 1.0f;
}

4
src/code/z_kankyo.c
View file

@ -1899,8 +1899,8 @@ void Environment_DrawLightning(GlobalContext* globalCtx, s32 unused) {
Matrix_Translate(sLightningBolts[i].pos.x + sLightningBolts[i].offset.x,
sLightningBolts[i].pos.y + sLightningBolts[i].offset.y,
sLightningBolts[i].pos.z + sLightningBolts[i].offset.z, MTXMODE_NEW);
Matrix_RotateX(sLightningBolts[i].pitch * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateZ(sLightningBolts[i].roll * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateX(DEG_TO_RAD(sLightningBolts[i].pitch), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(sLightningBolts[i].roll), MTXMODE_APPLY);
Matrix_Scale(22.0f, 100.0f, 22.0f, MTXMODE_APPLY);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 128);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 255, 128);

2
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View file

@ -948,7 +948,7 @@ f32 BossTw_GetFloorY(Vec3f* pos) {
}
Matrix_Push();
Matrix_RotateY((45.0f * (M_PI / 180.0f)), MTXMODE_NEW);
Matrix_RotateY(DEG_TO_RAD(45), MTXMODE_NEW);
Matrix_MultVec3f(pos, &posRotated);
Matrix_Pop();

4
src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
View file

@ -667,12 +667,12 @@ void func_8096865C(Actor* thisx, GlobalContext* globalCtx) {
sEnvColors[this->unk_293].b, 255);
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_Push();
Matrix_RotateZ((f32)(this->timer2 * 6) * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(this->timer2 * 6), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1230),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, displayList);
Matrix_Pop();
Matrix_RotateZ(-(f32)(this->timer2 * 6) * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(-(f32)(this->timer2 * 6)), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1236),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, displayList);

20
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -1409,9 +1409,9 @@ void DemoEffect_MoveJewelSpherical(f32 degrees, f32 frameDivisor, Vec3f startPos
distance = frameDivisor * sqrtf(SQ(endPos.x - startPos.x) + SQ(endPos.y - startPos.y) + SQ(endPos.z - startPos.z));
this->actor.world.pos.x = radius * cosf(degrees * (M_PI / 180.0f));
this->actor.world.pos.x = radius * cosf(DEG_TO_RAD(degrees));
this->actor.world.pos.y = distance;
this->actor.world.pos.z = radius * sinf(degrees * (M_PI / 180.0f));
this->actor.world.pos.z = radius * sinf(DEG_TO_RAD(degrees));
xPos = this->actor.world.pos.x;
ySpherical = (this->actor.world.pos.y * cosf(BINANG_TO_RAD(rotation.x))) -
@ -1745,23 +1745,23 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
512 - ((frames * 2) % 512) - 1, 0, 64, 64));
Matrix_Push();
Matrix_RotateY(0.0f, MTXMODE_APPLY);
Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
Matrix_RotateX(DEG_TO_RAD(11), MTXMODE_APPLY);
Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2661),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL);
Matrix_Pop();
Matrix_Push();
Matrix_RotateY((2.0f * M_PI) / 3.0f, MTXMODE_APPLY);
Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
Matrix_RotateY(DEG_TO_RAD(120), MTXMODE_APPLY);
Matrix_RotateX(DEG_TO_RAD(11), MTXMODE_APPLY);
Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2672),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL);
Matrix_Pop();
Matrix_Push();
Matrix_RotateY((4.0f * M_PI) / 3.0f, MTXMODE_APPLY);
Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
Matrix_RotateY(DEG_TO_RAD(240), MTXMODE_APPLY);
Matrix_RotateX(DEG_TO_RAD(11), MTXMODE_APPLY);
Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2683),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -1839,7 +1839,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) {
if (1) {}
}
Matrix_RotateZ((((s32)this->godLgt.rotation) * 3.0f) * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(((s32)this->godLgt.rotation) * 3.0f), MTXMODE_APPLY);
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
Matrix_Translate(0.0f, -140.0f, 0.0f, MTXMODE_APPLY);
Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY);
@ -1876,14 +1876,14 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) {
((this->light.scaleFlag & 1) * 0.05f) + 1.0f, MTXMODE_APPLY);
Matrix_Push();
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_RotateZ(this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(this->light.rotation), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2866),
G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
if (disp) {};
gSPDisplayList(POLY_XLU_DISP++, disp);
Matrix_Pop();
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_RotateZ(-(f32)this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(-(f32)this->light.rotation), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2874),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, disp);

4
src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
View file

@ -418,9 +418,9 @@ void EnBubble_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(this->expansionWidth + 1.0f, this->expansionHeight + 1.0f, 1.0f, MTXMODE_APPLY);
Matrix_RotateZ(((f32)globalCtx->state.frames * (M_PI / 180.0f)) * this->graphicRotSpeed, MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD((f32)globalCtx->state.frames) * this->graphicRotSpeed, MTXMODE_APPLY);
Matrix_Scale(this->graphicEccentricity + 1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
Matrix_RotateZ((-(f32)globalCtx->state.frames * (M_PI / 180.0f)) * this->graphicRotSpeed, MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(-(f32)globalCtx->state.frames) * this->graphicRotSpeed, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bubble.c", 1220),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

6
src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
View file

@ -355,9 +355,9 @@ void EnEncount2_ParticleDraw(Actor* thisx, GlobalContext* globalCtx) {
for (i = 0; i < ARRAY_COUNT(this->particles); particle++, i++) {
if (particle->isAlive) {
Matrix_Translate(particle->pos.x, particle->pos.y, particle->pos.z, MTXMODE_NEW);
Matrix_RotateX(particle->rot.x * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateY(particle->rot.y * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateZ(particle->rot.z * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateX(DEG_TO_RAD(particle->rot.x), MTXMODE_APPLY);
Matrix_RotateY(DEG_TO_RAD(particle->rot.y), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(particle->rot.z), MTXMODE_APPLY);
Matrix_Scale(particle->scale, particle->scale, particle->scale, MTXMODE_APPLY);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255);
gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255);

2
src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
View file

@ -257,7 +257,7 @@ void EnFdFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (1) {}
if (1) {}
Matrix_RotateY(BINANG_TO_RAD((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) + 0x8000)), MTXMODE_APPLY);
Matrix_RotateZ(((sp88 * -10.0f) * sp80) * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD((sp88 * -10.0f) * sp80), MTXMODE_APPLY);
scale.x = scale.y = scale.z = this->scale * 0.001f;
Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY);
sp84 = sp80 * ((0.01f * -15.0f) * sp84) + 1.0f;

4
src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
View file

@ -1095,8 +1095,8 @@ void EnFloormas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
if (limbIndex == 2) {
Matrix_Push();
Matrix_Translate(1600.0f, -700.0f, -1700.0f, MTXMODE_APPLY);
Matrix_RotateY(DEGTORAD(60.0f), MTXMODE_APPLY);
Matrix_RotateZ(DEGTORAD(15.0f), MTXMODE_APPLY);
Matrix_RotateY(DEG_TO_RAD(60.0f), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(15.0f), MTXMODE_APPLY);
Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY);
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_floormas.c", 2299), G_MTX_LOAD);
gSPDisplayList((*gfx)++, gWallmasterFingerDL);

2
src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View file

@ -1102,7 +1102,7 @@ void func_80A3C498(Actor* thisx, GlobalContext* globalCtx, s32 flags) {
void EnGirlA_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnGirlA* this = (EnGirlA*)thisx;
Matrix_RotateY(((this->yRotation * 360.0f) / 65536.0f) * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateY(DEG_TO_RAD((this->yRotation * 360.0f) / 65536.0f), MTXMODE_APPLY);
if (this->hiliteFunc != NULL) {
this->hiliteFunc(thisx, globalCtx, 0);
}

8
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View file

@ -204,8 +204,8 @@ f32 func_80A4E754(EnGs* this, GlobalContext* globalCtx, f32* arg2, f32* arg3, u1
if (arg9 == 0) {
sp2C = Math_SmoothStepToF(arg2, *arg3, arg5, arg6, arg7);
this->unk_1B4[0].x = 1.0f + (sinf((((*arg4 % arg8) * (1.0f / arg8)) * 360.0f) * (M_PI / 180.0f)) * *arg2);
this->unk_1B4[0].y = 1.0f - (sinf((((*arg4 % arg8) * (1.0f / arg8)) * 360.0f) * (M_PI / 180.0f)) * *arg2);
this->unk_1B4[0].x = 1.0f + (sinf(DEG_TO_RAD(((*arg4 % arg8) * (1.0f / arg8)) * 360.0f)) * *arg2);
this->unk_1B4[0].y = 1.0f - (sinf(DEG_TO_RAD(((*arg4 % arg8) * (1.0f / arg8)) * 360.0f)) * *arg2);
*arg4 += 1;
}
return sp2C;
@ -473,8 +473,8 @@ void func_80A4F13C(EnGs* this, GlobalContext* globalCtx) {
tmpf3 = Math_SmoothStepToF(&this->unk_1F8, this->unk_1FC, 0.8f, 0.02f, 0.001f);
this->unk_1B4[0].x = this->unk_1F0 + 1.0f;
this->unk_1B4[0].y = this->unk_1E8 + 1.0f;
this->unk_1B4[0].x += sinf((((this->unk_200 % 10) * 0.1f) * 360.0f) * (M_PI / 180.0f)) * this->unk_1F8;
this->unk_1B4[0].y += sinf((((this->unk_200 % 10) * 0.1f) * 360.0f) * (M_PI / 180.0f)) * this->unk_1F8;
this->unk_1B4[0].x += sinf(DEG_TO_RAD(((this->unk_200 % 10) * 0.1f) * 360.0f)) * this->unk_1F8;
this->unk_1B4[0].y += sinf(DEG_TO_RAD(((this->unk_200 % 10) * 0.1f) * 360.0f)) * this->unk_1F8;
this->unk_200++;
if ((tmpf1 == 0.0f) && (tmpf2 == 0.0f) && (tmpf3 == 0.0f)) {
this->unk_19C = 0;

2
src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
View file

@ -853,7 +853,7 @@ void EnHeishi2_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (linkObjBankIndex >= 0) {
Matrix_Put(&this->mtxf_330);
Matrix_Translate(-570.0f, 0.0f, 0.0f, MTXMODE_APPLY);
Matrix_RotateZ(DEGTORAD(70.0), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(70.0), MTXMODE_APPLY);
mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1820) - 7;
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[linkObjBankIndex].segment);

2
src/overlays/actors/ovl_En_Sw/z_en_sw.c
View file

@ -999,7 +999,7 @@ void EnSw_Draw(Actor* thisx, GlobalContext* globalCtx) {
Color_RGBA8 sp30 = { 184, 0, 228, 255 };
if (((this->actor.params & 0xE000) >> 0xD) != 0) {
Matrix_RotateX(DEGF_TO_RADF(-80), MTXMODE_APPLY);
Matrix_RotateX(DEG_TO_RAD(-80), MTXMODE_APPLY);
if (this->actor.colChkInfo.health != 0) {
Matrix_Translate(0.0f, 0.0f, 200.0f, MTXMODE_APPLY);
}

6
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View file

@ -11,8 +11,6 @@
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4)
#define TIMER_SCALE ((f32)OS_CLOCK_RATE / 10000000000)
#define DEGREE_60_RAD (60.0f * M_PI / 180.0f)
#define DEGREE_15_RAD (15.0f * M_PI / 180.0f)
#define DAMAGE_EFFECT_BURN 2
#define DAMAGE_EFFECT_STUN_WHITE 4
@ -630,8 +628,8 @@ void EnWallMas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
Matrix_Push();
Matrix_Translate(1600.0f, -700.0f, -1700.0f, MTXMODE_APPLY);
Matrix_RotateY(DEGREE_60_RAD, MTXMODE_APPLY);
Matrix_RotateZ(DEGREE_15_RAD, MTXMODE_APPLY);
Matrix_RotateY(DEG_TO_RAD(60), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(15), MTXMODE_APPLY);
Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1489), G_MTX_LOAD);

2
src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
View file

@ -106,7 +106,7 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
temp2 = Math_SinS(yaw);
dist = Math_Vec3f_DistXZ(&scale, &this->vec) / (this->rReg10 * 0.1f);
Matrix_RotateY(BINANG_TO_RAD((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) + 0x8000)), MTXMODE_APPLY);
Matrix_RotateZ(temp2 * this->rReg2 * dist * (M_PI / 180.0f), MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(temp2 * this->rReg2 * dist), MTXMODE_APPLY);
temp2 = 1.0f - ((f32)(this->life + 1) / this->rLifespan);
temp2 = 1.0f - SQ(temp2);
scale.x = scale.y = scale.z = temp2 * (this->rScale * 0.000010000001f);