From 745f57930b6ae3c8c328efc86a8f6017b3cf5fd3 Mon Sep 17 00:00:00 2001 From: numzero Date: Thu, 24 Feb 2022 13:20:33 +0300 Subject: [PATCH] Reduce tone mapping strength --- client/shaders/nodes_shader/opengl_fragment.glsl | 6 +++--- client/shaders/object_shader/opengl_fragment.glsl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl index c06a1d5fb..318d874b5 100644 --- a/client/shaders/nodes_shader/opengl_fragment.glsl +++ b/client/shaders/nodes_shader/opengl_fragment.glsl @@ -29,7 +29,7 @@ const float fogShadingParameter = 1.0 / ( 1.0 - fogStart); #if ENABLE_TONE_MAPPING /* Hable's UC2 Tone mapping parameters - A = 0.22; + A = 0.12; B = 0.30; C = 0.10; D = 0.20; @@ -41,7 +41,7 @@ const float fogShadingParameter = 1.0 / ( 1.0 - fogStart); vec3 uncharted2Tonemap(vec3 x) { - return ((x * (0.22 * x + 0.03) + 0.002) / (x * (0.22 * x + 0.3) + 0.06)) - 0.03333; + return ((x * (0.12 * x + 0.03) + 0.002) / (x * (0.12 * x + 0.3) + 0.06)) - 0.03333; } vec4 applyToneMapping(vec4 color) @@ -52,7 +52,7 @@ vec4 applyToneMapping(vec4 color) color.rgb = uncharted2Tonemap(exposureBias * color.rgb); // Precalculated white_scale from //vec3 whiteScale = 1.0 / uncharted2Tonemap(vec3(W)); - vec3 whiteScale = vec3(1.036015346); + vec3 whiteScale = vec3(1.25); color.rgb *= whiteScale; return vec4(pow(color.rgb, vec3(1.0 / gamma)), color.a); } diff --git a/client/shaders/object_shader/opengl_fragment.glsl b/client/shaders/object_shader/opengl_fragment.glsl index 01ef8db4e..ed24df7af 100644 --- a/client/shaders/object_shader/opengl_fragment.glsl +++ b/client/shaders/object_shader/opengl_fragment.glsl @@ -26,7 +26,7 @@ const float fogShadingParameter = 1.0 / (1.0 - fogStart); #if ENABLE_TONE_MAPPING /* Hable's UC2 Tone mapping parameters - A = 0.22; + A = 0.12; B = 0.30; C = 0.10; D = 0.20; @@ -38,7 +38,7 @@ const float fogShadingParameter = 1.0 / (1.0 - fogStart); vec3 uncharted2Tonemap(vec3 x) { - return ((x * (0.22 * x + 0.03) + 0.002) / (x * (0.22 * x + 0.3) + 0.06)) - 0.03333; + return ((x * (0.12 * x + 0.03) + 0.002) / (x * (0.12 * x + 0.3) + 0.06)) - 0.03333; } vec4 applyToneMapping(vec4 color) @@ -49,7 +49,7 @@ vec4 applyToneMapping(vec4 color) color.rgb = uncharted2Tonemap(exposureBias * color.rgb); // Precalculated white_scale from //vec3 whiteScale = 1.0 / uncharted2Tonemap(vec3(W)); - vec3 whiteScale = vec3(1.036015346); + vec3 whiteScale = vec3(1.25); color.rgb *= whiteScale; return vec4(pow(color.rgb, vec3(1.0 / gamma)), color.a); }