mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-04 18:58:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use more TRUNCF_BINANG for f32 -> s16 casts (#1503)

Browse Source 
* TRUNCF_BINANG

* brackets

* extra cast
This commit is contained in:
engineer124
2023-12-13 15:16:24 +11:00
committed by GitHub
parent ed4da0ecef
commit 5607eec18b
127 changed files with 387 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/cutscene_camera.c
+6 -6
View File
@@ -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) {