diff options
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/teleia/src/assets/shaders/bitmap/frag.glsl | 4 | ||||
| -rw-r--r-- | crates/teleia/src/font.rs | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/crates/teleia/src/assets/shaders/bitmap/frag.glsl b/crates/teleia/src/assets/shaders/bitmap/frag.glsl index 7df9a5c..8b71985 100644 --- a/crates/teleia/src/assets/shaders/bitmap/frag.glsl +++ b/crates/teleia/src/assets/shaders/bitmap/frag.glsl @@ -10,8 +10,6 @@ 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 = vertex_color.r; - texel.g = vertex_color.g; - texel.b = vertex_color.b; + texel.rgb = vertex_color; frag_color = texel; } diff --git a/crates/teleia/src/font.rs b/crates/teleia/src/font.rs index dca51b8..b4dc68d 100644 --- a/crates/teleia/src/font.rs +++ b/crates/teleia/src/font.rs @@ -72,6 +72,7 @@ impl Bitmap { pos: &glam::Vec2, text: &str, params: BitmapParams, ) { + let fpos = pos.floor(); let mut cur = glam::Vec2::new(0.0, 0.0); let mut vertices = Vec::new(); let mut texcoords = Vec::new(); @@ -118,7 +119,7 @@ impl Bitmap { -st.render_dims.x / 2.0, st.render_dims.y / 2.0 - sdims.y, ); - let npos = (glam::Vec2::new(pos.x, -pos.y) + offset) * scale; + let npos = (glam::Vec2::new(fpos.x, -fpos.y) + offset) * scale; self.shader.set_mat4( ctx, "transform", &glam::Mat4::from_scale_rotation_translation( |