v1.1

Author: Jim Pavan

shaders/composite.fsh

@@ -10,11 +10,21 @@ in vec2 texcoord;
 /* RENDERTARGETS: 0 */
 layout(location = 0) out vec4 color;
 
-vec4 getRefractedColor() {
+vec4 computeWaterLighting(vec2 uv) {
+    vec4 colorOut = texture2D(colortex0, uv);
+    float amountLighting = clamp(1.0 - getSunAmount(), 0.0, 1.0);
+
+    if (isEyeInWater == 0) {
+        colorOut *= mix(getWaterLighting(uv), vec4(1.0), amountLighting);
+    }
+
+    return colorOut;
+}
+
+vec4 getRefractedColor(vec4 stencil) {
     // Code from: Water Shader Mod by Necrowizzard
     float in_water;
     vec4 colorOut;
-    vec4 stencil = getStencil(texcoord);
 
     if (stencil.r > 0.05)
         in_water = 1.0;
@@ -26,7 +36,7 @@ vec4 getRefractedColor() {
     float z_scale = 1.0;
 
     float used_timer = frameTimeCounter;
-    float time_scale = 0.275;
+    float time_scale = 0.250;
     float size_scale = 1.6 * 6.3;
 
     if (stencil.r <= 0.15) {
@@ -36,39 +46,39 @@ vec4 getRefractedColor() {
         size_scale *= stencil.r;
     }
 
-    //timer needs to be 'in period'
+    // timer needs to be 'in period'
     if (stencil.r >= 0.5) {
-        x_scale = (1.0 + (sin(2.0 * time_scale * 3.14159 * used_timer - sin(0.5 * size_scale * 3.14159 * stencil.g) + (size_scale * 3.14159 * stencil.g)) / 200.0)); //scales btw 0.995 and 1.005
+        x_scale = (1.0 + (sin(2.0 * time_scale * 3.14159 * used_timer - sin(0.5 * size_scale * 3.14159 * stencil.g) + (size_scale * 3.14159 * stencil.g)) / 150.0)); //scales btw 0.995 and 1.005
     }
     z_scale = (1.0 + (sin(sin(time_scale * 3.14159 * used_timer) + 1.5 * sin(0.8 * size_scale * 3.14159 * stencil.b)) / 200.0));
 
     vec2 disturbed = vec2(x_scale * texcoord.x, z_scale * texcoord.y);
 
     time_scale = 0.45;
 
-    //'refraction'(for all under-water)
+    // 'refraction' (for all under-water)
     if (in_water > 0.05) {
-        float look_up_range = 0.001;
+        float look_up_range = 0.008;
         float limit = 0.001;
-        //costs performance! (masking to avoid outside water look-ups, alternative another scene clipping)
+        // costs performance! (masking to avoid outside water look-ups, alternative another scene clipping)
         if (getStencil(vec2(disturbed.r + look_up_range, disturbed.g + look_up_range)).r > limit &&
             getStencil(vec2(disturbed.r - look_up_range, disturbed.g - look_up_range)).r > limit &&
             getStencil(vec2(disturbed.r, disturbed.g)).r > limit) {
-            colorOut = texture2D(colortex0, disturbed.rg); //drunken effect without stencil if
+            // drunken effect without stencil if
+            colorOut = computeWaterLighting(disturbed);
         } else {
-            colorOut = texture2D(colortex0, texcoord.rg);
+            colorOut = computeWaterLighting(texcoord);
         }
     } else {
-        colorOut = texture2D(colortex0, texcoord.rg);
+        colorOut = computeWaterLighting(texcoord);
     }
 
     return vec4(vec3(colorOut), 1.0);
 }
 
-vec4 getReflectedColor() {
+vec4 getReflectedColor(vec4 stencil) {
     // Code from: Water Shader Mod by Necrowizzard
     float in_water;
-    vec4 stencil = getStencil(texcoord);
 
     if (stencil.r > 0.05)
         in_water = 1.0;
@@ -92,23 +102,25 @@ vec4 getReflectedColor() {
 
     // timer needs to be 'in period'
     if (stencil.r >= 0.5) {
-        x_scale = (1.0 + (sin(2.0 * time_scale * 3.14159 * used_timer - sin(0.5 * size_scale * 3.14159 * stencil.g) + (size_scale * 3.14159 * stencil.g)) / 200.0));
+        x_scale = (1.0 + (sin(2.0 * time_scale * 3.14159 * used_timer - sin(0.5 * size_scale * 3.14159 * stencil.g) + (size_scale * 3.14159 * stencil.g)) / 150.0));
     }
-    z_scale = (1.0 + (sin(sin(time_scale * 3.14159 * used_timer) + 1.5 * sin(0.8 * size_scale * 3.14159 * stencil.b)) / 200.0));
+    z_scale = (1.0 + (sin(sin(time_scale * 3.14159 * used_timer) + 1.5 * sin(0.8 * size_scale * 3.14159 * stencil.b)) / 150.0));
 
     vec2 disturbed = vec2(x_scale * texcoord.x, z_scale * texcoord.y);
+    disturbed = clamp(disturbed, 0.001, 0.99);
     vec4 reflection = getWaterReflectionColor(disturbed);
 
     time_scale = 0.45;
     size_scale = 2.4 * 6.3 * stencil.r;
 
     // timer needs to be 'in period'
     if (stencil.r >= 0.5) {
-        x_scale = (1.0 + (sin(2.0 * time_scale * 3.14159 * used_timer - sin(0.25 * size_scale * 3.14159 * stencil.g) + size_scale * 3.14159 * stencil.g) / 250.0));
+        x_scale = (1.0 + (sin(2.0 * time_scale * 3.14159 * used_timer - sin(0.25 * size_scale * 3.14159 * stencil.g) + size_scale * 3.14159 * stencil.g) / 150.0));
     }
-    z_scale = (1.0 + (sin(sin(time_scale * 3.14159 * used_timer) + 1.5 * sin(size_scale * 3.14159 * stencil.b)) / 250.0));
+    z_scale = (1.0 + (sin(sin(time_scale * 3.14159 * used_timer) + 1.5 * sin(size_scale * 3.14159 * stencil.b)) / 150.0));
 
     vec2 disturbed_2 = vec2(x_scale * texcoord.x, z_scale * texcoord.y);
+    disturbed_2 = clamp(disturbed_2, 0.001, 0.99);
     vec4 reflection_2 = getWaterReflectionColor(disturbed_2);
     reflection = (reflection + reflection_2) / 2.0;
 
@@ -120,10 +132,9 @@ vec4 getReflectedColor() {
     return reflection;
 }
 
-void getSurfaceEffect(inout vec4 reflectionColor, inout vec4 waterRawColor) {
+void getSurfaceEffect(in vec4 stencil, inout vec4 reflectionColor, inout vec4 waterRawColor, in float fadeAmount) {
     // Code from: Superbomb17
     float in_water;
-    vec4 stencil = getStencil(texcoord);
 
     if (stencil.r > 0.05)
         in_water = 1.0;
@@ -135,7 +146,7 @@ void getSurfaceEffect(inout vec4 reflectionColor, inout vec4 waterRawColor) {
     float z_scale = 1.0;
 
     float used_timer = frameTimeCounter;
-    float time_scale = 0.275;
+    float time_scale = 0.250;
     float size_scale = 1.6 * 6.3;
 
     if (stencil.r <= 0.15) {
@@ -147,7 +158,7 @@ void getSurfaceEffect(inout vec4 reflectionColor, inout vec4 waterRawColor) {
 
     // timer needs to be 'in period'
     if (stencil.r >= 0.5) {
-        x_scale = (1.0 + (sin(2.0 * time_scale * 3.14159 * used_timer - sin(0.5 * size_scale * 3.14159 * stencil.g) + (size_scale * 3.14159 * stencil.g)) / 200.0));
+        x_scale = (1.0 + (sin(2.0 * time_scale * 3.14159 * used_timer - sin(0.5 * size_scale * 3.14159 * stencil.g) + (size_scale * 3.14159 * stencil.g)) / 150.0));
     }
     z_scale = (1.0 + (sin(sin(time_scale * 3.14159 * used_timer) + 1.5 * sin(0.8 * size_scale * 3.14159 * stencil.b)) / 200.0));
 
@@ -163,6 +174,8 @@ void getSurfaceEffect(inout vec4 reflectionColor, inout vec4 waterRawColor) {
             if (reflectionColor.r < 0.01)
                 col = vec3(0.0);
 
+            col = col * pow(fadeAmount, 0.2);
+
             float str = (col.x + col.y + col.z) / 3.0;
             str = str * str - 0.325;
 
@@ -175,17 +188,63 @@ void getSurfaceEffect(inout vec4 reflectionColor, inout vec4 waterRawColor) {
     waterRawColor = mix(color, waterRawColor, 0.60);
 }
 
-float getReflectionPower() {
-    return min((getWaterDepth(texcoord) + 0.005) * 20.0, 0.65);
+vec4 computeFinalWaterColor(vec4 stencil, vec4 color, float fadeAmount, bool glass, float glassAlpha, vec4 waterRawColor) {
+    // Water reflection fetch
+    color = (!glass) ? getRefractedColor(stencil) : color;
+    vec4 reflectionColor = (isEyeInWater == 1) ? color : getReflectedColor(stencil) * fadeAmount;
+        
+    float in_water;
+
+    if (stencil.r > 0.05)
+        in_water = 1.0;
+    else
+        in_water = 0.0;
+
+    // combine reflection and scene at water surfaces
+    float reflection_strength = 0.30 * (stencil.r-0.1);
+    float disable_refl = stencil.r-0.1;
+    
+    if (disable_refl <= 0.0) disable_refl = 0.0; // no reflection
+    
+    // times inverted color.r for a stronger reflection in darker water parts!
+    vec3 reflection_color = vec3(1.0, 1.0, 1.0);
+    reflection_color =  reflection_strength * disable_refl * reflectionColor.rgb;
+    
+    // more color in darker water in relation to the reflection
+    // color darkened
+    float difference = (reflection_color.r+reflection_color.g+reflection_color.b)/3.0 - (color.r + color.g + color.b)/5.5;
+    if (difference < 0.0) difference = 0.0;
+    vec3 regular_color = color.rgb * (1.0-in_water*reflection_strength) + (in_water * (difference * getWaterColor().rgb));
+    
+    color = vec4(regular_color, 1.0);
+    reflectionColor = vec4(reflection_color, 1.0);
+
+    // Apply reflection to water
+    reflectionColor = mix(color, reflectionColor, fadeAmount);
+
+    // Superbomb17 effect on water surface
+    #if STYLE == 2
+        if (!glass && isEyeInWater == 0) {
+            getSurfaceEffect(stencil, reflectionColor, waterRawColor, fadeAmount);
+        }
+    #endif
+
+    // Blending reflection factor (how much of reflection color in final fragment)
+    // Make sure transluscent geometry (glass) is correctly blended
+    float reflectionBlendAmount = (glass) ? 0.85 - glassAlpha : 0.40;
+    color = mix(color, reflectionColor, reflectionBlendAmount);
+
+    return color;
 }
 
 void main() {
+    // Fetch data
     color = texture(colortex0, texcoord);
 
-    // Fetch data
     vec4 waterMask = getWaterMask(texcoord);
     vec4 glassMask = getGlassMask(texcoord);
     vec4 iceMask = getIceMask(texcoord);
+    vec4 stencil = getStencil(texcoord);
 
     vec3 waterNormal = getWaterNormal(texcoord);
     vec4 waterRawColor = getWaterRawColor(texcoord);
@@ -205,29 +264,8 @@ void main() {
     }
 
     if ((water || glass) && !ice) {
-        // Water reflection fetch
-        color = getRefractedColor();
-        vec4 reflectionColor = (isEyeInWater == 1) ? color : getReflectedColor();
-
-        // Apply reflection to water
-        reflectionColor = mix(color, reflectionColor, fadeAmount);
-
-        // Amount of reflection allowed: lass reflection in shallow water
-        float reflectionStrength = getReflectionPower();
-
-        // Superbomb17 effect on water surface
-        #if STYLE == 2
-        if (!glass && isEyeInWater == 0)
-            getSurfaceEffect(reflectionColor, waterRawColor);
-        #endif
-
-        // Blend flowing water to still water
-        waterRawColor = mix(waterRawColor, color, 0.70 - reflectionStrength);
-
-        // Blending reflection factor (how much of reflection color in final fragment)
-        // Make sure transluscent geometry (glass) is correctly blended
-        float reflectionBlendAmount = (glass) ? 0.75 - glassAlpha : reflectionStrength;
-        color = mix(color, reflectionColor, reflectionBlendAmount);
+        // Compute reflections, refractions, and wawing water into color
+        color = computeFinalWaterColor(stencil, color, fadeAmount, glass, glassAlpha, waterRawColor);
     }
 
     if (water && isEyeInWater == 0) {
@@ -237,8 +275,6 @@ void main() {
         color = blendWaterInScene(color, waterRawColor, factor, fadeAmount);
     }
 
-    if (isEyeInWater == 1 && dot(vec3(1.0), color.rgb) < 0.01) {
-        // Fix weird bug underwater when looking at horizon (kinda patchy by works so...)
-        color = mix(underwaterFogColorNight, getUnderwaterDaytimeWaterColor(), getSunAmount());
-    }
+    // Debug
+    // color.rgb = texture(colortex11, texcoord).rgb;
 }

shaders/gbuffers_skybasic.fsh

@@ -8,8 +8,9 @@ uniform int renderStage;
 
 in vec4 glcolor;
 
-/* RENDERTARGETS: 0 */
+/* RENDERTARGETS: 0,7 */
 layout(location = 0) out vec4 color;
+layout(location = 1) out vec4 light;
 
 void main() {
 	if (renderStage == MC_RENDER_STAGE_STARS) {
@@ -19,5 +20,5 @@ void main() {
 		color = vec4(calcSkyColor(normalize(pos)), 1.0);
 	}
 
-	color = applyFog(color, 1.0, false);
+	light = vec4(1.0);
 }

shaders/gbuffers_terrain.fsh

@@ -17,9 +17,10 @@ in vec4 position;
 in vec4 glcolor;
 in flat int blockID;
 
-/* RENDERTARGETS: 0,10 */
+/* RENDERTARGETS: 0,10,7 */
 layout(location = 0) out vec4 color;
 layout(location = 1) out vec4 terrainMask;
+layout(location = 2) out vec4 terrainLightMapForWater;
 
 void main() {
 	color = texture(gtexture, texcoord) * glcolor;
@@ -36,6 +37,10 @@ void main() {
 	// Apply fog
 	color = applyFog(color, 1.0, false);
 
+	// Terrain lighting (for darker water in deeper areas)
+	terrainLightMapForWater = clamp(pow(texture(lightmap, lmcoord), vec4(1.0)), 0.0, 1.0);
+	terrainLightMapForWater *= getVanillaLighting(n);
+
 	// Terrain mask
 	terrainMask = vec4(position.xyz, 1.0);
 }

shaders/gbuffers_water.fsh

@@ -40,6 +40,7 @@ void main() {
 		color = applyFog(outColor * glcolor, 1.0, false);
 	} else if (blockID > 10000) {
 		// Glass
+		y = 1.0;
 		isItGlass = 1.0;
 		color = applyFog(outColor * glcolor, 1.0, false);
 	} else {
@@ -49,17 +50,17 @@ void main() {
 		outColor.a = 1.0;
 		waterPosition = position;
 		waterNormal = vec4(encodeNormal(normal), 1.0);
-		waterColoredTexture = applyFog(outColor * getWaterColor(), 1.0, false);
+		waterColoredTexture = applyFog(outColor, 1.0, false);
 		waterColoredTexture = tintWater(waterColoredTexture, position);
+		color = vec4(outColor.rgb, waterBlendFactor) * glcolor;
 	}
 
 	// Water tiling
-	float tiling = 16;
+	float tiling = 10.0;
 	vec3 worldPos = getWorldPositionFromModelPosition(position);
-	tiling += min(cameraPosition.y - worldPos.y, 48);
-	float x = mod(position.x, tiling) / tiling;
-	float z = mod(position.z, tiling) / tiling;
-	
+	float x = mod(worldPos.x, tiling) / tiling;
+	float z = mod(worldPos.z, tiling) / tiling;
+
 	// Output masks
 	iceMask = vec4(isItIce, 0.0, 0.0, isItIce);
 	waterMask = vec4(length(position), stillWaterAmount, isItWater, isItWater);

shaders/gbuffers_water.gsh

@@ -39,14 +39,10 @@ void outVertex(int i, float amount) {
 
 void main() {
     // Used for interpolating between still water and flowing water (for reflection seamless transition)
-    float stillWaterV0 = (isStillWater(gshPosition[0], gshNormal[0])) ? 1.0 : 0.0;
-    float stillWaterV1 = (isStillWater(gshPosition[1], gshNormal[1])) ? 1.0 : 0.0;
-    float stillWaterV2 = (isStillWater(gshPosition[2], gshNormal[2])) ? 1.0 : 0.0;
-
-    // Pass-thru
-    outVertex(0, stillWaterV0);
-    outVertex(1, stillWaterV1);
-    outVertex(2, stillWaterV2);
+    for (int i = 0; i < 3; i++) {
+        float stillWaterV = (isStillWater(gshPosition[i], gshNormal[i])) ? 1.0 : 0.0;
+        outVertex(i, stillWaterV);
+    }
 
     EndPrimitive();
 }

shaders/lang/en_US.lang

@@ -1,16 +1,17 @@
 option.INFO=Water Shader Alpha
-value.INFO.0=v1.0
+value.INFO.0=v1.1
 
 option.STYLE=Water surface style
-value.STYLE.1=Necrowizzard
-value.STYLE.2=Superbomb17
+value.STYLE.1=§bNecrowizzard
+value.STYLE.2=§bSuperbomb17
 
-option.PLANES=Available simultaneous water levels (1: Low, 4 High)
-value.PLANES.1=1
-value.PLANES.2=2
-value.PLANES.3=3
-value.PLANES.4=4
+option.PLANES=Available simultaneous water levels
+value.PLANES.1=§a1 - Low
+value.PLANES.2=§e2 - Medium
+value.PLANES.3=§c3 - High
+value.PLANES.4=§4 4 - Extreme
+option.PLANES.comment=Number of water patches at different heights handled for reflections.
 
-option.SKYTEXTURED=Sun & moon reflection (Experimental)
-value.SKYTEXTURED.1=ON
-value.SKYTEXTURED.2=OFF
+option.SKYTEXTURED=Sun & moon reflection (§cExperimental)
+value.SKYTEXTURED.1=§aON
+value.SKYTEXTURED.2=§cOFF