From b514f4e89d241e6107174093da496b5e42dd7680 Mon Sep 17 00:00:00 2001 From: Alexander Gauggel <agauggel@uni-koblenz.de> Date: Sat, 26 Jun 2021 20:02:23 +0200 Subject: [PATCH] [#69] Correct tonemapping --- projects/particle_simulation/shaders/tonemapping.comp | 2 +- projects/particle_simulation/src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/particle_simulation/shaders/tonemapping.comp b/projects/particle_simulation/shaders/tonemapping.comp index 4ba7f2c6..26f0232d 100644 --- a/projects/particle_simulation/shaders/tonemapping.comp +++ b/projects/particle_simulation/shaders/tonemapping.comp @@ -13,7 +13,7 @@ void main(){ } ivec2 uv = ivec2(gl_GlobalInvocationID.xy); vec3 linearColor = imageLoad(inImage, uv).rgb; - vec3 tonemapped = linearColor / (linearColor + 1); // reinhard tonemapping + vec3 tonemapped = linearColor / (dot(linearColor, vec3(0.21, 0.71, 0.08)) + 1); // reinhard tonemapping vec3 gammaCorrected = pow(tonemapped, vec3(1.f / 2.2f)); imageStore(outImage, uv, vec4(gammaCorrected, 0.f)); } \ No newline at end of file diff --git a/projects/particle_simulation/src/main.cpp b/projects/particle_simulation/src/main.cpp index 0fbc8bdf..8d2a611a 100644 --- a/projects/particle_simulation/src/main.cpp +++ b/projects/particle_simulation/src/main.cpp @@ -59,7 +59,7 @@ int main(int argc, const char **argv) { } // use space or use water - bool useSpace = false; + bool useSpace = true; vkcv::shader::GLSLCompiler compiler; vkcv::ShaderProgram computeShaderProgram{}; -- GitLab