From 0f3182d5b81e9d9d303e4a2790ec4fa786429073 Mon Sep 17 00:00:00 2001 From: jem Date: Sun, 20 Nov 2022 19:35:03 +0000 Subject: [PATCH] fix examples --- agb/examples/mixer_32768.rs | 10 +++++++--- agb/examples/stereo_sound.rs | 11 +++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/agb/examples/mixer_32768.rs b/agb/examples/mixer_32768.rs index 2d9f60d7..6d733d18 100644 --- a/agb/examples/mixer_32768.rs +++ b/agb/examples/mixer_32768.rs @@ -27,9 +27,10 @@ fn main(mut gba: Gba) -> ! { init_background(&mut bg, &mut vram); - let mut writer = FONT.render_text((0u16, 3u16).into(), 1, 0, &mut bg, &mut vram); + let mut title_renderer = FONT.render_text((0u16, 3u16).into()); + let mut writer = title_renderer.writer(1, 0, &mut bg, &mut vram); - writeln!(&mut writer, "Crazy Glue by Josh Woodward").unwrap(); + writeln!(&mut writer, "Crazy Glue by Josh Woodward\n\n").unwrap(); writer.commit(); @@ -51,6 +52,7 @@ fn main(mut gba: Gba) -> ! { let mut frame_counter = 0i32; let mut has_written_frame_time = false; + let mut stats_renderer = FONT.render_text((0u16, 6u16).into()); loop { vblank_provider.wait_for_vblank(); bg.commit(&mut vram); @@ -66,7 +68,9 @@ fn main(mut gba: Gba) -> ! { let percent = (total_cycles * 100) / 280896; - let mut writer = FONT.render_text((0u16, 6u16).into(), 2, 0, &mut bg, &mut vram); + stats_renderer.clear(&mut vram); + + let mut writer = stats_renderer.writer(1, 0, &mut bg, &mut vram); writeln!(&mut writer, "{total_cycles} cycles").unwrap(); writeln!(&mut writer, "{percent} percent").unwrap(); diff --git a/agb/examples/stereo_sound.rs b/agb/examples/stereo_sound.rs index 66dbcdee..d3c39d72 100644 --- a/agb/examples/stereo_sound.rs +++ b/agb/examples/stereo_sound.rs @@ -27,9 +27,10 @@ fn main(mut gba: Gba) -> ! { init_background(&mut bg, &mut vram); - let mut writer = FONT.render_text((0u16, 3u16).into(), 1, 0, &mut bg, &mut vram); + let mut title_renderer = FONT.render_text((0u16, 3u16).into()); + let mut writer = title_renderer.writer(1, 0, &mut bg, &mut vram); - writeln!(&mut writer, "Let it in by Josh Woodward").unwrap(); + writeln!(&mut writer, "Crazy Glue by Josh Woodward\n\n").unwrap(); writer.commit(); @@ -49,6 +50,8 @@ fn main(mut gba: Gba) -> ! { let mut frame_counter = 0i32; let mut has_written_frame_time = false; + + let mut stats_renderer = FONT.render_text((0u16, 6u16).into()); loop { vblank_provider.wait_for_vblank(); bg.commit(&mut vram); @@ -64,8 +67,8 @@ fn main(mut gba: Gba) -> ! { let total_cycles = after_mixing_cycles.wrapping_sub(before_mixing_cycles) as u32; let percent = (total_cycles * 100) / 280896; - - let mut writer = FONT.render_text((0u16, 6u16).into(), 2, 0, &mut bg, &mut vram); + + let mut writer = stats_renderer.writer(1, 0, &mut bg, &mut vram); writeln!(&mut writer, "{total_cycles} cycles").unwrap(); writeln!(&mut writer, "{percent} percent").unwrap();