4 files changed, 21 insertions, 34 deletions
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);
 }
diff --git a/src/assets/shaders/truetype/frag.glsl b/src/assets/shaders/truetype/frag.glsl
index b0e25bf..3f62e01 100644
--- a/src/assets/shaders/truetype/frag.glsl
+++ b/src/assets/shaders/truetype/frag.glsl
@@ -2,22 +2,15 @@
 precision highp float;
 
 uniform sampler2D texture_data;
-uniform int text[256];
-uniform int atlas_width;
-uniform int cell_width;
-uniform int text_width;
 
 in vec2 vertex_texcoord;
+in vec3 vertex_color;
 out vec4 frag_color;
 
 void main()
 {
-    vec2 inverted_texcoord = vec2(vertex_texcoord.x, 1.0 - vertex_texcoord.y);
-    float texcoord_pixels_x = inverted_texcoord.x * float(text_width);
-    int char_idx = int(floor(texcoord_pixels_x)) / cell_width;
-    int offset = text[char_idx];
-    float cbase = float(offset);
-    float coff = mod(texcoord_pixels_x, float(cell_width));
-    float val = texture(texture_data, vec2((cbase + coff) / float(atlas_width), inverted_texcoord.y)).r;
-    frag_color = vec4(val, val, val, 1.0);
+    float val = texture(texture_data, vertex_texcoord).r;
+    if (val == 0.0) discard;
+    vec4 texel = vec4(vertex_color, val);
+    frag_color = texel;
 } 
diff --git a/src/assets/shaders/truetype/vert.glsl b/src/assets/shaders/truetype/vert.glsl
index 4005d75..192d4b0 100644
--- a/src/assets/shaders/truetype/vert.glsl
+++ b/src/assets/shaders/truetype/vert.glsl
@@ -1,26 +1,17 @@
 #version 300 es
 precision highp float;
 
-uniform mat4 view;
-uniform mat4 position;
+in vec2 vertex;
+in vec2 texcoord;
+in vec3 color;
+
+uniform mat4 transform;
 
 out vec2 vertex_texcoord;
+out vec3 vertex_color;
 
 void main() {
-    const vec2 positions[4] = vec2[](
-        vec2(-1, -1),
-        vec2(+1, -1),
-        vec2(-1, +1),
-        vec2(+1, +1)
-    );
-    const vec2 coords[4] = vec2[](
-        vec2(0, 0),
-        vec2(1, 0),
-        vec2(0, 1),
-        vec2(1, 1)
-    );
-    vec4 vertex = vec4(positions[gl_VertexID], 0.0, 1.0);
-
-    vertex_texcoord = coords[gl_VertexID];
-    gl_Position = view * position * vertex;
+    vertex_texcoord = texcoord;
+    vertex_color = color;
+    gl_Position = transform * vec4(vertex, 0.0, 1.0);
 }