diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-12-13 15:16:24 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-13 15:16:24 +1100 |
| commit | 5607eec18bae68e4cd38ef6d1fa69d7f1d84bfc8 (patch) | |
| tree | bb13ad49718f8883bc65d7bd0a9db4d791800cf2 /src/code/cutscene_camera.c | |
| parent | ed4da0ecef698ad0112c7cdf575368ac3c61903b (diff) | |
Use more `TRUNCF_BINANG` for f32 -> s16 casts (#1503)
* TRUNCF_BINANG
* brackets
* extra cast
Diffstat (limited to 'src/code/cutscene_camera.c')
| -rw-r--r-- | src/code/cutscene_camera.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/cutscene_camera.c b/src/code/cutscene_camera.c index 53474bf88..e2d4bdd0a 100644 --- a/src/code/cutscene_camera.c +++ b/src/code/cutscene_camera.c @@ -401,9 +401,9 @@ s16 CutsceneCamera_Interp_Linear(Vec3f* camPos, f32* camFov, s16* camRoll, CsCmd targetRoll = CAM_DEG_TO_BINANG(miscCmd->roll); - rollDiffToTarget = (s16)(targetRoll - (s16)interpState->initRoll); + rollDiffToTarget = (s16)(targetRoll - TRUNCF_BINANG(interpState->initRoll)); - *camRoll = (s16)interpState->initRoll + (s16)(rollDiffToTarget * lerp); + *camRoll = TRUNCF_BINANG(interpState->initRoll) + TRUNCF_BINANG(rollDiffToTarget * lerp); } if (interpState->curFrame >= pointCmd->duration) { @@ -467,9 +467,9 @@ s16 CutsceneCamera_Interp_Scale(Vec3f* camPos, f32* camFov, s16* camRoll, CsCmdC targetRoll = CAM_DEG_TO_BINANG(miscCmd->roll); - rollDiffToTarget = (s16)(targetRoll - (s16)interpState->initRoll); + rollDiffToTarget = (s16)(targetRoll - TRUNCF_BINANG(interpState->initRoll)); - *camRoll += (s16)(rollDiffToTarget * lerp); + *camRoll += TRUNCF_BINANG(rollDiffToTarget * lerp); } if (interpState->curFrame >= pointCmd->duration) { @@ -532,9 +532,9 @@ s16 CutsceneCamera_Interp_Geo(Vec3f* camPos, f32* camFov, s16* camRoll, CsCmdCam targetRoll = CAM_DEG_TO_BINANG(miscCmd->roll); - rollDiffToTarget = (s16)(targetRoll - (s16)interpState->initRoll); + rollDiffToTarget = (s16)(targetRoll - TRUNCF_BINANG(interpState->initRoll)); - *camRoll += (s16)(rollDiffToTarget * lerp); + *camRoll += TRUNCF_BINANG(rollDiffToTarget * lerp); } if (interpState->curFrame >= pointCmd->duration) { |