zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/ssao' into qzdoom

Browse source
This commit is contained in:
Magnus Norddahl 2016-10-13 18:12:56 +02:00
commit 2a0ab96341
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -316,6 +316,8 @@ void GLWall::DrawDecal(DBaseDecal *decal)
gl_RenderState.SetFog(0,-1); gl_RenderState.SetFog(0,-1);
} }
gl_RenderState.SetNormal(glseg.Normal());
FQuadDrawer qd; FQuadDrawer qd;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {

2
wadsrc/static/shaders/glsl/main.fp
View file

@ -287,7 +287,7 @@ vec3 AmbientOcclusionColor()
} }
else else
{ {
fogdist = max(16.0, length(pixelpos.xyz)); fogdist = max(16.0, distance(pixelpos.xyz, uCameraPos.xyz));
} }
fogfactor = exp2 (uFogDensity * fogdist); fogfactor = exp2 (uFogDensity * fogdist);