From c167a711290bbe0f5e123f2d50a7649356ee1941 Mon Sep 17 00:00:00 2001 From: Olivier Prat Date: Thu, 6 Sep 2018 13:56:58 +0200 Subject: [PATCH] Switched back to normal SSAO and fixed broken ambient occlusion Luci visualization --- libraries/render-utils/src/DebugDeferredBuffer.cpp | 4 +--- libraries/render-utils/src/ssao.slh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/render-utils/src/DebugDeferredBuffer.cpp b/libraries/render-utils/src/DebugDeferredBuffer.cpp index 0e61b36280..848c10597a 100644 --- a/libraries/render-utils/src/DebugDeferredBuffer.cpp +++ b/libraries/render-utils/src/DebugDeferredBuffer.cpp @@ -220,9 +220,7 @@ static const std::string DEFAULT_DEBUG_SCATTERING_SHADER{ static const std::string DEFAULT_AMBIENT_OCCLUSION_SHADER{ "vec4 getFragmentColor() {" - " return vec4(vec3(texture(obscuranceMap, uv).x), 1.0);" - // When drawing color " return vec4(vec3(texture(debugTexture0, uv).xyz), 1.0);" - // when drawing normal" return vec4(normalize(texture(debugTexture0, uv).xyz * 2.0 - vec3(1.0)), 1.0);" + " return vec4(vec3(texture(debugTexture0, uv).x), 1.0);" " }" }; static const std::string DEFAULT_AMBIENT_OCCLUSION_BLURRED_SHADER{ diff --git a/libraries/render-utils/src/ssao.slh b/libraries/render-utils/src/ssao.slh index 89aa220e72..da8466ccdb 100644 --- a/libraries/render-utils/src/ssao.slh +++ b/libraries/render-utils/src/ssao.slh @@ -11,7 +11,7 @@ <@if not SSAO_SLH@> <@def SSAO_SLH@> -#define SSAO_USE_HORIZON_BASED 1 +#define SSAO_USE_HORIZON_BASED 0 <@include render-utils/ShaderConstants.h@>