diff --git a/wadsrc/static/shaders/glsl/func_warp2.fp b/wadsrc/static/shaders/glsl/func_warp2.fp
index 7cc5e7ebb..ee712593d 100644
--- a/wadsrc/static/shaders/glsl/func_warp2.fp
+++ b/wadsrc/static/shaders/glsl/func_warp2.fp
@@ -7,11 +7,10 @@ vec4 ProcessTexel()
 	const float pi = 3.14159265358979323846;
 	vec2 offset = vec2(0.0,0.0);
 
-	float siny = sin(pi * 2.0 * (texCoord.y * 2.2 + timer * 0.75)) * 0.03;
-	offset.y = siny + sin(pi * 2.0 * (texCoord.x * 0.75 + timer * 0.75)) * 0.03;
-	offset.x = siny + sin(pi * 2.0 * (texCoord.x * 1.1 + timer * 0.45)) * 0.02;
+	offset.y = 0.5 + sin(pi * 2.0 * (texCoord.y + timer * 0.61 + 900.0/8192.0)) + sin(pi * 2.0 * (texCoord.x * 2.0 + timer * 0.36 + 300.0/8192.0));
+	offset.x = 0.5 + sin(pi * 2.0 * (texCoord.y + timer * 0.49 + 700.0/8192.0)) + sin(pi * 2.0 * (texCoord.x * 2.0 + timer * 0.49 + 1200.0/8192.0));
 
-	texCoord += offset;
+	texCoord += offset * 0.025;
 
 	return getTexel(texCoord);
 }
diff --git a/wadsrc/static/shaders/glsl/func_warp3.fp b/wadsrc/static/shaders/glsl/func_warp3.fp
new file mode 100644
index 000000000..a81969ca6
--- /dev/null
+++ b/wadsrc/static/shaders/glsl/func_warp3.fp
@@ -0,0 +1,18 @@
+uniform float timer;
+
+vec4 ProcessTexel()
+{
+	vec2 texCoord = vTexCoord.st;
+
+	const float pi = 3.14159265358979323846;
+	vec2 offset = vec2(0.0,0.0);
+
+	float siny = sin(pi * 2.0 * (texCoord.y * 2.0 + timer * 0.75)) * 0.03;
+	offset.y = siny + sin(pi * 2.0 * (texCoord.x + timer * 0.75)) * 0.03;
+	offset.x = siny + sin(pi * 2.0 * (texCoord.x + timer * 0.45)) * 0.02;
+
+	texCoord += offset;
+
+	return getTexel(texCoord);
+}
+