This commit is contained in:
Alug committed 2024-06-05 01:40:39 +02:00
1 parent d548848b18
commit b7e2bcf02e
4 files changed
+32 -6

No files matched your search

+2 -1
View File
@@ -175,8 +175,9 @@ enum
SHADER_FLOOR = 0,
SHADER_SHADOW,
SHADER_WALL,
SHADER_MODEL,
SHADER_SPRITE,
SHADER_SPRITECLIPHACK,
SHADER_MODEL,
SHADER_WATER,
SHADER_FOG,
SHADER_SKY,
+25 -4
View File
@@ -3970,6 +3970,17 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
baseWallVerts[0].t = baseWallVerts[1].t = gpatch->max_t;
}
// if it has a dispoffset, push it a little towards the camera
if (spr->dispoffset)
{
float co = -gr_viewcos*(0.05f*spr->dispoffset);
float si = -gr_viewsin*(0.05f*spr->dispoffset);
baseWallVerts[0].z = baseWallVerts[3].z = baseWallVerts[0].z+si;
baseWallVerts[1].z = baseWallVerts[2].z = baseWallVerts[1].z+si;
baseWallVerts[0].x = baseWallVerts[3].x = baseWallVerts[0].x+co;
baseWallVerts[1].x = baseWallVerts[2].x = baseWallVerts[1].x+co;
}
// Let dispoffset work first since this adjust each vertex
HWR_RotateSpritePolyToAim(spr, baseWallVerts, false);
@@ -4011,7 +4022,7 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
if (HWR_UseShader())
{
shader = SHADER_SPRITE;
shader = (spr->mobj->frame & FF_PAPERSPRITE) ? SHADER_SPRITE : SHADER_SPRITECLIPHACK;
blend |= PF_ColorMapped;
}
@@ -4239,8 +4250,18 @@ static void HWR_DrawSprite(gr_vissprite_t *spr)
HWR_DrawSpriteShadow(spr, gpatch, this_scale);
}
// if it has a dispoffset, push it a little towards the camera
if (spr->dispoffset)
{
float co = -gr_viewcos*(0.05f*spr->dispoffset);
float si = -gr_viewsin*(0.05f*spr->dispoffset);
wallVerts[0].z = wallVerts[3].z = wallVerts[0].z+si;
wallVerts[1].z = wallVerts[2].z = wallVerts[1].z+si;
wallVerts[0].x = wallVerts[3].x = wallVerts[0].x+co;
wallVerts[1].x = wallVerts[2].x = wallVerts[1].x+co;
}
// Let dispoffset work first since this adjust each vertex
// ...nah
HWR_RotateSpritePolyToAim(spr, wallVerts, false);
// This needs to be AFTER the shadows so that the regular sprites aren't drawn completely black.
@@ -4285,7 +4306,7 @@ static void HWR_DrawSprite(gr_vissprite_t *spr)
if (HWR_UseShader())
{
shader = SHADER_SPRITE; // sprite shader
shader = SHADER_SPRITECLIPHACK; // sprite shader
blend |= PF_ColorMapped;
}
@@ -4386,7 +4407,7 @@ static inline void HWR_DrawPrecipitationSprite(gr_vissprite_t *spr)
if (HWR_UseShader())
{
shader = SHADER_SPRITE; // sprite shader
shader = (spr->mobj->frame & FF_PAPERSPRITE) ? SHADER_SPRITE : SHADER_SPRITECLIPHACK;
blend |= PF_ColorMapped;
}
+4
View File
@@ -36,6 +36,9 @@ static struct {
{GLSL_DEFAULT_VERTEX_SHADER, GLSL_WALL_FRAGMENT_SHADER},
// Sprite shader
{GLSL_DEFAULT_VERTEX_SHADER, GLSL_WALL_FRAGMENT_SHADER},
// Sprite clipping hack shader (for pulling things out of the floor)
{GLSL_SPRITECLIP_HACK_VERTEX_SHADER, GLSL_WALL_FRAGMENT_SHADER},
// Model shader
@@ -428,6 +431,7 @@ customshaderxlat_t shaderxlat[] =
{"Shadow", SHADER_SHADOW},
{"WallTexture", SHADER_WALL},
{"Sprite", SHADER_SPRITE},
{"SpriteClipHack", SHADER_SPRITECLIPHACK},
{"Model", SHADER_MODEL},
{"WaterRipple", SHADER_WATER},
{"Fog", SHADER_FOG},
+1 -1
View File
@@ -39,7 +39,7 @@
"gl_FrontColor = gl_Color;\n" \
"gl_TexCoord[0].xy = gl_MultiTexCoord0.xy;\n" \
"gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\n" \
"gl_Position.z -= 80 / gl_Position.z;\n" \
"gl_Position.z -= 120.0 / gl_Position.z;\n" \
"}\0"
// ==================