zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-18 23:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed some uninitialized stuff in particle rendering.

Browse source 
- added gl_ClampLight to all places where the light level is set.
This commit is contained in:
Christoph Oelckers 2016-04-06 14:03:21 +02:00
parent 9196683e4f
commit a0d0d9339e
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gl/scene/gl_flats.cpp
View file

@ -447,7 +447,7 @@ void GLFlat::SetFrom3DFloor(F3DFloor *rover, bool top, bool underside)
// FF_FOG requires an inverted logic where to get the light from // FF_FOG requires an inverted logic where to get the light from
lightlist_t *light = P_GetPlaneLight(sector, plane.plane, underside); lightlist_t *light = P_GetPlaneLight(sector, plane.plane, underside);
lightlevel = *light->p_lightlevel; lightlevel = gl_ClampLight(*light->p_lightlevel);
if (rover->flags & FF_FOG) Colormap.LightColor = (light->extra_colormap)->Fade; if (rover->flags & FF_FOG) Colormap.LightColor = (light->extra_colormap)->Fade;
else Colormap.CopyFrom3DLight(light); else Colormap.CopyFrom3DLight(light);
@ -544,7 +544,7 @@ void GLFlat::ProcessSector(sector_t * frontsector)
if ((!(sector->GetFlags(sector_t::floor)&PLANEF_ABSLIGHTING) || light->lightsource == NULL) if ((!(sector->GetFlags(sector_t::floor)&PLANEF_ABSLIGHTING) || light->lightsource == NULL)
&& (light->p_lightlevel != &frontsector->lightlevel)) && (light->p_lightlevel != &frontsector->lightlevel))
{ {
lightlevel = *light->p_lightlevel; lightlevel = gl_ClampLight(*light->p_lightlevel);
} }
Colormap.CopyFrom3DLight(light); Colormap.CopyFrom3DLight(light);
@ -607,7 +607,7 @@ void GLFlat::ProcessSector(sector_t * frontsector)
if ((!(sector->GetFlags(sector_t::ceiling)&PLANEF_ABSLIGHTING)) if ((!(sector->GetFlags(sector_t::ceiling)&PLANEF_ABSLIGHTING))
&& (light->p_lightlevel != &frontsector->lightlevel)) && (light->p_lightlevel != &frontsector->lightlevel))
{ {
lightlevel = *light->p_lightlevel; lightlevel = gl_ClampLight(*light->p_lightlevel);
} }
Colormap.CopyFrom3DLight(light); Colormap.CopyFrom3DLight(light);
} }

8
src/gl/scene/gl_sprite.cpp
View file

@ -866,11 +866,15 @@ void GLSprite::ProcessParticle (particle_t *particle, sector_t *sector)//, int s
if (lightbottom < particle->Pos.Z) if (lightbottom < particle->Pos.Z)
{ {
lightlevel = *lightlist[i].p_lightlevel; lightlevel = gl_ClampLight(*lightlist[i].p_lightlevel);
Colormap.LightColor = (lightlist[i].extra_colormap)->Color; Colormap.LightColor = (lightlist[i].extra_colormap)->Color;
break; break;
} }
} }
if (glset.nocoloredspritelighting)
{
Colormap.Decolorize(); // ZDoom never applies colored light to particles.
}
} }
else else
{ {
@ -884,6 +888,7 @@ void GLSprite::ProcessParticle (particle_t *particle, sector_t *sector)//, int s
OverrideShader = 0; OverrideShader = 0;
ThingColor = particle->color; ThingColor = particle->color;
ThingColor.g = 255;
ThingColor.a = 255; ThingColor.a = 255;
modelframe=NULL; modelframe=NULL;
@ -939,6 +944,7 @@ void GLSprite::ProcessParticle (particle_t *particle, sector_t *sector)//, int s
actor=NULL; actor=NULL;
this->particle=particle; this->particle=particle;
fullbright = !!particle->bright;
// [BB] Translucent particles have to be rendered without the alpha test. // [BB] Translucent particles have to be rendered without the alpha test.
if (gl_particles_style != 2 && trans>=1.0f-FLT_EPSILON) hw_styleflags = STYLEHW_Solid; if (gl_particles_style != 2 && trans>=1.0f-FLT_EPSILON) hw_styleflags = STYLEHW_Solid;

2
src/gl/scene/gl_wall.h
View file

@ -314,7 +314,7 @@ public:
friend struct GLDrawList; friend struct GLDrawList;
friend void Mod_RenderModel(GLSprite * spr, model_t * mdl, int framenumber); friend void Mod_RenderModel(GLSprite * spr, model_t * mdl, int framenumber);
BYTE lightlevel; int lightlevel;
BYTE foglevel; BYTE foglevel;
BYTE hw_styleflags; BYTE hw_styleflags;
bool fullbright; bool fullbright;

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

@ -272,7 +272,7 @@ void FGLRenderer::DrawPlayerSprites(sector_t * viewsector, bool hudModelStep)
if (lightbottom<player->viewz) if (lightbottom<player->viewz)
{ {
cm = lightlist[i].extra_colormap; cm = lightlist[i].extra_colormap;
lightlevel = *lightlist[i].p_lightlevel; lightlevel = gl_ClampLight(*lightlist[i].p_lightlevel);
break; break;
} }
} }