From 47fe18171569582d1af9401013c57045b59f3774 Mon Sep 17 00:00:00 2001 From: LLLL Colonq Date: Tue, 21 Jan 2025 15:27:55 -0500 Subject: Fix font rendering --- src/assets/shaders/bitmap/frag.glsl | 8 ++++---- src/assets/shaders/bitmap/vert.glsl | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/assets/shaders/bitmap') diff --git a/src/assets/shaders/bitmap/frag.glsl b/src/assets/shaders/bitmap/frag.glsl index 470a7b8..7df9a5c 100644 --- a/src/assets/shaders/bitmap/frag.glsl +++ b/src/assets/shaders/bitmap/frag.glsl @@ -2,16 +2,16 @@ precision highp float; uniform sampler2D texture_data; -uniform vec3 text_color; in vec2 vertex_texcoord; +in vec3 vertex_color; out vec4 frag_color; void main() { vec4 texel = texture(texture_data, vertex_texcoord); if (texel.rgb == vec3(0.0, 0.0, 0.0)) discard; - texel.r = text_color.r; - texel.g = text_color.g; - texel.b = text_color.b; + texel.r = vertex_color.r; + texel.g = vertex_color.g; + texel.b = vertex_color.b; frag_color = texel; } diff --git a/src/assets/shaders/bitmap/vert.glsl b/src/assets/shaders/bitmap/vert.glsl index 4ff9865..192d4b0 100644 --- a/src/assets/shaders/bitmap/vert.glsl +++ b/src/assets/shaders/bitmap/vert.glsl @@ -3,12 +3,15 @@ precision highp float; in vec2 vertex; in vec2 texcoord; +in vec3 color; uniform mat4 transform; out vec2 vertex_texcoord; +out vec3 vertex_color; void main() { vertex_texcoord = texcoord; + vertex_color = color; gl_Position = transform * vec4(vertex, 0.0, 1.0); } -- cgit v1.2.3