zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-19 07:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix decals not getting lit by lights not having a target while still having the LF_DONTLIGHTSELF flag

Browse source 
- fix decal light not being calculated from the center of the decal
This commit is contained in:
Magnus Norddahl 2018-02-10 00:06:47 +01:00
parent ed23008069
commit 7cbe8669b6
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

@ -289,7 +289,7 @@ void GLWall::DrawDecal(DBaseDecal *decal)
// Note: This should be replaced with proper shader based lighting. // Note: This should be replaced with proper shader based lighting.
double x, y; double x, y;
decal->GetXY(seg->sidedef, x, y); decal->GetXY(seg->sidedef, x, y);
gl_SetDynSpriteLight(NULL, x, y, zpos, sub); gl_SetDynSpriteLight(nullptr, x, y, zpos - decalheight * 0.5f, sub);
} }
// alpha color only has an effect when using an alpha texture. // alpha color only has an effect when using an alpha texture.

2
src/gl/scene/gl_spritelight.cpp
View file

@ -74,7 +74,7 @@ void gl_SetDynSpriteLight(AActor *self, float x, float y, float z, subsector_t *
while (node) while (node)
{ {
light=node->lightsource; light=node->lightsource;
if (light->visibletoplayer && !(light->flags2&MF2_DORMANT) && (!(light->lightflags&LF_DONTLIGHTSELF) || light->target != self) && !(light->lightflags&LF_DONTLIGHTACTORS)) if (light->visibletoplayer && !(light->flags2&MF2_DORMANT) && (!(light->lightflags&LF_DONTLIGHTSELF) || light->target != self || !self) && !(light->lightflags&LF_DONTLIGHTACTORS))
{ {
float dist; float dist;
FVector3 L; FVector3 L;