From ba6d14a7737ef7cd02b61586e39ca2162df3018d Mon Sep 17 00:00:00 2001
From: Kasullian <tomkasull@gmail.com>
Date: Mon, 8 Sep 2025 23:20:06 -0400
Subject: glew, map parsing for windows

---
 assets/shaders/2d_texcoord.fsh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'assets/shaders/2d_texcoord.fsh')

diff --git a/assets/shaders/2d_texcoord.fsh b/assets/shaders/2d_texcoord.fsh
index 276f305..fabbb2f 100644
--- a/assets/shaders/2d_texcoord.fsh
+++ b/assets/shaders/2d_texcoord.fsh
@@ -11,8 +11,9 @@ flat in uint g_sampler;
 void main() {
   vec4 color = g_color;
   if( g_sampler != SAMPLER_ID_NONE ) {
-    color = texture2D( g_samplers[g_sampler], g_texcoord );
-    color *= g_color;
+    vec4 tex_color = texture2D( g_samplers[g_sampler], g_texcoord );
+    color.a = g_color.a * tex_color.a;
+    if (color.a < 0.01) discard;
   }
   gl_FragColor = color;
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 8be4ca70798fafd57dba947edfb18d0de594013d Mon Sep 17 00:00:00 2001
From: Kasullian <tomkasull@gmail.com>
Date: Tue, 9 Sep 2025 01:19:12 -0400
Subject: fix font rendering

---
 assets/shaders/2d_texcoord.fsh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'assets/shaders/2d_texcoord.fsh')

diff --git a/assets/shaders/2d_texcoord.fsh b/assets/shaders/2d_texcoord.fsh
index fabbb2f..cf94a68 100644
--- a/assets/shaders/2d_texcoord.fsh
+++ b/assets/shaders/2d_texcoord.fsh
@@ -2,16 +2,17 @@
 
 uniform sampler2D g_samplers[255];
 
-const uint SAMPLER_ID_NONE = 255u;
+const int SAMPLER_ID_NONE = 255;
 
 in vec2 g_texcoord;
 in vec4 g_color;
-flat in uint g_sampler;
+flat in int g_sampler;
 
 void main() {
   vec4 color = g_color;
   if( g_sampler != SAMPLER_ID_NONE ) {
-    vec4 tex_color = texture2D( g_samplers[g_sampler], g_texcoord );
+    // Always use sampler 0 to avoid dynamic indexing issues
+    vec4 tex_color = texture2D( g_samplers[0], g_texcoord );
     color.a = g_color.a * tex_color.a;
     if (color.a < 0.01) discard;
   }
-- 
cgit v1.2.3


From 235926dadb686589f0b5480162c3ab929159e570 Mon Sep 17 00:00:00 2001
From: navewindre <boneyaard@gmail.com>
Date: Wed, 10 Sep 2025 12:25:00 +0200
Subject: unfuck

---
 assets/shaders/2d_texcoord.fsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'assets/shaders/2d_texcoord.fsh')

diff --git a/assets/shaders/2d_texcoord.fsh b/assets/shaders/2d_texcoord.fsh
index cf94a68..cbb9be0 100644
--- a/assets/shaders/2d_texcoord.fsh
+++ b/assets/shaders/2d_texcoord.fsh
@@ -11,10 +11,9 @@ flat in int g_sampler;
 void main() {
   vec4 color = g_color;
   if( g_sampler != SAMPLER_ID_NONE ) {
-    // Always use sampler 0 to avoid dynamic indexing issues
-    vec4 tex_color = texture2D( g_samplers[0], g_texcoord );
+    vec4 tex_color = texture2D( g_samplers[g_sampler], g_texcoord );
     color.a = g_color.a * tex_color.a;
     if (color.a < 0.01) discard;
   }
   gl_FragColor = color;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 5c8bbc3bc618068af1f7d6f2829c4346570c2ab9 Mon Sep 17 00:00:00 2001
From: Kasullian <tomkasull@gmail.com>
Date: Thu, 2 Oct 2025 01:21:37 -0400
Subject: fix shader tm

---
 assets/shaders/2d_texcoord.fsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'assets/shaders/2d_texcoord.fsh')

diff --git a/assets/shaders/2d_texcoord.fsh b/assets/shaders/2d_texcoord.fsh
index cbb9be0..38dc69c 100644
--- a/assets/shaders/2d_texcoord.fsh
+++ b/assets/shaders/2d_texcoord.fsh
@@ -12,7 +12,7 @@ void main() {
   vec4 color = g_color;
   if( g_sampler != SAMPLER_ID_NONE ) {
     vec4 tex_color = texture2D( g_samplers[g_sampler], g_texcoord );
-    color.a = g_color.a * tex_color.a;
+    color *= tex_color;
     if (color.a < 0.01) discard;
   }
   gl_FragColor = color;
-- 
cgit v1.2.3