diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-03-21 00:33:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-20 19:33:29 -0400 |
| commit | 4729ac131a1f3d8ee28f59c41ed8792f51b09040 (patch) | |
| tree | 14f55d8443537046144bdce0614d9ab9d37a5973 /src/code | |
| parent | c42c172e72451bbaa3401e0331b2fc7c63b93bee (diff) | |
Angle cleanup - `DEG_TO_RAD` (#1157)
* 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
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_camera.c | 8 | ||||
| -rw-r--r-- | src/code/z_kankyo.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index a3eaefeb0..48b07f187 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -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; } diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 295dcc251..62dba8d28 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -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); |