From 24d1f113f8ca0bf65fde98ba65936579e57051d7 Mon Sep 17 00:00:00 2001 From: samcake Date: Fri, 22 Jan 2016 09:44:32 -0800 Subject: [PATCH] Fixing the warning maybe --- libraries/render-utils/src/AmbientOcclusionEffect.h | 2 +- libraries/render-utils/src/ssao.slh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.h b/libraries/render-utils/src/AmbientOcclusionEffect.h index dfbc5b996e..9973bd9ec8 100644 --- a/libraries/render-utils/src/AmbientOcclusionEffect.h +++ b/libraries/render-utils/src/AmbientOcclusionEffect.h @@ -106,7 +106,7 @@ private: // Dithering info glm::vec4 ditheringInfo { 0.0f, 0.0f, 0.01f, 1.0f }; // Sampling info - glm::vec4 sampleInfo { 11.0f, 1.0/11.0f, 7.0f, 1.0f }; + glm::vec4 sampleInfo { 11.0f, 1.0f/11.0f, 7.0f, 1.0f }; // Blurring info glm::vec4 blurInfo { 1.0f, 3.0f, 2.0f, 0.0f }; // gaussian distribution coefficients first is the sampling radius (max is 6) diff --git a/libraries/render-utils/src/ssao.slh b/libraries/render-utils/src/ssao.slh index a3dff16aac..5fcd224e9d 100644 --- a/libraries/render-utils/src/ssao.slh +++ b/libraries/render-utils/src/ssao.slh @@ -134,7 +134,6 @@ float getBlurEdgeSharpness() { return params._blurInfo.x; } -#define CONSTANT_GAUSSIAN #ifdef CONSTANT_GAUSSIAN const int BLUR_RADIUS = 4; const float gaussian[BLUR_RADIUS + 1] = @@ -182,7 +181,7 @@ vec2 fetchOcclusionDepth(ivec2 coords) { } const int RADIUS_SCALE = 1; -const float BLUR_WEIGHT_OFFSET = 0.0; +const float BLUR_WEIGHT_OFFSET = 0.05; const float BLUR_EDGE_SCALE = 2000.0; vec2 evalTapWeightedValue(ivec3 side, int r, ivec2 ssC, float key) {