thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'limited-footfix' into 'master'

Browse source 
GL: Don't pull papersprites towards camera

Closes #988

See merge request KartKrew/Kart!1923
This commit is contained in:
Oni 2024-02-18 01:22:14 +00:00
commit 674a5e8c7a
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/hardware/hw_defs.h
View file

@ -143,6 +143,7 @@ enum
SHADER_FLOOR,
SHADER_WALL,
SHADER_SPRITE,
SHADER_SPRITECLIPHACK,
SHADER_MODEL, SHADER_MODEL_LIGHTING,
SHADER_WATER,
SHADER_FOG,

4
src/hardware/hw_main.c
View file

@ -3423,7 +3423,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
if (HWR_UseShader())
{
shader = SHADER_SPRITE;
shader = (R_ThingIsPaperSprite(spr->mobj) || R_ThingIsFloorSprite(spr->mobj)) ? SHADER_SPRITE : SHADER_SPRITECLIPHACK;
blend |= PF_ColorMapped;
}
@ -3916,7 +3916,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
if (HWR_UseShader())
{
shader = SHADER_SPRITE;
shader = (R_ThingIsPaperSprite(spr->mobj) || R_ThingIsFloorSprite(spr->mobj)) ? SHADER_SPRITE : SHADER_SPRITECLIPHACK;;
blend |= PF_ColorMapped;
}

3
src/hardware/r_opengl/r_opengl.c
View file

@ -922,6 +922,9 @@ static struct {
{GLSL_DEFAULT_VERTEX_SHADER, GLSL_SOFTWARE_FRAGMENT_SHADER},
// Sprite shader
{GLSL_DEFAULT_VERTEX_SHADER, GLSL_SOFTWARE_FRAGMENT_SHADER},
// Sprite clipping hack shader (for pulling things out of the floor)
{GLSL_SPRITECLIP_HACK_VERTEX_SHADER, GLSL_SOFTWARE_FRAGMENT_SHADER},
// Model shader