fix fog and water

Author: Godlander

assets/minecraft/shaders/core/common/block.fsh

@@ -25,7 +25,7 @@ void main() {
     vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator;
     float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0;
     color = make_emissive(color, lightColor, vertexDistance, alpha);
-    if (color.a < 0.1) {
+    if (color.a < 0.5) {
         discard;
     }
     fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);

assets/minecraft/shaders/core/common/block.vsh

@@ -1,5 +1,6 @@
 #version 150
 
+#moj_import <fog.glsl>
 #moj_import <tools.glsl>
 #moj_import <light.glsl>
 
@@ -41,14 +42,15 @@ vec3 quaternionRotate(vec3 pos, vec4 q) {
 }
 
 void main() {
+    vec3 relpos = Position + ChunkOffset;
     vec3 position = Position / 2 * pi;
     float animation = GameTime * 2048.;
     float anim = GameTime * pi;
     float time = GameTime * 2048;
     float xx = Position.x / 2 * pi;
     float yy = Position.y / 2 * pi;
     float zz = Position.z / 2 * pi;
-    float dropoff = max((position.x*position.x) + (position.z*position.z) - 64., 512.) / 512.;
+    float dropoff = max((relpos.x*relpos.x) + (relpos.z*relpos.z) - 128., 512.) / 512.;
     float far = ProjMat[3][2] * 0.05 / (ProjMat[3][2] + 2.0 * 0.05) / 3.0 * sqrt(3);
 
     vec3 offset = vec3(0.0,0.0,0.0);
@@ -76,6 +78,8 @@ void main() {
     //waving liquid
     else if (alpha == 131) { //water
         time = GameTime * 512;
+        xx = Position.x/16. * 2 * pi;
+        zz = Position.z/16. * 2 * pi;
         if ((mod(Position.y, 1.0) > 0.1) || (mod(Position.y, 1.0) < 0.01)) {
             offset.y = ((sin(time + xx) + cos(time + zz)) * 0.02) - 0.02;
             offset.y += ((sin(time*7 + xx*4.) + cos(time*7 + zz*4.)) * 0.01) - 0.01;
@@ -87,6 +91,8 @@ void main() {
         }
     } else if (alpha == 165) { //lava
         time = GameTime * 128;
+        xx = Position.x/16. * 2 * pi;
+        zz = Position.z/16. * 2 * pi;
         if ((mod(Position.y, 1.0) > 0.1) || (mod(Position.y, 1.0) < 0.01)) {
             offset.y = ((sin(time + xx) + cos(time + zz)) * 0.02) - 0.01;
             offset.y /= dropoff;
@@ -120,7 +126,7 @@ void main() {
         }
     }
 
-    vertexDistance = length((ModelViewMat * vec4(Position + ChunkOffset, 1.0)).xyz);
+    vertexDistance = cylindrical_distance(ModelViewMat, Position + ChunkOffset);
     lightColor = minecraft_sample_lightmap(Sampler2, UV2);
     vertexColor = Color;
     texCoord0 = UV0;

assets/minecraft/shaders/core/common/block_translucent.fsh

@@ -0,0 +1,32 @@
+#version 150
+
+#moj_import <fog.glsl>
+#moj_import <emissive_utils.glsl>
+#moj_import <utils.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec4 lightColor;
+in vec2 texCoord0;
+in vec4 normal;
+in vec4 glpos;
+
+out vec4 fragColor;
+
+void main() {
+    discardControlGLPos(gl_FragCoord.xy, glpos);
+    vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator;
+    float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0;
+    color = make_emissive(color, lightColor, vertexDistance, alpha);
+    if (color.a < 0.01) {
+        discard;
+    }
+    fragColor = linear_fog_translucent(color, vertexDistance, FogStart, FogEnd, FogColor);
+}

assets/minecraft/shaders/core/common/entity.fsh

@@ -30,7 +30,7 @@ void main() {
         float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0;
         color = make_emissive(color, lightColor, vertexDistance, alpha);
     }
-    if (color.a < 0.1) {
+    if (color.a < 0.01) {
         discard;
     }
     fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);

assets/minecraft/shaders/core/common/entity.vsh

@@ -1,5 +1,6 @@
 #version 150
 
+#moj_import <fog.glsl>
 #moj_import <light.glsl>
 #moj_import <matf.glsl>
 
@@ -16,6 +17,7 @@ uniform sampler2D Sampler2;
 uniform float GameTime;
 uniform mat4 ProjMat;
 uniform mat4 ModelViewMat;
+uniform mat3 IViewRotMat;
 
 uniform vec3 Light0_Direction;
 uniform vec3 Light1_Direction;
@@ -42,7 +44,7 @@ void main() {
         vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, normal.xyz, Color);
     }
 
-    vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz);
+    vertexDistance = cylindrical_distance(ModelViewMat, IViewRotMat * Position);
     lightColor = minecraft_sample_lightmap(Sampler2, UV2);
     overlayColor = texelFetch(Sampler1, UV1, 0);
     texCoord0 = UV0;

assets/minecraft/shaders/core/common/entity_colored.fsh

@@ -17,7 +17,7 @@ out vec4 fragColor;
 void main() {
     discardControlGLPos(gl_FragCoord.xy, glpos);
     vec4 color = texture(Sampler0, texCoord0) * vertexColor;
-    if (color.a < 0.1) {
+    if (color.a < 0.01) {
         discard;
     }
     fragColor = color * ColorModulator;

assets/minecraft/shaders/core/common/entity_colored.vsh

@@ -1,5 +1,7 @@
 #version 150
 
+#moj_import <fog.glsl>
+
 in vec3 Position;
 in vec4 Color;
 in vec2 UV0;
@@ -9,6 +11,7 @@ in vec3 Normal;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
+uniform mat3 IViewRotMat;
 
 out float vertexDistance;
 out vec4 vertexColor;
@@ -25,6 +28,6 @@ void main() {
     texCoord1 = UV1;
     texCoord2 = UV2;
     normal = ProjMat * ModelViewMat * vec4(Normal, 0.0);
-    vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz);
+    vertexDistance = cylindrical_distance(ModelViewMat, IViewRotMat * Position);
     glpos = gl_Position;
 }

assets/minecraft/shaders/core/common/entity_glint.fsh

@@ -18,7 +18,7 @@ out vec4 fragColor;
 void main() {
     discardControlGLPos(gl_FragCoord.xy, glpos);
     vec4 color = texture(Sampler0, texCoord0) * ColorModulator;
-    if (color.a < 0.1) {
+    if (color.a < 0.01) {
         discard;
     }
     float fade = linear_fog_fade(vertexDistance, FogStart, FogEnd);

assets/minecraft/shaders/core/common/entity_glint.vsh

@@ -1,10 +1,13 @@
 #version 150
 
+#moj_import <fog.glsl>
+
 in vec3 Position;
 in vec2 UV0;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
+uniform mat3 IViewRotMat;
 uniform mat4 TextureMat;
 
 out float vertexDistance;
@@ -13,7 +16,7 @@ out vec4 glpos;
 
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
-    vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz);
+    vertexDistance = cylindrical_distance(ModelViewMat, IViewRotMat * Position);
     texCoord0 = (TextureMat * vec4(UV0, 0.0, 1.0)).xy;
     glpos = gl_Position;
 }

assets/minecraft/shaders/core/common/entity_lightmap_colored.fsh

@@ -29,7 +29,7 @@ void main() {
         float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0;
         color = make_emissive(color, lightColor, vertexDistance, alpha);
     }
-    if (color.a < 0.1) {
+    if (color.a < 0.01) {
         discard;
     }
     fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);