fix lightmap, blend clouds

Author: Godlander

assets/minecraft/shaders/core/render/clouds.fsh

@@ -24,5 +24,5 @@ void main() {
     color *= vertexColor * ColorModulator * vec4(1,1,1,0.6);
     color.rgb = mix(color.rgb, pow(FogColor.rgb, vec3(2)), 0.5 * (1.0 - yval));
     if (color.a < 0.1) discard;
-    fragColor = linear_fog_translucent(color, fogDistance, FogStart, FogEnd, FogColor);
+    fragColor = linear_fog_translucent(color, fogDistance, clamp(FogStart*0.8, 0, 256-64), clamp(FogEnd*1.5, 16, 512-64), FogColor);
 }

assets/minecraft/shaders/core/render/clouds.vsh

@@ -9,7 +9,6 @@ in vec3 Normal;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform int FogShape;
 
 out vec2 texCoord0;
@@ -23,10 +22,12 @@ float slide(float val , float start, float end) {
 }
 
 void main() {
-    gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
+    vec3 pos = Position - 8;
+
+    gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0);
 
     texCoord0 = UV0;
-    fogDistance = fog_distance(ModelViewMat, Position, FogShape);
+    fogDistance = fog_distance(ModelViewMat, pos, FogShape);
 
     // try the flatten the cloud shading as much as possible
     vec4 col = Color;

assets/minecraft/shaders/core/render/glint_item.vsh

@@ -19,5 +19,5 @@ void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
     fogDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
-    texCoord0 = (TextureMat * vec4(UV0, 0.0, 1.0)).xy;
+    texCoord0 = (TextureMat * vec4(UV0*0.3, 0.0, 1.0)).xy;
 }

assets/minecraft/shaders/core/render/text.fsh

@@ -2,6 +2,7 @@
 #define FSH
 
 #moj_import <utils.glsl>
+#moj_import <light.glsl>
 #moj_import <fog.glsl>
 
 uniform sampler2D Sampler0;
@@ -26,7 +27,8 @@ case ((int(v.r*180./255.)<<16) + (int(v.g*180./255.)<<8) + int(v.b*180./255.)):
 case ((int(v.r*135./255.)<<16) + (int(v.g*135./255.)<<8) + int(v.b*135./255.)): color.rgb = t/255.*135./255.; break;
 
 void main() {
-    if (!is_gui(ProjMat)) discard_control_glpos(gl_FragCoord.xy, glpos);
+    bool gui = is_gui(ProjMat);
+    if (!gui) discard_control_glpos(gl_FragCoord.xy, glpos);
 
     vec4 color = texture(Sampler0, texCoord0);
     ivec3 i = ivec3(color.rgb*255.5);
@@ -49,8 +51,8 @@ void main() {
         MAP(vec3(112.,2.,0.)    ,   vec3(113.,47.,47.))
         MAP(vec3(255.,0.,0.)    ,   vec3(215.,53.,2.))
     }
-
-    color = color * vertexColor * lightColor * ColorModulator;
+    if (!gui) color = emissive(color, lightColor, 0);
+    color = color * vertexColor * ColorModulator;
     if (color.a < 0.1) discard;
     fragColor = linear_fog(color, fogDistance, FogStart, FogEnd, FogColor);
 }

assets/minecraft/shaders/include/light.glsl

@@ -12,17 +12,25 @@ vec4 minecraft_mix_light(vec3 lightDir0, vec3 lightDir1, vec3 normal, vec4 color
     return vec4(color.rgb * lightAccum, color.a);
 }
 
+#define NCOLOR normalize(vec3(0.0, 0.0, 1.0))
+#define DCOLOR normalize(vec3(1.0))
+
+float getSun(sampler2D lightmap) {
+    vec3 sunlight = normalize(texture(lightmap, vec2(0.5 / 16.0, 15.5 / 16.0)).rgb);
+    return clamp(pow(length(sunlight - NCOLOR) / length(DCOLOR - NCOLOR), 4.0), 0.0, 1.0);
+}
+
 vec4 getlight(sampler2D lightmap, ivec2 uv) {
-    float sun = uv.y / 256.;
+    float sun = uv.y / 256. * getSun(lightmap);
     float torch = uv.x / 256.;
     vec4 light = texture(lightmap, clamp(uv / 256.0, vec2(0.5 / 16.0), vec2(15.5 / 16.0)));
 
     vec3 map = texelFetch(lightmap, ivec2(0), 0).rgb;
     //warmer blocklight (torch AND (NOT sun))
-    light *= mix(vec4(1.0), vec4(1.7, 1.0, 0.4, 1.0), torch * (1.0-sun));
+    light *= mix(vec4(1.0), vec4(1.7, 1.0, 0.5, 1.0), torch * (1.0-sun));
     //shadows colors (NOT (torch OR sun))
     if (map.r == map.g && map.g == map.b) { //bluer shadows in overworld
-        light *= mix(vec4(1.0), vec4(0.2, 0.2, 0.9, 1.0), max(1.0 - (torch + sun), 0.0));
+        light *= mix(vec4(1.0), vec4(0.2, 0.2, 0.8, 1.0), max(1.0 - (torch + sun), 0.0));
     } else if (map.r > map.g) { //redder shadows in nether
         light *= mix(vec4(1.0), vec4(0.9, 0.6, 0.5, 1.0), max(1.0 - (torch + sun), 0.0));
     } else { //purple shadows in end
@@ -40,6 +48,7 @@ vec4 emissive(vec4 color, vec4 light, float dist) {
     if (color.a - EMISSIVE_ALPHA < 0.001) {
         return mix(color, cl, lum);
     }
+    //small light around camera
     dist = 1. - clamp(dist-1, 0.0, 5.0)/5.0;
     color.rgb *= (light.rgb + (1-lum) * dist / 20);
     return color;

assets/minecraft/shaders/include/render/block.vsh

@@ -113,7 +113,7 @@ void main() {
                 offset = newPos - relativePos;
             }
             break;
-        case 251: //portal
+        case 150: //portal
             animation = GameTime * 4000.0;
             float m0 = distance(Position.xz, vec2(8.0, 8.0)) * 10.0;
             vec3 absNormal = abs(Normal);

assets/minecraft/shaders/include/render/entity.fsh

@@ -62,6 +62,7 @@ else {
             color = (time < duration.y)? color2 : color;
         }
     }
+    if (!gui) color *= lightColor;
 #endif
 
     if (color.a < 0.01) discard;
@@ -71,7 +72,10 @@ else {
     color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a);
 #endif
 
-    color = emissive(color, lightColor, Distance);
+#ifndef PLAYER
+    if (!gui) color = emissive(color, lightColor, Distance);
+#endif
+
     fragColor = linear_fog(color, fogDistance, FogStart, FogEnd, FogColor);
 }
 }

assets/minecraft/shaders/post/transparency.json

@@ -151,7 +151,7 @@
             ],
             "uniforms": [
                 {"name":"BloomAmount","values": [0.15]},
-                {"name":"AutoExposure","values": [0.5]},
+                {"name":"AutoExposure","values": [0.0]},
                 {"name":"ExposurePoint","values": [1.1]},
                 {"name":"Vibrance","values": [1.0]},
                 {"name":"Curve","values": [1.0]}