From 5d91ff44765a50ecbe0c3e0555339d76130188cb Mon Sep 17 00:00:00 2001 From: Nathan <19nbourgeois_68@perrysburgstudents.net> Date: Mon, 11 Sep 2017 22:16:10 -0400 Subject: [PATCH] Added color correction and added contrast --- Shaders/ChunkFragment.glsl | 17 ++++++++++++++++- Shaders/SkyboxFragment.glsl | 19 ++++++++++++++++++- config.txt | 2 +- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Shaders/ChunkFragment.glsl b/Shaders/ChunkFragment.glsl index 8f47996f..bd3320b3 100644 --- a/Shaders/ChunkFragment.glsl +++ b/Shaders/ChunkFragment.glsl @@ -6,8 +6,23 @@ in float passCardinalLight; uniform sampler2D texSampler; +vec3 brightnessContrast(vec3 value, float brightness, float contrast){ + return (value - 0.5) * contrast + 0.5 + (brightness-1); +} + +vec4 color; + +vec3 gamma(vec3 value, float param) +{ + return vec3(pow(abs(value.r), param),pow(abs(value.g), param),pow(abs(value.b), param)); +} + void main() { - outColour = texture(texSampler, passTextureCoord) * passCardinalLight; + color = texture(texSampler, passTextureCoord); + color = vec4(brightnessContrast(color.xyz, 1.15f, 1.1f), color.w); + color = vec4(gamma(color.xyz, 1.3f),color.w); + + outColour = color * passCardinalLight; if (outColour.a == 0) discard; } diff --git a/Shaders/SkyboxFragment.glsl b/Shaders/SkyboxFragment.glsl index b9396d16..06e60381 100644 --- a/Shaders/SkyboxFragment.glsl +++ b/Shaders/SkyboxFragment.glsl @@ -5,7 +5,24 @@ in vec3 passTextureCoord; uniform samplerCube texSampler; +vec3 brightnessContrast(vec3 value, float brightness, float contrast){ + return (value - 0.5) * contrast + 0.5 + (brightness-1); +} + +vec4 color; + +vec3 gamma(vec3 value, float param) +{ + return vec3(pow(abs(value.r), param),pow(abs(value.g), param),pow(abs(value.b), param)); +} + + void main() { - outColour = texture(texSampler, passTextureCoord); + color = texture(texSampler, passTextureCoord); + color = vec4(brightnessContrast(color.xyz, 1.15f, 1.1f), color.w); + color = vec4(gamma(color.xyz, 3.3f),color.w); + + outColour = color; + if (outColour.a == 0) discard; } diff --git a/config.txt b/config.txt index 312033a6..1f8cb7a8 100644 --- a/config.txt +++ b/config.txt @@ -1,4 +1,4 @@ -renderdistance 16 +renderdistance 8 fullscreen 1 windowsize 1280 720 fov 100