Fixed many bugs

Author: Jim Pavan

shaders/composite.fsh

@@ -181,7 +181,7 @@ void getSurfaceEffect(in vec4 stencil, inout vec4 reflectionColor, inout vec4 wa
 
             reflectionColor.rgb += clamp((str * col), 0.0, 3.0);
         }
-        reflectionColor /= 6;
+        reflectionColor /= 6.0;
     }
 
     color = vec4(color.rgb, 1.0) + vec4(reflectionColor.rgb, 1.0);
@@ -201,8 +201,8 @@ vec4 computeFinalWaterColor(vec4 stencil, vec4 color, float fadeAmount, bool gla
         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;
+    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
 
@@ -212,9 +212,9 @@ vec4 computeFinalWaterColor(vec4 stencil, vec4 color, float fadeAmount, bool gla
 
     // 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;
+    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));
+    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);
@@ -224,9 +224,8 @@ vec4 computeFinalWaterColor(vec4 stencil, vec4 color, float fadeAmount, bool gla
 
     // Superbomb17 effect on water surface
     #if STYLE == 2
-        if (!glass && isEyeInWater == 0) {
+        if (!glass && isEyeInWater == 0)
             getSurfaceEffect(stencil, reflectionColor, waterRawColor, fadeAmount);
-        }
     #endif
 
     // Blending reflection factor (how much of reflection color in final fragment)
@@ -243,38 +242,44 @@ void main() {
 
     vec4 waterMask = getWaterMask(texcoord);
     vec4 glassMask = getGlassMask(texcoord);
+    vec4 cloudMask = getCloudMask(texcoord);
     vec4 iceMask = getIceMask(texcoord);
     vec4 stencil = getStencil(texcoord);
 
+    vec4 waterModelPos = getWaterModelPos(texcoord);
     vec3 waterNormal = getWaterNormal(texcoord);
     vec4 waterRawColor = getWaterRawColor(texcoord);
 
     bool water = isWater(waterMask);
     bool glass = isGlass(glassMask);
     bool ice = isIce(iceMask);
+    bool cloud = isCloud(cloudMask);
 
     float glassAlpha = getGlassTransparency(glassMask);
     float fadeAmount = getTransitionAmount(waterMask);
     float waterLength = getWaterDistance(waterMask);
     float glassLength = getGlassDistance(glassMask);
+    float cloudLength = getCloudLength(cloudMask);
 
-    if (isLookingAtStillWaterThroughTransluscent(glass, ice, water, waterLength, glassLength, waterNormal)) {
-        // Mare sure you can see water reflection through glass and ice when placed in water on solid block
-        fadeAmount = 1.0;
-    }
+    if (!cloud && cloudLength < waterLength) {
+        // Make sure clouds hide water like the rest of terrain, if no clouds in front then do water stuff
 
-    if ((water || glass) && !ice) {
-        // Compute reflections, refractions, and wawing water into color
-        color = computeFinalWaterColor(stencil, color, fadeAmount, glass, glassAlpha, waterRawColor);
-    }
+        if (isLookingAtStillWaterThroughTransluscent(glass, ice, water, waterLength, glassLength, waterNormal)) {
+            // Mare sure you can see water reflection through glass and ice when placed in water on solid block
+            fadeAmount = 1.0;
+        }
 
-    if (water && isEyeInWater == 0) {
-        // Blend flowing water to scene when outside water
-        float divisor = (glassLength < waterLength) ? 2.0 : 8.0;
-        float factor = max(0.0, waterBlendFactor - glassAlpha / divisor);
-        color = blendWaterInScene(color, waterRawColor, factor, fadeAmount);
-    }
+        if ((water || glass) && !ice) {
+            // Compute reflections, refractions, and wawing water into color
+            color = computeFinalWaterColor(stencil, color, fadeAmount, glass, glassAlpha, waterRawColor);
+        }
 
-    // Debug
-    // color.rgb = texture(colortex11, texcoord).rgb;
+        if (water && isEyeInWater == 0) {
+            // Blend flowing water to scene when outside water
+            float divisor = (glassLength < waterLength) ? 2.0 : 8.0;
+            float factor = max(0.0, waterBlendFactor - glassAlpha / divisor);
+            color = blendWaterInScene(color, waterRawColor, factor, fadeAmount);
+            color = applyFogOnWater(color, waterModelPos);
+        }
+    }
 }

shaders/final.fsh

@@ -1,7 +1,6 @@
 #version 430 compatibility
 
 #include "/lib/common.glsl"
-#include "/lib/water.glsl"
 
 in vec2 texcoord;
 
@@ -11,7 +10,7 @@ layout(location = 0) out vec4 color;
 void main() {
 	color = texture(colortex0, texcoord);
 
-    // Zero out all layer counters
+    // Zero out all layer occurence counters
     for (int i = 0; i < 384; i++) {
         layersData.layers[i] = 0;
     }

shaders/gbuffers_clouds.fsh

@@ -11,9 +11,11 @@ uniform float alphaTestRef = 0.1;
 
 in vec2 texcoord;
 in vec4 glcolor;
+in vec4 position;
 
-/* RENDERTARGETS: 0 */
+/* RENDERTARGETS: 0,12 */
 layout(location = 0) out vec4 color;
+layout(location = 1) out vec4 cloudsMask;
 
 void main() {
 	color = texture(gtexture, texcoord) * glcolor;
@@ -23,4 +25,7 @@ void main() {
 
 	// Apply fog
 	color = applyFog(color, 0.075, true);
+
+	// Mask clouds
+	cloudsMask = vec4(1.0, length(position), 0.0, 1.0);
 }

shaders/gbuffers_clouds.vsh

@@ -5,6 +5,7 @@
 
 out vec2 texcoord;
 out vec4 glcolor;
+out vec4 position;
 
 void main() {
     vec3 pos = (gl_ModelViewMatrix * gl_Vertex).xyz;
@@ -13,4 +14,5 @@ void main() {
     gl_FogFragCoord = length(pos);
 	texcoord = (gl_TextureMatrix[0] * gl_MultiTexCoord0).xy;
 	glcolor = gl_Color;
+    position = gl_Vertex;
 }

shaders/gbuffers_skytextured.fsh

@@ -13,7 +13,7 @@ in vec4 glcolor;
 
 /* RENDERTARGETS: 0,8 */
 layout(location = 0) out vec4 color;
-layout(location = 1) out vec4 sunColor;
+layout(location = 1) out vec4 sunAndMoonColor;
 
 void removeHalo(vec4 texturedColor) {
 	if (dot(texturedColor, vec4(1.0)) < 2.0) {
@@ -32,9 +32,9 @@ void main() {
 		removeHalo(texturedColor);
 
 		if (renderStage == MC_RENDER_STAGE_SUN || renderStage == MC_RENDER_STAGE_MOON) {
-			// Sun && moon fragments
+			// Sun & moon fragments
 			if (frameCounter == 1)
-				sunColor = texturedColor;
+				sunAndMoonColor = texturedColor;
 			else
 				discard;
 		}

shaders/gbuffers_skytextured.gsh

@@ -65,7 +65,8 @@ void passThru() {
 
 void main() {
 	#if SKYTEXTURED == 1
-    	outForOffline();
+		if (frameCounter == 1)
+    		outForOffline();
 	#endif
 
 	passThru();

shaders/gbuffers_terrain.fsh

@@ -26,7 +26,7 @@ void main() {
 	color = texture(gtexture, texcoord) * glcolor;
 	color *= texture(lightmap, lmcoord);
 	if (color.a < alphaTestRef && blockID != 5) {
-		// Remove / fill holes in tree leaves
+		// Fill holes in tree leaves to match reflections
 		discard;
 	}
 

shaders/gbuffers_water.fsh

@@ -38,6 +38,7 @@ void main() {
 		// Ice
 		isItIce = 1.0;
 		color = applyFog(outColor * glcolor, 1.0, false);
+		color.a = min(color.a + 0.125, 1.0);
 	} else if (blockID > 10000) {
 		// Glass
 		y = 1.0;
@@ -50,8 +51,7 @@ void main() {
 		outColor.a = 1.0;
 		waterPosition = position;
 		waterNormal = vec4(encodeNormal(normal), 1.0);
-		waterColoredTexture = applyFog(outColor, 1.0, false);
-		waterColoredTexture = tintWater(waterColoredTexture, position);
+		waterColoredTexture = tintWater(outColor * mix(glcolor, getWaterColor(), 0.50), position);
 		color = vec4(outColor.rgb, waterBlendFactor) * glcolor;
 	}
 

shaders/lib/common.glsl

@@ -25,9 +25,9 @@ uniform sampler2D colortex14;
 uniform sampler2D colortex15;
 
 // Uniform variables
+uniform int fogMode;
 uniform vec3 fogColor;
 uniform vec3 skyColor;
-uniform int fogMode;
 uniform int isEyeInWater;
 uniform float eyeAltitude;
 uniform ivec2 eyeBrightness;
@@ -71,26 +71,26 @@ const int shadowMapResolution = 2048;
 const float shadowIntervalSize = 0.0f;
 
 // Texture targets clear settings
-const bool colortex4Clear = false;
 const bool colortex8Clear = false;
 const vec4 shadowcolor0ClearColor = vec4(0.0, 0.0, 0.0, 5.0);
 
 // Texture formats
 /*
-const int shadowcolor0Format = RGBA16F; // reflection color
-const int shadowcolor1Format = RGBA;    // reflection mask (is water in reflection)
-const int colortex0Format = RGBA;       // scene color
-const int colortex1Format = RGBA32F;    // position of water blocks in model space
-const int colortex2Format = RGBA;       // scene normal (encoded and in world space)
+const int shadowcolor0Format = RGBA16F; // Reflection color
+const int shadowcolor1Format = RGBA;    // Reflection mask (is water in reflection)
+const int colortex0Format = RGBA;       // Scene color
+const int colortex1Format = RGBA32F;    // Position of water blocks in model space
+const int colortex2Format = RGBA;       // Scene normal (encoded and in world space)
 const int colortex3Format = RGBA16F;    // Water mask
-const int colortex4Format = RGBA16F;    // ID of water blocks, water mask for next frame for shadow pass (unexpanded)
+const int colortex4Format = RGBA;       // -
 const int colortex5Format = RGBA;       // Ice mask
 const int colortex6Format = RGBA16F;    // Glass mask
 const int colortex7Format = RGBA;       // Lightmap color
-const int colortex8Format = RGBA;       // Sun and moon texture
+const int colortex8Format = RGBA;       // Sun and moon textures
 const int colortex9Format = RGBA;       // Water color
 const int colortex10Format = RGBA;      // Terrain mask
 const int colortex11Format = RGBA;      // Water tiling
+const int colortex12Format = RGBA16F;   // Cloud mask
 */
 
 // Constant variables for water shader
@@ -100,11 +100,11 @@ const vec4 necrowizzardUnderwaterFogColorDay = vec4(0.03, 0.05, 0.12, 0.99);
 const vec4 superbomb17UnderwaterFogColorDay = vec4(0.03, 0.05, 0.12, 0.99);     // Superbomb17 fog color when underwater (daytime)
 const vec4 underwaterFogColorNight = vec4(0.02, 0.13, 0.24, 0.9);               // Fog color when underwater (nighttime)
 const float waterSurfaceTransparency = 0.35;                                                    // Water surface/texture transparency
-const float waterClipPlane = 1.0;                                                               // Delete vertices too close from water surface (strange results with player reflection otherwise)
+const float waterClipPlane = 1.0;                                                               // Delete vertices too close from water surface
 const float eyeCameraOffset = 1.68;                                                             // Eye camera offset from player's feet
 const float waterBlockOffset = 1.005;                                                           // Water block clipping plane height (inside block)
 const int lowerWorldBound = -64;                                                                // Lowest possible water reflection plane height (Minecraft minimum block height)
-const float waterBlendFactor = 0.20;                                                            // How much to blend flowing water to scene
+const float waterBlendFactor = 0.30;                                                            // How much to blend flowing water to scene
 
 // Fog constants
 const int GL_LINEAR = 9729;
@@ -119,11 +119,11 @@ uniform vec2 iresolution;
 #define PLANES 1                // Reflection planes allowed [1 2 3 4]
 #define SKYTEXTURED 2           // Sun & moon reflection [1 2]
 
-// Shader Storage Buffer Object for water information in the visible scene (player view)
+// Shader Storage Buffer Object for water information in player view
 layout(std430, binding = 0) buffer SSBOWaterShader {
     int layers[384];            // -64 to 320 every possible water layer, store water fragment occurence for each height
-    int waterHeights[PLANES];   // Registered heights for reflection calculation in next frame
-    int lowestHeight;           // Height counter
+    int waterHeights[PLANES];   // Registered heights for reflection calculation
+    int lowestHeight;           // Lowest registered height (optimization in later stage)
 } layersData;
 
 // Shader Storage Buffer Object for specifying "water height mask" on all water fragments

shaders/lib/shading.glsl

@@ -72,6 +72,16 @@ vec4 applyFog(vec4 color, float factor, bool applyAlpha) {
     return color;
 }
 
+vec4 applyFogOnWater(vec4 color, vec4 waterModelPos) {
+    // Fogify water
+    vec3 worldPos = getWorldPositionFromModelPosition(waterModelPos);
+    float l = length(worldPos - cameraPosition);
+    float d = clamp((l - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+    color = mix(color, gl_Fog.color, d);
+
+    return color;
+}
+
 vec4 getSkyColor(vec4 waterModelPos) {
     // Get sky color on water fragment relative to player view direction
     vec3 skyDir = vec3(0.0, 1.0, 0.0);
@@ -82,16 +92,6 @@ vec4 getSkyColor(vec4 waterModelPos) {
     return vec4(calcSkyColor(skyDir), 1.0);
 }
 
-vec4 tintWater(vec4 waterCol, vec4 waterModelPosition) {
-    // Tint water based on sky color and cave ambient color
-    float amountMinWaterColor = mix(0.0, 0.70, getMidDayFastFrac01());
-    float amountInDarkness = mix(amountMinWaterColor, 1.0, getAmountInDarkness());
-    vec4 skyColor = getSkyColor(waterModelPosition);
-    vec4 waterEnvironmentColor = mix(skyColor, waterCol, amountInDarkness);
-
-    return waterEnvironmentColor;
-}
-
 vec4 addSkyTexturedToWater(vec4 waterCol, vec3 waterNormal, vec4 waterModelPosition) {
     vec4 outColor = waterCol;
 
@@ -107,3 +107,13 @@ vec4 addSkyTexturedToWater(vec4 waterCol, vec3 waterNormal, vec4 waterModelPosit
 
     return outColor;
 }
+
+vec4 tintWater(vec4 waterCol, vec4 waterModelPosition) {
+    // Tint water based on sky color and cave ambient color
+    float amountMinWaterColor = mix(0.0, 0.70, getMidDayFastFrac01());
+    float amountInDarkness = mix(amountMinWaterColor, 0.85, getAmountInDarkness());
+    vec4 skyColor = getSkyColor(waterModelPosition);
+    vec4 waterEnvironmentColor = mix(skyColor, waterCol, amountInDarkness);
+
+    return waterEnvironmentColor;
+}