optimize this a bit

no need to constantly recheck this, just pass it around as a bool
also inline dispoffset function since it used to be a nested thing
This commit is contained in:
Alug committed 2024-11-20 17:03:37 +01:00
1 parent 622dce1b1a
commit 0309477c9d
1 file changed
+12 -12
+12 -12
View File
@@ -3531,7 +3531,7 @@ static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts
}
}
static void HWR_ApplyDispoffset(gl_vissprite_t *spr, FOutVector *wallVerts, const boolean papersprite)
static inline void HWR_ApplyDispoffset(gl_vissprite_t *spr, FOutVector *wallVerts, const boolean papersprite, const boolean shadow)
{
// dont push papersprites near the cam
if (papersprite && !spr->dispoffset)
@@ -3541,7 +3541,7 @@ static void HWR_ApplyDispoffset(gl_vissprite_t *spr, FOutVector *wallVerts, cons
}
// yes shadows need this crap applied since they dont work well enough with just the shader
if ((HWR_UseShader() && spr->mobj->type == MT_SHADOW) || !HWR_UseShader())
if ((HWR_UseShader() && shadow) || !HWR_UseShader())
{
if (!papersprite) // dont push papersprites near the cam
{
@@ -3578,7 +3578,7 @@ static void HWR_ApplyDispoffset(gl_vissprite_t *spr, FOutVector *wallVerts, cons
}
}
static void HWR_SplitSprite(gl_vissprite_t *spr)
static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite, const boolean shadow)
{
FOutVector wallVerts[4];
FOutVector baseWallVerts[4]; // This is what the verts should end up as
@@ -3602,7 +3602,6 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
fixed_t temp;
fixed_t v1x, v1y, v2x, v2y;
INT32 shader = SHADER_NONE;
const boolean papersprite = (spr->mobj->frame & FF_PAPERSPRITE);
gpatch = spr->gpatch; //W_CachePatchNum(spr->patchlumpnum, PU_CACHE);
@@ -3660,7 +3659,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
}
// push it toward the camera to mitigate floor-clipping sprites
HWR_ApplyDispoffset(spr, baseWallVerts, papersprite);
HWR_ApplyDispoffset(spr, baseWallVerts, papersprite, shadow);
realtop = top = baseWallVerts[3].y;
realbot = bot = baseWallVerts[0].y;
@@ -3700,7 +3699,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
if (HWR_UseShader())
{
shader = (papersprite || spr->mobj->type == MT_SHADOW) ? SHADER_SPRITE : SHADER_SPRITECLIPHACK;
shader = (papersprite || shadow) ? SHADER_SPRITE : SHADER_SPRITECLIPHACK;
blend |= PF_ColorMapped;
}
@@ -3782,7 +3781,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
wallVerts[1].y = endbot;
// The x and y only need to be adjusted in the case that it's not a papersprite
if (cv_glspritebillboarding.value && spr->mobj && !(spr->mobj->frame & FF_PAPERSPRITE))
if (cv_glspritebillboarding.value && spr->mobj && !papersprite)
{
// Get the x and z of the vertices so billboarding draws correctly
realheight = realbot - realtop;
@@ -3858,14 +3857,15 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
if (!spr->mobj->subsector)
return;
const boolean papersprite = (spr->mobj->frame & FF_PAPERSPRITE);
const boolean shadow = (spr->mobj->type == MT_SHADOW);
if (spr->mobj->subsector->sector->numlights)
{
HWR_SplitSprite(spr);
HWR_SplitSprite(spr, papersprite, shadow);
return;
}
const boolean papersprite = (spr->mobj->frame & FF_PAPERSPRITE);
// cache sprite graphics
//12/12/99: Hurdler:
// OK, I don't change anything for MD2 support because I want to be
@@ -3929,7 +3929,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
}*/
// push it toward the camera to mitigate floor-clipping sprites
HWR_ApplyDispoffset(spr, wallVerts, papersprite);
HWR_ApplyDispoffset(spr, wallVerts, papersprite, shadow);
// This needs to be AFTER the shadows so that the regular sprites aren't drawn completely black.
// sprite lighting by modulating the RGB components
@@ -3971,7 +3971,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
if (HWR_UseShader())
{
shader = (papersprite || spr->mobj->type == MT_SHADOW) ? SHADER_SPRITE : SHADER_SPRITECLIPHACK;
shader = (papersprite || shadow) ? SHADER_SPRITE : SHADER_SPRITECLIPHACK;
blend |= PF_ColorMapped;
}