Revert "dont pass skybox to r_setupframe"
This reverts commit 78c0f64135.
This commit is contained in:
1 parent
d0ee4d73f9
commit
c009866158
5 files changed
+10
-9
No files matched your search
@@ -5315,7 +5315,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
|
||||
}
|
||||
PS_STOP_TIMING(ps_skyboxtime);
|
||||
|
||||
R_SetupFrame(viewssnum); // This can stay false because it is only used to set viewsky in r_main.c, which isn't used here
|
||||
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
|
||||
framecount++; // for timedemo
|
||||
HWR_RenderFrame(viewnumber, player, false);
|
||||
}
|
||||
|
||||
@@ -181,7 +181,7 @@ void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float
|
||||
HWR_PortalFrame(rootportal);
|
||||
else // current frame is not a portal frame but the main view!
|
||||
{
|
||||
R_SetupFrame(viewssnum);
|
||||
R_SetupFrame(viewssnum, false);
|
||||
portalclipline = NULL;
|
||||
}
|
||||
|
||||
|
||||
+4
-3
@@ -694,13 +694,14 @@ void P_Ticker(boolean run)
|
||||
if (!player->mo)
|
||||
continue;
|
||||
|
||||
const boolean skybox = (skyVisiblePerPlayer[i] && skyboxmo[0] && cv_skybox.value);
|
||||
const boolean skybox = (skyboxmo[0] && cv_skybox.value);
|
||||
boolean isSkyVisibleForPlayer = skyVisiblePerPlayer[i];
|
||||
|
||||
if (skybox)
|
||||
if (isSkyVisibleForPlayer && skybox)
|
||||
{
|
||||
R_SkyboxFrame(i);
|
||||
}
|
||||
R_SetupFrame(i);
|
||||
R_SetupFrame(i, skybox);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -1221,7 +1221,7 @@ void R_SkyboxFrame(int s)
|
||||
R_SetupCommonFrame(player, viewmobj->subsector);
|
||||
}
|
||||
|
||||
void R_SetupFrame(int s)
|
||||
void R_SetupFrame(int s, boolean skybox)
|
||||
{
|
||||
player_t *player = &players[displayplayers[s]];
|
||||
camera_t *thiscam = &camera[s];
|
||||
@@ -1247,7 +1247,7 @@ void R_SetupFrame(int s)
|
||||
else if (thiscam && !chasecam)
|
||||
thiscam->chase = false;
|
||||
|
||||
newview->sky = false;
|
||||
newview->sky = !skybox;
|
||||
|
||||
R_SetupAimingFrame(player, thiscam);
|
||||
|
||||
@@ -1385,7 +1385,7 @@ void R_RenderPlayerView(player_t *player)
|
||||
}
|
||||
PS_STOP_TIMING(ps_skyboxtime);
|
||||
|
||||
R_SetupFrame(viewssnum);
|
||||
R_SetupFrame(viewssnum, skybox);
|
||||
skyVisible = false;
|
||||
framecount++;
|
||||
validcount++;
|
||||
|
||||
+1
-1
@@ -223,7 +223,7 @@ void R_SetViewSize(void);
|
||||
void R_ExecuteSetViewSize(void);
|
||||
|
||||
void R_SkyboxFrame(int s);
|
||||
void R_SetupFrame(int s);
|
||||
void R_SetupFrame(int s, boolean skybox);
|
||||
|
||||
// Called by G_Drawer.
|
||||
void R_RenderPlayerView(player_t *player);
|
||||
|
||||
Reference in new issue
Block a user