diff options
author | kwolekr <kwolekr@minetest.net> | 2013-04-27 23:04:52 -0400 |
---|---|---|
committer | kwolekr <kwolekr@minetest.net> | 2013-04-27 23:04:52 -0400 |
commit | d7395cd2aba86f5b15cdce3be2ec141f88f95ab6 (patch) | |
tree | 6a53702ba2fba74901333f5ea563806a00ebb2fa /client/shaders/test_shader_3 | |
parent | 8767c781699a43e27185181979340f9712b3c236 (diff) | |
download | minetest-d7395cd2aba86f5b15cdce3be2ec141f88f95ab6.tar.gz minetest-d7395cd2aba86f5b15cdce3be2ec141f88f95ab6.tar.bz2 minetest-d7395cd2aba86f5b15cdce3be2ec141f88f95ab6.zip |
Actually fix shader3 alpha this time
Diffstat (limited to 'client/shaders/test_shader_3')
-rw-r--r-- | client/shaders/test_shader_3/opengl_fragment.glsl | 13 |
1 files 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 e42fef6e5..535774c11 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);
}
|