dont need to pass the viewnumber around
This commit is contained in:
1 parent
84d3d0d891
commit
c8a0a2bdae
3 files changed
+14
-10
No files matched your search
+1
-1
@@ -509,7 +509,7 @@ static boolean D_Display(void)
|
||||
|
||||
#ifdef HWRENDER
|
||||
if (rendermode == render_opengl)
|
||||
HWR_RenderPlayerView(i, &players[displayplayers[i]]);
|
||||
HWR_RenderPlayerView();
|
||||
else
|
||||
#endif
|
||||
if (rendermode != render_none)
|
||||
|
||||
+12
-8
@@ -5423,7 +5423,7 @@ void HWR_RenderViewpoint(gl_portal_t *rootportal, const float fpov, player_t *pl
|
||||
// ==========================================================================
|
||||
// Render the current frame.
|
||||
// ==========================================================================
|
||||
static void HWR_RenderFrame(INT32 viewnumber, player_t *player, boolean skybox)
|
||||
static void HWR_RenderFrame(player_t *player, boolean skybox)
|
||||
{
|
||||
const float fpov = FixedToFloat(R_GetPlayerFov(player));
|
||||
|
||||
@@ -5431,12 +5431,12 @@ static void HWR_RenderFrame(INT32 viewnumber, player_t *player, boolean skybox)
|
||||
gl_viewwindowx = gl_baseviewwindowx;
|
||||
gl_viewwindowy = gl_baseviewwindowy;
|
||||
|
||||
if ((splitscreen == 1 && viewnumber == 1) || (splitscreen > 1 && viewnumber > 1))
|
||||
if ((splitscreen == 1 && viewssnum == 1) || (splitscreen > 1 && viewssnum > 1))
|
||||
{
|
||||
gl_viewwindowy += gl_viewheight;
|
||||
}
|
||||
|
||||
if (splitscreen > 1 && viewnumber & 1)
|
||||
if (splitscreen > 1 && viewssnum & 1)
|
||||
{
|
||||
gl_viewwindowx += gl_viewwidth;
|
||||
}
|
||||
@@ -5503,15 +5503,19 @@ static void HWR_RollTransform(FTransform *tr, angle_t roll)
|
||||
{
|
||||
tr->rollangle = roll / (float)ANG1;
|
||||
tr->roll = true;
|
||||
tr->rollx = 1.0f;
|
||||
tr->rollz = 0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
|
||||
void HWR_RenderPlayerView(void)
|
||||
{
|
||||
player_t * player = &players[displayplayers[viewssnum]];
|
||||
|
||||
const boolean skybox = (skyboxmo[0] && cv_skybox.value); // True if there's a skybox object and skyboxes are on
|
||||
|
||||
// Clear the color buffer, stops HOMs. Also seems to fix the skybox issue on Intel GPUs.
|
||||
if (viewnumber == 0) // Only do it if it's the first screen being rendered
|
||||
if (viewssnum == 0) // Only do it if it's the first screen being rendered
|
||||
{
|
||||
FRGBAFloat ClearColor;
|
||||
|
||||
@@ -5528,7 +5532,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
|
||||
GL_SetShaderInfo(HWD_SHADERINFO_LEVELTIME, (INT32)leveltime); // The water surface shader needs the leveltime.
|
||||
}
|
||||
|
||||
if (viewnumber > 3)
|
||||
if (viewssnum > 3)
|
||||
return;
|
||||
|
||||
// Render the skybox if there is one.
|
||||
@@ -5537,13 +5541,13 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
|
||||
if (skybox)
|
||||
{
|
||||
R_SkyboxFrame(viewssnum);
|
||||
HWR_RenderFrame(viewnumber, player, true);
|
||||
HWR_RenderFrame(player, true);
|
||||
}
|
||||
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
|
||||
framecount++; // for timedemo
|
||||
HWR_RenderFrame(viewnumber, player, false);
|
||||
HWR_RenderFrame(player, false);
|
||||
}
|
||||
|
||||
void HWR_LoadLevel(void)
|
||||
|
||||
@@ -104,7 +104,7 @@ boolean HWR_Screenshot(const char *lbmname);
|
||||
void HWR_SetViewSize(void);
|
||||
void HWR_AddCommands(void);
|
||||
|
||||
void HWR_RenderPlayerView(INT32 viewnumber, player_t *player);
|
||||
void HWR_RenderPlayerView(void);
|
||||
void HWR_RenderViewpoint(gl_portal_t *rootportal, const float fpov, player_t *player, int stencil_level, boolean allow_portals);
|
||||
|
||||
void HWR_ClearSkyDome(void);
|
||||
|
||||
Reference in new issue
Block a user