diff --git a/MesloLGS NF Regular.ttf b/MesloLGS NF Regular.ttf new file mode 100644 index 0000000..e9e4de5 Binary files /dev/null and b/MesloLGS NF Regular.ttf differ diff --git a/cozette_bitmap.ttf b/cozette_bitmap.ttf deleted file mode 100644 index 5eca094..0000000 Binary files a/cozette_bitmap.ttf and /dev/null differ diff --git a/src/lib.rs b/src/lib.rs index 95e5d6b..79b9c35 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -289,9 +289,9 @@ impl Context { } } -pub fn draw_text(ctx: &mut Context, text: &str, font: &str, size: u16, pos: (i32, i32), mode: TextMode) -> Result<()> { +pub fn draw_text>(ctx: &mut Context, text: S, font: &str, size: u16, pos: (i32, i32), mode: TextMode) -> Result<()> { let font = ctx.ttf_subsystem.load_font(font, size)?; - let renderer = font.render(text); + let renderer = font.render(text.as_ref()); let surf = match mode { TextMode::Transparent { colour: (r, g, b) } => renderer.solid(Color::RGB(r, g, b)), diff --git a/src/main.rs b/src/main.rs index c2fd5fb..d8fa369 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,7 +10,7 @@ fn main() { i = (i + 1.0) % 360.0; ctx.set_background_colour(i as u8, 64, 255); - draw_text(ctx, "this is a test", "cozette_bitmap.ttf", 65535, (300, 300), cat_box::TextMode::Shaded {foreground: (255, 255, 255), background: (0, 0, 0)}).unwrap(); + draw_text(ctx, format!("i is {}", i), "MesloLGS NF Regular.ttf", 72, (300, 300), cat_box::TextMode::Shaded {foreground: (255, 255, 255), background: (0, 0, 0)}).unwrap(); let (start_x, start_y) = s.position(); let m = sdl2::mouse::MouseState::new(event_pump.as_ref());