From 46c172e3241237634f88750512bb3a28db916db3 Mon Sep 17 00:00:00 2001 From: Tehsapper Date: Fri, 13 Dec 2024 20:05:46 +0900 Subject: [PATCH 1/2] allow composite pass gamma to be set --- include/limitless/renderer/composite_pass.hpp | 1 + shaders/pipeline/composite.frag | 2 +- src/limitless/renderer/composite_pass.cpp | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/limitless/renderer/composite_pass.hpp b/include/limitless/renderer/composite_pass.hpp index cd4d7984..0315bf05 100644 --- a/include/limitless/renderer/composite_pass.hpp +++ b/include/limitless/renderer/composite_pass.hpp @@ -18,6 +18,7 @@ namespace Limitless { Framebuffer framebuffer; public: float tone_mapping_exposure = 1.0f; + float gamma = 1.f; explicit CompositePass(Renderer& renderer); diff --git a/shaders/pipeline/composite.frag b/shaders/pipeline/composite.frag index ee768d78..3c63fbcf 100644 --- a/shaders/pipeline/composite.frag +++ b/shaders/pipeline/composite.frag @@ -12,6 +12,7 @@ uniform sampler2D bloom; uniform sampler2D outline; uniform float bloom_strength; uniform float tone_mapping_exposure; +uniform float gamma; void main() { vec3 bloom_color = texture(bloom, uv).rgb * bloom_strength; @@ -21,7 +22,6 @@ void main() { color = toneMapping(color, tone_mapping_exposure); // apply gamma correction - float gamma = 2.2; color = pow(color, vec3(1.0 / gamma)); // add objects outlining diff --git a/src/limitless/renderer/composite_pass.cpp b/src/limitless/renderer/composite_pass.cpp index f0c832d9..21c0241b 100644 --- a/src/limitless/renderer/composite_pass.cpp +++ b/src/limitless/renderer/composite_pass.cpp @@ -46,7 +46,8 @@ void CompositePass::render( shader.setUniform("bloom", bloom_pass.getResult()) .setUniform("outline", renderer.getPass().getResult()) .setUniform("bloom_strength", bloom_strength) - .setUniform("tone_mapping_exposure", tone_mapping_exposure); + .setUniform("tone_mapping_exposure", tone_mapping_exposure) + .setUniform("gamma", gamma); } shader.use(); From 92dbb4b7c77c868d6ac8ba9cfc3b17cfd97d993b Mon Sep 17 00:00:00 2001 From: Tehsapper Date: Fri, 13 Dec 2024 20:09:09 +0900 Subject: [PATCH 2/2] revert default gamma to 2.2 --- include/limitless/renderer/composite_pass.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/limitless/renderer/composite_pass.hpp b/include/limitless/renderer/composite_pass.hpp index 0315bf05..3a0b4ddf 100644 --- a/include/limitless/renderer/composite_pass.hpp +++ b/include/limitless/renderer/composite_pass.hpp @@ -18,7 +18,7 @@ namespace Limitless { Framebuffer framebuffer; public: float tone_mapping_exposure = 1.0f; - float gamma = 1.f; + float gamma = 2.2f; explicit CompositePass(Renderer& renderer);