diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-06-03 11:33:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-03 14:33:03 -0400 |
| commit | f26e77ba4088f20e72e13409f9ad535039abd291 (patch) | |
| tree | fa39e6c8bb57bfe5729854c8ea2bd3e25ea4155f /src/overlays/effects | |
| parent | 312b65d5e34878df4b70d8b9922e1082213b3662 (diff) | |
More General Cleanup (#1638)
* LINKER_FILES in makefile
* COLPOLY_GET_NORMAL
* math header
* libc
* M_PI for cosf and sinf files
* MAXFLOAT
* Revert "MAXFLOAT"
This reverts commit 96b75ffaa89b1a4ca1c08278b28bc3c70224701a.
* Remove SHT_MINV
* SHRT_MAX
* Add M_PI
* Angle macros
* f suffix
* Format
Diffstat (limited to 'src/overlays/effects')
| -rw-r--r-- | src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 2 | ||||
| -rw-r--r-- | src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index b40513e21..10aabf150 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -98,7 +98,7 @@ void EffectSsDeadDs_Draw(PlayState* play, u32 index, EffectSs* this) { Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_RotateZYX(this->rRoll, this->rPitch, this->rYaw, MTXMODE_APPLY); - Matrix_RotateXFApply(1.57f); // (M_PI / 2) + Matrix_RotateXFApply(1.57f); // (M_PIf / 2) Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetCombineLERP(POLY_XLU_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index 8c4fc5877..7b44feee8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -72,7 +72,7 @@ void EffectSsKFire_Draw(PlayState* play, u32 index, EffectSs* this) { Matrix_ReplaceRotation(&play->billboardMtxF); if ((index % 2) != 0) { - Matrix_RotateYF(M_PI, MTXMODE_APPLY); + Matrix_RotateYF(M_PIf, MTXMODE_APPLY); } gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); |