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

- fixed: The 3D floor light splitting code for sprites did not copy the sector's fog density. 

- fixed: fog calculations for fuzz effects were wrong.
This commit is contained in:
Christoph Oelckers 2017-01-01 00:16:00 +01:00
parent 6b943043d1
commit e4c63563e3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gl/renderer/gl_colormap.h
View File

@ -56,6 +56,7 @@ struct FColormap
LightColor = from->Color; LightColor = from->Color;
desaturation = from->Desaturate; desaturation = from->Desaturate;
FadeColor = from->Fade; FadeColor = from->Fade;
FadeColor.a = 0;
blendfactor = from->Color.a; blendfactor = from->Color.a;
fogdensity = from->Fade.a*2; fogdensity = from->Fade.a*2;
return * this; return * this;

6
src/gl/scene/gl_sprite.cpp
View File

@ -296,11 +296,10 @@ void GLSprite::Draw(int pass)
if (!gl_isBlack(Colormap.FadeColor)) if (!gl_isBlack(Colormap.FadeColor))
{ {
float dist=Dist2(ViewPos.X, ViewPos.Y, x,y); float dist=Dist2(ViewPos.X, ViewPos.Y, x,y);
int fogd = gl_GetFogDensity(lightlevel, Colormap.FadeColor, Colormap.fogdensity);
if (!Colormap.FadeColor.a) Colormap.FadeColor.a=clamp<int>(255-lightlevel,60,255);
// this value was determined by trial and error and is scale dependent! // this value was determined by trial and error and is scale dependent!
float factor=0.05f+exp(-Colormap.FadeColor.a*dist/62500.f); float factor = 0.05f + exp(-fogd*dist / 62500.f);
fuzzalpha*=factor; fuzzalpha*=factor;
minalpha*=factor; minalpha*=factor;
} }
@ -387,6 +386,7 @@ void GLSprite::Draw(int pass)
FColormap thiscm; FColormap thiscm;
thiscm.FadeColor = Colormap.FadeColor; thiscm.FadeColor = Colormap.FadeColor;
thiscm.fogdensity = Colormap.fogdensity;
thiscm.CopyFrom3DLight(&(*lightlist)[i]); thiscm.CopyFrom3DLight(&(*lightlist)[i]);
if (glset.nocoloredspritelighting) if (glset.nocoloredspritelighting)
{ {