Merge remote-tracking branch 'origin/master'

1 files changed, 25 insertions, 0 deletions

diff --git a/client/shaders/test_shader_3/opengl_fragment.glsl b/client/shaders/test_shader_3/opengl_fragment.glsl
new file mode 100644
index 000000000..535774c11
--- /dev/null
+++ b/client/shaders/test_shader_3/opengl_fragment.glsl
@@ -0,0 +1,25 @@
+

+uniform sampler2D myTexture;

+uniform float fogDistance;

+

+varying vec3 vPosition;

+

+void main (void)

+{

+	vec4 col = texture2D(myTexture, vec2(gl_TexCoord[0]));

+	col *= gl_Color;

+	float a = col.a;
+	col = col * col; // SRGB -> Linear

+	col *= 1.8;

+	col.r = 1.0 - exp(1.0 - col.r) / exp(1.0);

+	col.g = 1.0 - exp(1.0 - col.g) / exp(1.0);

+	col.b = 1.0 - exp(1.0 - col.b) / exp(1.0);
+	col = sqrt(col); // Linear -> SRGB
+
+	if(fogDistance != 0.0){

+		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));

+		a = mix(a, 0.0, d);

+	}
+

+	gl_FragColor = vec4(col.r, col.g, col.b, a);

+}