From af54631360cff653a612eb476d03535332f16f81 Mon Sep 17 00:00:00 2001 From: Ben Kirwin Date: Sun, 8 Sep 2024 21:38:02 -0400 Subject: [PATCH] Revert "More intuitive color use for the draw_text function (#123)" This reverts commit 6f8099d80017f7c357950d75244b77455b4f7607. --- src/framebuffer/draw.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/framebuffer/draw.rs b/src/framebuffer/draw.rs index 5ea3135..d2df6da 100644 --- a/src/framebuffer/draw.rs +++ b/src/framebuffer/draw.rs @@ -191,16 +191,13 @@ impl framebuffer::FramebufferDraw for core::Framebuffer { } glyph.draw(|x, y, v| { + let mult = (1.0 - v).min(1.0); self.write_pixel( Point2 { x: (x + bounding_box.min.x as u32) as i32, y: (y + bounding_box.min.y as u32) as i32, }, - color::RGB( - (255.0 + (c1 - 255.0) * v) as u8, - (255.0 + (c2 - 255.0) * v) as u8, - (255.0 + (c3 - 255.0) * v) as u8, - ), + color::RGB((c1 * mult) as u8, (c2 * mult) as u8, (c3 * mult) as u8), ) }); }