From 08e2b49e8834ed98631f7dd93e5801a8a0bd3794 Mon Sep 17 00:00:00 2001 From: MaikelChan Date: Tue, 6 Aug 2024 12:43:45 +0200 Subject: [PATCH] Fixed viewport calculations of the character selection UIs from multiplayer. --- src/game/menu.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/game/menu.c b/src/game/menu.c index 26c839f0a..f36bfec72 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -2262,7 +2262,21 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) gdl = func0f0d49c8(gdl); gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } else { - f32 aspect = (f32) (g_MenuScissorX2 - g_MenuScissorX1) / (f32) (g_MenuScissorY2 - g_MenuScissorY1); +#ifdef PLATFORM_N64 + s32 x1 = g_MenuScissorX1; + s32 x2 = g_MenuScissorX2; +#else + s32 halfScreenWidth = SCREEN_WIDTH_LO >> 1; + f32 scale = SCREEN_ASPECT / videoGetAspect(); + f32 width = (g_MenuScissorX2 - g_MenuScissorX1) * scale; + f32 center = (g_MenuScissorX1 + g_MenuScissorX2) * 0.5f; + center = ((center - halfScreenWidth) * scale) + halfScreenWidth; + + s32 x1 = (s32)(center - width * 0.5f); + s32 x2 = (s32)(center + width * 0.5f); +#endif + + f32 aspect = (f32) (x2 - x1) / (f32) (g_MenuScissorY2 - g_MenuScissorY1); static u32 znear = 10; static u32 zfar = 300; @@ -2272,8 +2286,8 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) gdl = func0f0d49c8(gdl); - viSetViewPosition(g_MenuScissorX1 * g_ScaleX, g_MenuScissorY1); - viSetFovAspectAndSize(g_Vars.currentplayer->fovy, aspect, (g_MenuScissorX2 - g_MenuScissorX1) * g_ScaleX, g_MenuScissorY2 - g_MenuScissorY1); + viSetViewPosition(x1 * g_ScaleX, g_MenuScissorY1); + viSetFovAspectAndSize(g_Vars.currentplayer->fovy, aspect, (x2 - x1) * g_ScaleX, g_MenuScissorY2 - g_MenuScissorY1); gdl = vi0000af00(gdl, var800a2048[g_MpPlayerNum]); gdl = vi0000aca4(gdl, znear, zfar);