PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-03 00:33:55 +03:00
Code Issues Actions 2 Packages Projects Releases 1 Wiki Activity

intro passageway interpolation

Browse Source
This commit is contained in:
Sonic Dreamcaster 2024-11-20 20:17:51 -03:00
parent 32b97549fa
commit 009d8eef7c
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/overlays/ovl_menu/fox_title.c
View File

@ -434,7 +434,7 @@ void Title_Ranking_Draw(void) {
// This Kanji texture was used to draw a white line. // This Kanji texture was used to draw a white line.
Lib_TextureRect_IA8(&gMasterDisp, &aTextKanjiCOMPLETE_Data[288], 16, 2, 36, 32, 15.2f, 1.0f); Lib_TextureRect_IA8(&gMasterDisp, &aTextKanjiCOMPLETE_Data[288], 16, 2, 36, 32, 15.2f, 1.0f);
RCP_SetupDL(&gMasterDisp, SETUPDL_83_POINT); RCP_SetupDL(&gMasterDisp, SETUPDL_83_POINT);
Title_RankingData_Draw(); Title_RankingData_Draw();
@ -2844,6 +2844,8 @@ bool Title_Team_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
return false; return false;
} }
f32 prevPassageWayOffset = 0.0f;
void Title_Passage_Draw(void) { void Title_Passage_Draw(void) {
f32 sZoffsetScale; f32 sZoffsetScale;
@ -2858,10 +2860,21 @@ void Title_Passage_Draw(void) {
sPassageWayZoffset += 70.0f; sPassageWayZoffset += 70.0f;
sPassageWayZoffset = Math_ModF(sPassageWayZoffset, 4101.6f); sPassageWayZoffset = Math_ModF(sPassageWayZoffset, 4101.6f);
s8 skipInterpolation = (fabsf(sPassageWayZoffset - prevPassageWayOffset) > 4101.6f / 2.0f);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, 255, 995, 1000); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, 255, 995, 1000);
Matrix_Push(&gGfxMatrix); Matrix_Push(&gGfxMatrix);
if (skipInterpolation) {
// @port Skip interpolation
FrameInterpolation_ShouldInterpolateFrame(false);
} else {
// @port: Tag the transform.
FrameInterpolation_RecordOpenChild("Title_Passage_Draw", 0);
}
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, (3079.2002f * sZoffsetScale) - sPassageWayZoffset, MTXF_APPLY); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, (3079.2002f * sZoffsetScale) - sPassageWayZoffset, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 0.6f, 0.6f, 0.6f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, 0.6f, 0.6f, 0.6f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
@ -2879,6 +2892,16 @@ void Title_Passage_Draw(void) {
gSPDisplayList(gMasterDisp++, aTitleCsPassageWayDL); gSPDisplayList(gMasterDisp++, aTitleCsPassageWayDL);
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
if (skipInterpolation) {
// @port Skip interpolation
FrameInterpolation_ShouldInterpolateFrame(true);
} else {
// @port Pop the transform id.
FrameInterpolation_RecordCloseChild();
}
prevPassageWayOffset = sPassageWayZoffset;
} }
void Title_StarfoxLogo_Draw(void) { void Title_StarfoxLogo_Draw(void) {
@ -3366,7 +3389,7 @@ void Title_NextState_OptionMenu(void) {
sWipeHeight += 18; sWipeHeight += 18;
} else { } else {
gGameState = GSTATE_MENU; gGameState = GSTATE_MENU;
//gGameState = GSTATE_ENDING; // gGameState = GSTATE_ENDING;
gNextGameStateTimer = 2; gNextGameStateTimer = 2;
gOptionMenuStatus = OPTION_WAIT; gOptionMenuStatus = OPTION_WAIT;
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;