dont pass skybox to r_setupframe

why was this even done?
neither srb2 nor v2/rr ever did this?
This commit is contained in:
Alug committed 2024-10-24 22:44:10 +02:00
1 parent a195f807d0
commit f7c831f9d1
4 files changed
+11 -10

No files matched your search

+2 -2
View File
@@ -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);
}
+4 -3
View File
@@ -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);
}
}
}
+4 -4
View File
@@ -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++;
+1 -1
View File
@@ -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);