From c5c51f2af2430ec87380f2a7fe794af9c58adf20 Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 19 Jan 2016 18:57:03 -0800 Subject: [PATCH] Make sure the resolution level for ao is correct --- libraries/render-utils/src/AmbientOcclusionEffect.cpp | 2 +- libraries/render-utils/src/AmbientOcclusionEffect.h | 2 +- libraries/render-utils/src/FramebufferCache.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp index 1558c99585..bbe0485760 100644 --- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp +++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp @@ -227,7 +227,7 @@ void AmbientOcclusionEffect::setRadius(float radius) { auto& current = _parametersBuffer.edit()._radiusInfo; current.x = radius; current.y = radius * radius; - current.z = 1.0f / pow(radius, 6.0); + current.z = 1.0f / pow((double)radius, 6.0); } } diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.h b/libraries/render-utils/src/AmbientOcclusionEffect.h index 4919d89b04..e80c5b0136 100644 --- a/libraries/render-utils/src/AmbientOcclusionEffect.h +++ b/libraries/render-utils/src/AmbientOcclusionEffect.h @@ -91,7 +91,7 @@ private: class Parameters { public: // Resolution info - glm::vec4 _resolutionInfo{ 1.0, 1.0, 1.0, 1.0 }; + glm::vec4 _resolutionInfo{ -1.0, 0.0, 0.0, 0.0 }; // radius info is { R, R^2, 1 / R^6, ObscuranceScale} glm::vec4 _radiusInfo{ 0.5, 0.5 * 0.5, 1.0 / (0.25 * 0.25 * 0.25), 1.0 }; // Dithering info diff --git a/libraries/render-utils/src/FramebufferCache.h b/libraries/render-utils/src/FramebufferCache.h index cf126b20b1..7c7c309572 100644 --- a/libraries/render-utils/src/FramebufferCache.h +++ b/libraries/render-utils/src/FramebufferCache.h @@ -103,7 +103,7 @@ private: gpu::TexturePointer _occlusionBlurredTexture; QSize _frameBufferSize{ 100, 100 }; - int _AOResolutionLevel = 0; + int _AOResolutionLevel = 1; // AO perform at half res // Resize/reallocate the buffers used for AO // the size of the AO buffers is scaled by the AOResolutionScale;