zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-04 12:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use texture clamping on non-tiled walls.

Browse source
This commit is contained in:
Christoph Oelckers 2021-04-01 19:21:24 +02:00
parent e1df17964e
commit 85020b374a
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/core/rendering/scene/hw_drawstructs.h
View file

@ -124,7 +124,6 @@ public:
HWF_SKYHACK=4, HWF_SKYHACK=4,
HWF_NOSPLIT=64, HWF_NOSPLIT=64,
HWF_TRANSLUCENT = 128, HWF_TRANSLUCENT = 128,
HWF_NOSLICE = 256
}; };
enum enum

28
source/core/rendering/scene/hw_walls.cpp
View file

@ -192,7 +192,7 @@ void HWWall::RenderTexturedWall(HWDrawInfo *di, FRenderState &state, int rflags)
{ {
//int tmode = state.GetTextureMode(); //int tmode = state.GetTextureMode();
state.SetMaterial(texture, UF_Texture, 0, sprite == nullptr? CLAMP_NONE : CLAMP_XY, TRANSLATION(Translation_Remap + curbasepal, palette), -1); state.SetMaterial(texture, UF_Texture, 0, sprite == nullptr? (flags & (HWF_CLAMPX | HWF_CLAMPY)) : CLAMP_XY, TRANSLATION(Translation_Remap + curbasepal, palette), -1);
SetLightAndFog(state); SetLightAndFog(state);
@ -426,7 +426,7 @@ void HWWall::PutWall(HWDrawInfo *di, bool translucent)
// make sure that following parts of the same linedef do not get this one's vertex and lighting info. // make sure that following parts of the same linedef do not get this one's vertex and lighting info.
vertcount = 0; vertcount = 0;
dynlightindex = -1; dynlightindex = -1;
flags &= ~HWF_TRANSLUCENT; flags &= ~(HWF_TRANSLUCENT|HWF_CLAMPX|HWF_CLAMPY);
} }
//========================================================================== //==========================================================================
@ -684,12 +684,6 @@ void HWWall::CheckTexturePosition()
tcs[UPRGT].v -= sub; tcs[UPRGT].v -= sub;
tcs[LOLFT].v -= sub; tcs[LOLFT].v -= sub;
tcs[LORGT].v -= sub; tcs[LORGT].v -= sub;
if ((tcs[UPLFT].v == 0.f && tcs[UPRGT].v == 0.f && tcs[LOLFT].v <= 1.f && tcs[LORGT].v <= 1.f) ||
(tcs[UPLFT].v >= 0.f && tcs[UPRGT].v >= 0.f && tcs[LOLFT].v == 1.f && tcs[LORGT].v == 1.f))
{
flags |= HWF_CLAMPY;
}
} }
else else
{ {
@ -705,13 +699,19 @@ void HWWall::CheckTexturePosition()
tcs[UPRGT].v -= sub; tcs[UPRGT].v -= sub;
tcs[LOLFT].v -= sub; tcs[LOLFT].v -= sub;
tcs[LORGT].v -= sub; tcs[LORGT].v -= sub;
if ((tcs[LOLFT].v == 0.f && tcs[LORGT].v == 0.f && tcs[UPLFT].v <= 1.f && tcs[UPRGT].v <= 1.f) ||
(tcs[LOLFT].v >= 0.f && tcs[LORGT].v >= 0.f && tcs[UPLFT].v == 1.f && tcs[UPRGT].v == 1.f))
{
flags |= HWF_CLAMPY;
}
} }
if (tcs[UPLFT].u >= 0.f && tcs[UPRGT].u >= 0.f && tcs[LOLFT].u >= 0.f && tcs[LORGT].u >= 0.f &&
tcs[UPLFT].u <= 1.f && tcs[UPRGT].u <= 1.f && tcs[LOLFT].u <= 1.f && tcs[LORGT].u <= 1.f)
{
flags |= HWF_CLAMPX;
}
if (tcs[UPLFT].v >= 0.f && tcs[UPRGT].v >= 0.f && tcs[LOLFT].v >= 0.f && tcs[LORGT].v >= 0.f &&
tcs[UPLFT].v <= 1.f && tcs[UPRGT].v <= 1.f && tcs[LOLFT].v <= 1.f && tcs[LORGT].v <= 1.f)
{
flags |= HWF_CLAMPY;
}
} }