Merge pull request #33 from NT-Bourgeois-Iridescence-Technologies/master

Added color correction and added contrast in shaders
Hopson97 · Sep 12, 2017 · 873f869 · 873f869
2 parents 41ca1ad + 5d91ff4
commit 873f869
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-renderdistance 16
+renderdistance 8
 fullscreen 1
 windowsize 1280 720
 fov 100