From d7395cd2aba86f5b15cdce3be2ec141f88f95ab6 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 27 Apr 2013 23:04:52 -0400 Subject: [PATCH] Actually fix shader3 alpha this time --- client/shaders/test_shader_3/opengl_fragment.glsl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/client/shaders/test_shader_3/opengl_fragment.glsl b/client/shaders/test_shader_3/opengl_fragment.glsl index e42fef6e..535774c1 100644 --- a/client/shaders/test_shader_3/opengl_fragment.glsl +++ b/client/shaders/test_shader_3/opengl_fragment.glsl @@ -8,17 +8,18 @@ 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.a = 1.0 - exp(1.0 - col.a) / exp(1.0); + 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 - float a = col.a; + 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); } -- 2.30.2