Fixed bugs & cleaned code

Author: Jim Pavan

shaders/composite.fsh

@@ -107,7 +107,7 @@ vec4 getReflectedColor(vec4 stencil) {
     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);
+    disturbed = clamp(disturbed, 0.001, 0.999);
     vec4 reflection = getWaterReflectionColor(disturbed);
 
     time_scale = 0.45;
@@ -120,7 +120,7 @@ vec4 getReflectedColor(vec4 stencil) {
     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);
+    disturbed_2 = clamp(disturbed_2, 0.001, 0.999);
     vec4 reflection_2 = getWaterReflectionColor(disturbed_2);
     reflection = (reflection + reflection_2) / 2.0;
 
@@ -163,6 +163,7 @@ void getSurfaceEffect(in vec4 stencil, inout vec4 reflectionColor, inout vec4 wa
     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);
+    disturbed = clamp(disturbed, 0.001, 0.999);
 
     float surface_effects = 1.0;
     if (surface_effects > 0.0) {

shaders/composite_a.csh

@@ -3,7 +3,6 @@
 layout(local_size_x = 32, local_size_y = 32, local_size_z = 1) in;
 
 #include "/lib/common.glsl"
-#include "/lib/water.glsl"
 
 void setValue(int index, int elem, inout int[PLANES] array) {
     array[index] = elem;

shaders/gbuffers_clouds.fsh

@@ -13,7 +13,7 @@ in vec2 texcoord;
 in vec4 glcolor;
 in vec4 position;
 
-/* RENDERTARGETS: 0,12 */
+/* RENDERTARGETS: 0,4 */
 layout(location = 0) out vec4 color;
 layout(location = 1) out vec4 cloudsMask;
 

shaders/gbuffers_water.fsh

@@ -13,6 +13,7 @@ in vec2 lmcoord;
 in vec2 texcoord;
 in vec4 glcolor;
 in vec4 position;
+in vec3 worldPos;
 in vec3 normal;
 in float stillWaterAmount;
 
@@ -57,7 +58,6 @@ void main() {
 
 	// Water tiling
 	float tiling = 10.0;
-	vec3 worldPos = getWorldPositionFromModelPosition(position);
 	float x = mod(worldPos.x, tiling) / tiling;
 	float z = mod(worldPos.z, tiling) / tiling;
 

shaders/gbuffers_water.gsh

@@ -12,13 +12,15 @@ in vec2 gshTexcoord[];
 in vec4 gshGlcolor[];
 in vec4 gshPosition[];
 in vec3 gshPosition2[];
+in vec3 gshWorldPos[];
 in vec3 gshNormal[];
 
 out flat int blockID;
 out vec2 lmcoord;
 out vec2 texcoord;
 out vec4 glcolor;
 out vec4 position;
+out vec3 worldPos;
 out vec3 normal;
 out float stillWaterAmount;
 
@@ -29,6 +31,7 @@ void outVertex(int i, float amount) {
 	lmcoord = gshLmcoord[i];
 	glcolor = gshGlcolor[i];
 	position = gshPosition[i];
+    worldPos = gshWorldPos[i];
 	normal = gshNormal[i];
 	blockID = gshBlockID[i];
     stillWaterAmount = amount;

shaders/gbuffers_water.vsh

@@ -10,6 +10,7 @@ out vec2 gshTexcoord;
 out vec4 gshGlcolor;
 out vec4 gshPosition;
 out vec3 gshPosition2;
+out vec3 gshWorldPos;
 out vec3 gshNormal;
 
 void main() {
@@ -23,4 +24,5 @@ void main() {
 	gshPosition = gl_Vertex;
 	gshNormal = gl_Normal;
 	gshBlockID = int(mc_Entity.x);
+	gshWorldPos = getWorldPositionFromModelPosition(gl_Vertex);
 }

shaders/lang/en_US.lang

@@ -1,17 +1,17 @@
 option.INFO=Water Shader Alpha
-value.INFO.0=v1.2
+value.INFO.0=v1.3
 
 option.STYLE=Water surface style
 value.STYLE.1=§bNecrowizzard
 value.STYLE.2=§bSuperbomb17
 
 option.PLANES=Available simultaneous water levels
-value.PLANES.1=§a1 - Low
-value.PLANES.2=§e2 - Medium
-value.PLANES.3=§c3 - High
+value.PLANES.1=§a 1 - Low
+value.PLANES.2=§e 2 - Medium
+value.PLANES.3=§c 3 - 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 (§cExperimental)
-value.SKYTEXTURED.1=§aON
-value.SKYTEXTURED.2=§cOFF
+value.SKYTEXTURED.0=§cOFF
+value.SKYTEXTURED.1=§aON

shaders/lib/common.glsl

@@ -72,25 +72,24 @@ const float shadowIntervalSize = 0.0f;
 
 // Texture targets clear settings
 const bool colortex8Clear = false;
-const vec4 shadowcolor0ClearColor = vec4(0.0, 0.0, 0.0, 5.0);
+const vec4 shadowcolor0ClearColor = vec4(0.0, 0.0, 0.0, 1.0);
 
 // Texture formats
 /*
-const int shadowcolor0Format = RGBA16F; // Reflection color
+const int shadowcolor0Format = RGBA;    // 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 colortex2Format = RGBA;       // Scene normals (encoded and in world space)
 const int colortex3Format = RGBA16F;    // Water mask
-const int colortex4Format = RGBA;       // -
+const int colortex4Format = RGBA16F;    // Cloud mask
 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 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
+const int colortex11Format = RGBA;      // Water tiling 
 */
 
 // Constant variables for water shader
@@ -100,11 +99,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 waterBlendFactor = 0.30;                                                            // How much to blend flowing water to scene
 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.30;                                                            // How much to blend flowing water to scene
 
 // Fog constants
 const int GL_LINEAR = 9729;
@@ -114,10 +113,10 @@ const int GL_EXP2 = 2049;
 // Custom uniforms
 uniform vec2 iresolution;
 
-#define INFO 0                  // [0]
+#define INFO 0                  // Shader version [0]
 #define STYLE 1                 // Water surface style [1 2]
 #define PLANES 1                // Reflection planes allowed [1 2 3 4]
-#define SKYTEXTURED 2           // Sun & moon reflection [1 2]
+#define SKYTEXTURED 0           // Sun & moon reflection [0 1]
 
 // Shader Storage Buffer Object for water information in player view
 layout(std430, binding = 0) buffer SSBOWaterShader {
@@ -152,6 +151,7 @@ vec4 getUnderwaterDaytimeWaterColor() {
     #endif
 }
 
+// ---------------- Encoding ----------------
 vec3 encodeNormal(vec3 normal) {
     return (normal + 1.0) / 2.0;
 }
@@ -160,6 +160,23 @@ vec3 decodeNormal(vec3 normal) {
     return (normal * 2.0) - 1.0;
 }
 
+int YToArray(int Y) {
+    return Y + 64;
+}
+
+int ArrayToY(int index) {
+    return index - 64;
+}
+
+// ---------------- World ----------------
+vec3 getWorldPositionFromModelPosition(vec4 modelPos) {
+    dvec3 viewPos = (gbufferModelView * modelPos).xyz;
+    dvec3 eyePlayerPos = mat3(gbufferModelViewInverse) * viewPos;
+    dvec3 worldPos = eyePlayerPos + cameraPosition + gbufferModelViewInverse[3].xyz;
+
+    return vec3(worldPos);
+}
+
 vec2 reproject(vec2 uv, float depth) {
     /* Find uv coordinate of the pixel in previous frame */
     vec4 frag = gbufferProjectionInverse * vec4(vec3(uv, depth) * 2.0 - 1.0, 1.0);
@@ -173,13 +190,8 @@ vec2 reproject(vec2 uv, float depth) {
     return prevPos.xy / prevPos.w * 0.5 + 0.5;
 }
 
+// ---------------- Textures ----------------
 bool isWithinTexture(vec2 uv) {
     // Is uv within texture bounds
     return uv.x >= 0.0 && uv.x <= 1.0 && uv.y >= 0.0 && uv.y <= 1.0;
 }
-
-float linearizeDepth(float depth) {
-    // Implemetation from: LearnOpenGL
-    float z = depth * 2.0 - 1.0; // back to NDC 
-    return ((2.0 * near * far) / (far + near - z * (far - near))) / far;	
-}

shaders/lib/sky.glsl

@@ -232,7 +232,7 @@ vec4 skyTexturedReflection(vec3 ro, vec3 rd, vec4 color) {
 }
 
 vec4 getCloudMask(vec2 uv) {
-	return texture(colortex12, uv);
+	return texture(colortex4, uv);
 }
 
 bool isCloud(vec4 mask) {

shaders/lib/water.glsl

@@ -1,12 +1,4 @@
 // ---------------- Encoding ----------------
-int YToArray(int Y) {
-    return Y + 64;
-}
-
-int ArrayToY(int index) {
-    return index - 64;
-}
-
 int getIndex(ivec2 pixelCoord) {
     // Convert 2D pixel coordinate to 1D array index
     return int(pixelCoord.y * viewWidth + pixelCoord.x);
@@ -53,27 +45,7 @@ mat4 invertPitch(mat4 viewMatrix) {
     return invertedView;
 }
 
-vec3 getWorldPositionFromModelPosition(vec4 modelPos) {
-    dvec3 viewPos = (gbufferModelView * modelPos).xyz;
-    dvec3 eyePlayerPos = mat3(gbufferModelViewInverse) * viewPos;
-    dvec3 worldPos = eyePlayerPos + cameraPosition + gbufferModelViewInverse[3].xyz;
-
-    return vec3(worldPos);
-}
-
 // ---------------- Water Utils ----------------
-float getDepth(vec2 uv) {
-    return texture(depthtex0, uv).r;
-}
-
-float getDepthNoTransluscent(vec2 uv) {
-    return texture(depthtex1, uv).r;
-}
-
-float getWaterDepth(vec2 uv) {
-    return linearizeDepth(getDepthNoTransluscent(uv)) - linearizeDepth(getDepth(uv));
-}
-
 vec4 getWaterMask(vec2 uv) {
     return texelFetch(colortex3, ivec2(uv * iresolution), 0);
 }
@@ -98,10 +70,6 @@ bool isWater(vec4 mask) {
     return mask.b > 0.99;
 }
 
-bool isFlowing(vec2 uv) {
-    return texture(colortex11, uv).b > 0.0;
-}
-
 bool isIce(vec4 mask) {
     return mask.r > 0.99;
 }
@@ -149,15 +117,12 @@ float getIceDistance(vec4 mask) {
 
 bool isStillWater(vec4 pos, vec3 normal) {
     /* Still water has its normal pointing straight up
-    Still water is always located at the same position in world space
-    This code actually captures a bit more than just still water
-    (ie all water fragments close to still water in normal and height) */
+    Still water is always located at the same position in world space. */
 
     vec3 worldPos = getWorldPositionFromModelPosition(pos);
     float ratioPointingUp = dot(normal, vec3(0.0, 1.0, 0.0));
     float YPos = fract(worldPos.y);
 
-    // return ratioPointingUp >= 0.988 && YPos >= 0.885;
     return YPos >= 0.885 && YPos < 0.90 && ratioPointingUp >= 0.988;
 }
 
@@ -171,14 +136,6 @@ int getWaterID(vec4 modelPos) {
     return (id < 0) ? id - 1 : id;
 }
 
-float getFresnelFactor(vec3 viewDir, vec3 waterNormal) {
-    // Fresnel: amount of reflection / refraction
-    float fresnel = dot(-viewDir, waterNormal);
-    fresnel = clamp(fresnel, 0.0, 1.0);
-
-    return fresnel;
-}
-
 vec4 getWaterLighting(vec2 uv) {
     return texture(colortex7, uv);
 }