From 6b7a23bf55c425953179eb2458e31b3a394bd766 Mon Sep 17 00:00:00 2001
From: Valerie <sleeplessval@gmail.com>
Date: Wed, 10 Apr 2024 10:36:42 -0400
Subject: [PATCH] unified vertex warp into gbuffers_basic

---
 ...uffers_entities.fsh => gbuffers_basic.fsh} |  0
 ...buffers_terrain.vsh => gbuffers_basic.vsh} |  0
 shaders/gbuffers_entities.vsh                 | 29 -------------------
 shaders/gbuffers_terrain.fsh                  | 15 ----------
 4 files changed, 44 deletions(-)
 rename shaders/{gbuffers_entities.fsh => gbuffers_basic.fsh} (100%)
 rename shaders/{gbuffers_terrain.vsh => gbuffers_basic.vsh} (100%)
 delete mode 100644 shaders/gbuffers_entities.vsh
 delete mode 100644 shaders/gbuffers_terrain.fsh

diff --git a/shaders/gbuffers_entities.fsh b/shaders/gbuffers_basic.fsh
similarity index 100%
rename from shaders/gbuffers_entities.fsh
rename to shaders/gbuffers_basic.fsh
diff --git a/shaders/gbuffers_terrain.vsh b/shaders/gbuffers_basic.vsh
similarity index 100%
rename from shaders/gbuffers_terrain.vsh
rename to shaders/gbuffers_basic.vsh
diff --git a/shaders/gbuffers_entities.vsh b/shaders/gbuffers_entities.vsh
deleted file mode 100644
index ed1ccfc..0000000
--- a/shaders/gbuffers_entities.vsh
+++ /dev/null
@@ -1,29 +0,0 @@
-#version 120
-
-varying vec2 texcoord;
-varying vec4 color;
-varying vec2 lmcoord;
-
-uniform mat4 gbufferModelView, gbufferModelViewInverse;
-uniform float viewWidth, viewHeight;
-
-#define pixelSize 2 // [1 2 4 8 16]
-#define vWarp 0 // psx vertex warp [0 1 2 4 8 16 32]
-
-void main() {
-	texcoord = (gl_TextureMatrix[0] * gl_MultiTexCoord0).xy;
-	lmcoord = (gl_TextureMatrix[1] * gl_MultiTexCoord1).xy;
-	color = gl_Color;
-
-	#ifdef vWarp
-		float mod = pixelSize * vWarp;
-		vec2 screen = vec2(viewWidth / mod, viewHeight / mod);
-		vec4 position = gbufferModelViewInverse * gl_ModelViewMatrix * gl_Vertex;
-		vec2 nearest = round(position.xy / position.w * screen) / screen;
-		position.xy = nearest;
-		gl_Position = gl_ProjectionMatrix * gbufferModelView * position;
-	#else
-		gl_Position = ftransform();
-	#endif
-}
-
diff --git a/shaders/gbuffers_terrain.fsh b/shaders/gbuffers_terrain.fsh
deleted file mode 100644
index 1bf926d..0000000
--- a/shaders/gbuffers_terrain.fsh
+++ /dev/null
@@ -1,15 +0,0 @@
-#version 120
-
-varying vec2 texcoord;
-varying vec4 color;
-varying vec2 lmcoord;
-
-uniform sampler2D texture;
-uniform sampler2D lightmap;
-
-void main() {
-	vec4 final = texture2D(texture, texcoord) * color;
-	final *= texture2D(lightmap, lmcoord);
-	gl_FragData[0] = final;
-}
-