From 660a45a0e07882f28b7261b563b593f50f2bd024 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Thu, 13 Oct 2016 18:04:00 +0200 Subject: [PATCH 1/2] Add normals to decals --- src/gl/scene/gl_decal.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gl/scene/gl_decal.cpp b/src/gl/scene/gl_decal.cpp index 651cb7aa9d..7fb680f8e0 100644 --- a/src/gl/scene/gl_decal.cpp +++ b/src/gl/scene/gl_decal.cpp @@ -316,6 +316,8 @@ void GLWall::DrawDecal(DBaseDecal *decal) gl_RenderState.SetFog(0,-1); } + gl_RenderState.SetNormal(glseg.Normal()); + FQuadDrawer qd; for (i = 0; i < 4; i++) { From 14c1a77f8a0278f5a25d50d61de8f0728145294f Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Thu, 13 Oct 2016 18:08:04 +0200 Subject: [PATCH 2/2] Fix AmbientOcclusionColor bug where pixelpos was assumed to be in eye space coordinates --- wadsrc/static/shaders/glsl/main.fp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/shaders/glsl/main.fp b/wadsrc/static/shaders/glsl/main.fp index e26b2fd4a3..5ab9f11188 100644 --- a/wadsrc/static/shaders/glsl/main.fp +++ b/wadsrc/static/shaders/glsl/main.fp @@ -287,7 +287,7 @@ vec3 AmbientOcclusionColor() } else { - fogdist = max(16.0, length(pixelpos.xyz)); + fogdist = max(16.0, distance(pixelpos.xyz, uCameraPos.xyz)); } fogfactor = exp2 (uFogDensity * fogdist);