From 5a419d827e3a1e3b6ae814d1b056b7607d24fce7 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Sun, 25 Oct 2020 15:10:16 +0100
Subject: [PATCH] Platform: Add fog4 pass into default model/BSP rendering
 code. Also some water stuff.

---
 .../base_glsl.pk3dir/glsl/defaultskin.glsl    |  3 +-
 .../base_glsl.pk3dir/glsl/defaultwall.glsl    |  4 +-
 .../base_glsl.pk3dir/glsl/defaultwarp.glsl    | 87 +++++++++++++------
 3 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/platform/base_glsl.pk3dir/glsl/defaultskin.glsl b/platform/base_glsl.pk3dir/glsl/defaultskin.glsl
index 7c07e17d..cdd3ee57 100644
--- a/platform/base_glsl.pk3dir/glsl/defaultskin.glsl
+++ b/platform/base_glsl.pk3dir/glsl/defaultskin.glsl
@@ -15,6 +15,7 @@
 !!samps =FAKESHADOWS shadowmap
 
 #include "sys/defs.h"
+#include "sys/fog.h"
 
 #if gl_affinemodels == 1
 	#define affine noperspective
@@ -186,6 +187,6 @@ varying vec3 light;
 	#ifdef FAKESHADOWS
 		diffuse_f.rgb *= ShadowmapFilter(s_shadowmap, vtexprojcoord);
 	#endif
-		gl_FragColor = diffuse_f;
+		gl_FragColor = fog4(diffuse_f);
 	}
 #endif
diff --git a/platform/base_glsl.pk3dir/glsl/defaultwall.glsl b/platform/base_glsl.pk3dir/glsl/defaultwall.glsl
index 3093ba24..ee75a06a 100644
--- a/platform/base_glsl.pk3dir/glsl/defaultwall.glsl
+++ b/platform/base_glsl.pk3dir/glsl/defaultwall.glsl
@@ -1,5 +1,6 @@
 !!ver 130
 !!permu LIGHTSTYLED
+!!permu FOG
 !!samps diffuse reflectcube normalmap
 
 !!permu FAKESHADOWS
@@ -13,6 +14,7 @@
 !!cvardf gl_stipplealpha=0
 
 #include "sys/defs.h"
+#include "sys/fog.h"
 
 varying vec2 tex_c;
 
@@ -180,7 +182,7 @@ varying mat3 invsurface;
 		diffuse_f.rgb *= ShadowmapFilter(s_shadowmap, vtexprojcoord);
 	#endif
 
-		gl_FragColor = diffuse_f;
+		gl_FragColor = fog4(diffuse_f);
 		
 	}
 #endif
diff --git a/platform/base_glsl.pk3dir/glsl/defaultwarp.glsl b/platform/base_glsl.pk3dir/glsl/defaultwarp.glsl
index 5b6b4444..46d43eaa 100644
--- a/platform/base_glsl.pk3dir/glsl/defaultwarp.glsl
+++ b/platform/base_glsl.pk3dir/glsl/defaultwarp.glsl
@@ -1,51 +1,84 @@
 !!ver 100 450
 !!permu FOG
-!!cvarf r_wateralpha
 !!samps diffuse lightmap
 !!cvardf gl_mono=0
+!!cvardf gl_stipplealpha=0
 
 #include "sys/defs.h"
-
 #include "sys/fog.h"
+
 varying vec2 tc;
+
 #ifdef LIT
 varying vec2 lm0;
 #endif
+
 #ifdef VERTEX_SHADER
-void main ()
-{
-	tc = v_texcoord.st;
+	void main ()
+	{
+		tc = v_texcoord.st;
 	#ifdef FLOW
-	tc.s += e_time * -0.5;
+		tc.s += e_time * -0.5;
 	#endif
 	#ifdef LIT
-	lm0 = v_lmcoord;
+		lm0 = v_lmcoord;
 	#endif
-	gl_Position = ftetransform();
-}
+		gl_Position = ftetransform();
+	}
 #endif
+
 #ifdef FRAGMENT_SHADER
 #ifndef ALPHA
-uniform float cvar_r_wateralpha;
-#define USEALPHA cvar_r_wateralpha
+	#define USEALPHA 1.0
 #else
-#define USEALPHA float(ALPHA)
-#endif
-void main ()
-{
-	vec2 ntc;
-	ntc.s = tc.s + sin(tc.t+e_time)*0.125;
-	ntc.t = tc.t + sin(tc.s+e_time)*0.125;
-	vec3 ts = vec3(texture2D(s_diffuse, ntc));
-
-#ifdef LIT
-	ts *= (texture2D(s_lightmap, lm0) * e_lmscale).rgb;
+	#define USEALPHA float(ALPHA)
 #endif
 
-	if (gl_mono == 1.0) {
-		float bw = (ts.r + ts.g + ts.b) / 3.0;
-		ts.rgb = vec3(bw, bw, bw);
+	void main ()
+	{
+		vec2 ntc;
+		ntc.s = tc.s + sin(tc.t+e_time)*0.125;
+		ntc.t = tc.t + sin(tc.s+e_time)*0.125;
+		vec4 diffuse_f = texture2D(s_diffuse, ntc);
+
+		diffuse_f *= e_colourident;
+
+		// awful stipple alpha code
+		if (gl_stipplealpha == 1.0) {
+			float alpha = USEALPHA * e_colourident.a;
+			int x = int(mod(gl_FragCoord.x, 2.0));
+			int y = int(mod(gl_FragCoord.y, 2.0));
+
+			if (alpha <= 0.0) {
+					discard;
+			} else if (alpha <= 0.25) {
+				diffuse_f.a = 1.0f;
+				if (x + y == 2)
+					discard;
+				if (x + y == 1)
+					discard;
+			} else if (alpha <= 0.5) {
+				diffuse_f.a = 1.0f;
+				if (x + y == 2)
+					discard;
+				if (x + y == 0)
+					discard;
+			} else if (alpha < 1.0) {
+				diffuse_f.a = 1.0f;
+				if (x + y == 2)
+					discard;
+			}
+		} else {
+	#ifdef LIT
+		diffuse_f.rgb *= (texture2D(s_lightmap, lm0) * e_lmscale).rgb;
+	#endif
+		}
+
+		if (gl_mono == 1.0) {
+			float bw = (diffuse_f.r + diffuse_f.g + diffuse_f.b) / 3.0;
+			diffuse_f.rgb = vec3(bw, bw, bw);
+		}
+
+		gl_FragColor = fog4(diffuse_f);
 	}
-	gl_FragColor = fog4(vec4(ts, USEALPHA) * e_colourident);
-}
 #endif