From f7c831f9d1429cbd906148cd0aae1029ab71c1ba Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Oct 2024 22:44:10 +0200 Subject: [PATCH] dont pass skybox to r_setupframe why was this even done? neither srb2 nor v2/rr ever did this? --- src/hardware/hw_main.c | 4 ++-- src/p_tick.c | 7 ++++--- src/r_main.c | 8 ++++---- src/r_main.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index c98dc48fe..f06b71576 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5364,7 +5364,7 @@ static void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const HWR_PortalFrame(rootportal); else // current frame is not a portal frame but the main view! { - R_SetupFrame(viewssnum, false); + R_SetupFrame(viewssnum); portalclipline = NULL; } @@ -5647,7 +5647,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player) } PS_STOP_TIMING(ps_skyboxtime); - R_SetupFrame(viewssnum, false); // This can stay false because it is only used to set viewsky in r_main.c, which isn't used here + R_SetupFrame(viewssnum); // This can stay false because it is only used to set viewsky in r_main.c, which isn't used here framecount++; // for timedemo HWR_RenderFrame(viewnumber, player, false); } diff --git a/src/p_tick.c b/src/p_tick.c index b6c25a088..40bec5079 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -690,16 +690,17 @@ void P_Ticker(boolean run) for (i = 0; i <= splitscreen; i++) { player_t *player = &players[displayplayers[i]]; - boolean isSkyVisibleForPlayer = skyVisiblePerPlayer[i]; if (!player->mo) continue; - if (isSkyVisibleForPlayer && skyboxmo[0] && cv_skybox.value) + const boolean skybox = (skyVisiblePerPlayer[i] && skyboxmo[0] && cv_skybox.value); + + if (skybox) { R_SkyboxFrame(i); } - R_SetupFrame(i, (skyboxmo[0] && cv_skybox.value)); + R_SetupFrame(i); } } } diff --git a/src/r_main.c b/src/r_main.c index 20d619f46..8ea10b48f 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1183,7 +1183,7 @@ void R_SkyboxFrame(int s) R_SetupCommonFrame(player, viewmobj->subsector); } -void R_SetupFrame(int s, boolean skybox) +void R_SetupFrame(int s) { player_t *player = &players[displayplayers[s]]; camera_t *thiscam = &camera[s]; @@ -1209,7 +1209,7 @@ void R_SetupFrame(int s, boolean skybox) else if (thiscam && !chasecam) thiscam->chase = false; - newview->sky = !skybox; + newview->sky = false; R_SetupAimingFrame(player, thiscam); @@ -1257,7 +1257,7 @@ static void R_PortalFrame(line_t *start, line_t *dest, portal_pair *portal) angle_t dangle = R_PointToAngle2(0,0,dest->dx,dest->dy) - R_PointToAngle2(start->dx,start->dy,0,0); #endif - //R_SetupFrame(player, false); + //R_SetupFrame(player); viewx = portal->viewx; viewy = portal->viewy; viewz = portal->viewz; @@ -1431,7 +1431,7 @@ void R_RenderPlayerView(player_t *player) } PS_STOP_TIMING(ps_skyboxtime); - R_SetupFrame(viewssnum, skybox); + R_SetupFrame(viewssnum); skyVisible = false; framecount++; validcount++; diff --git a/src/r_main.h b/src/r_main.h index 6ff99a93a..c74310a70 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -243,7 +243,7 @@ void R_SetViewSize(void); void R_ExecuteSetViewSize(void); void R_SkyboxFrame(int s); -void R_SetupFrame(int s, boolean skybox); +void R_SetupFrame(int s); // Called by G_Drawer. void R_RenderPlayerView(player_t *player);