zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed wall clipping with 3D lights.

This commit is contained in:
Christoph Oelckers 2016-02-04 01:12:18 +01:00
parent 87f3a8f0cc
commit 0c8a817df4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gl/scene/gl_decal.cpp
View File

@ -351,7 +351,7 @@ void GLWall::DrawDecal(DBaseDecal *decal)
float low1 = lowplane.ZatPoint(dv[1].x, dv[1].y); float low1 = lowplane.ZatPoint(dv[1].x, dv[1].y);
float low2 = lowplane.ZatPoint(dv[2].x, dv[2].y); float low2 = lowplane.ZatPoint(dv[2].x, dv[2].y);
if (low1 < dv[1].z && low2 < dv[2].z) if (low1 < dv[1].z || low2 < dv[2].z)
{ {
int thisll = (*lightlist)[k].caster != NULL ? gl_ClampLight(*(*lightlist)[k].p_lightlevel) : lightlevel; int thisll = (*lightlist)[k].caster != NULL ? gl_ClampLight(*(*lightlist)[k].p_lightlevel) : lightlevel;
FColormap thiscm; FColormap thiscm;

2
src/gl/scene/gl_walls_draw.cpp
View File

@ -349,7 +349,7 @@ void GLWall::RenderTextured(int rflags)
float low1 = FIXED2FLOAT(lowplane.ZatPoint(vertexes[0])); float low1 = FIXED2FLOAT(lowplane.ZatPoint(vertexes[0]));
float low2 = FIXED2FLOAT(lowplane.ZatPoint(vertexes[1])); float low2 = FIXED2FLOAT(lowplane.ZatPoint(vertexes[1]));
if (low1 < ztop[0] && low2 < ztop[1]) if (low1 < ztop[0] || low2 < ztop[1])
{ {
int thisll = (*lightlist)[i].caster != NULL ? gl_ClampLight(*(*lightlist)[i].p_lightlevel) : lightlevel; int thisll = (*lightlist)[i].caster != NULL ? gl_ClampLight(*(*lightlist)[i].p_lightlevel) : lightlevel;
FColormap thiscm; FColormap thiscm;