aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorFalsePattern <me@falsepattern.com>2023-11-27 14:07:21 +0100
committermakamys <makamys@outlook.com>2023-12-01 13:13:38 +0100
commit6dc520d17d6bc920a4b87e7536678bc11e32b0cd (patch)
tree2b9c6906832a023d7086a290f494f8cfeb2b3e41 /src/main/resources
parentb8e4d51f6966d7c74d1d5d8a504ed4200f29a2e2 (diff)
downloadNeodymium-6dc520d17d6bc920a4b87e7536678bc11e32b0cd.tar.gz
Neodymium-6dc520d17d6bc920a4b87e7536678bc11e32b0cd.tar.bz2
Neodymium-6dc520d17d6bc920a4b87e7536678bc11e32b0cd.zip
Removed the SimplifyMeshes feature
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/shaders/chunk.frag14
-rw-r--r--src/main/resources/shaders/chunk.vert9
2 files changed, 1 insertions, 22 deletions
diff --git a/src/main/resources/shaders/chunk.frag b/src/main/resources/shaders/chunk.frag
index 1066dc5..5cc33c1 100644
--- a/src/main/resources/shaders/chunk.frag
+++ b/src/main/resources/shaders/chunk.frag
@@ -4,7 +4,6 @@ out vec4 FragColor;
in vec2 TexCoord;
in vec2 BTexCoord;
in vec4 Color;
-in vec4 MQPos;
in vec4 Viewport;
in mat4 ProjInv;
in vec4 FogColor;
@@ -17,18 +16,7 @@ uniform sampler2D lightTex;
void main()
{
- vec2 goodTexCoord = TexCoord;
-
-#ifdef SIMPLIFY_MESHES
- if(MQPos.x <= 254){
- float wrappedU = mod(MQPos.x, 1.0);
- float wrappedV = mod(MQPos.y, 1.0);
-
- goodTexCoord = ProvokingTexCoord.xy + (((TexCoord.xy - ProvokingTexCoord.xy) / MQPos.zw) * vec2(wrappedU, wrappedV));
- }
-#endif
-
- vec4 texColor = texture(atlas, goodTexCoord
+ vec4 texColor = texture(atlas, TexCoord
#ifdef SHORT_UV
/ 32768.0
#endif
diff --git a/src/main/resources/shaders/chunk.vert b/src/main/resources/shaders/chunk.vert
index f983323..f8a42a0 100644
--- a/src/main/resources/shaders/chunk.vert
+++ b/src/main/resources/shaders/chunk.vert
@@ -4,10 +4,6 @@ layout (location = 1) in vec2 aTexCoord;
layout (location = 2) in vec2 aBTexCoord;
layout (location = 3) in vec4 aColor;
-#ifdef SIMPLIFY_MESHES
-layout (location = 4) in vec4 aMQPos; // if the first coordinate is 255, it means: disable megaquad processing for this quad
-#endif
-
uniform mat4 modelView;
uniform mat4 proj;
uniform mat4 projInv;
@@ -22,7 +18,6 @@ uniform vec3 playerPos;
out vec2 TexCoord;
out vec2 BTexCoord;
out vec4 Color;
-out vec4 MQPos;
out vec4 Viewport;
out mat4 ProjInv;
out vec4 FogColor;
@@ -37,10 +32,6 @@ void main()
BTexCoord = aBTexCoord;
Color = aColor;
-#ifdef SIMPLIFY_MESHES
- MQPos = aMQPos;
-#endif
-
Viewport = viewport;
ProjInv = projInv;
FogColor = fogColor;