alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-11 17:41:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Extract method

Browse source
This commit is contained in:
Gwilym Kuiper 2022-04-23 14:34:34 +01:00
parent fec4015978
commit 6485cc895a
1 changed files with 64 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
agb/src/display/font.rs
View file

@ -91,11 +91,6 @@ pub struct TextRenderer<'a> {
impl<'a> Write for TextRenderer<'a> { impl<'a> Write for TextRenderer<'a> {
fn write_str(&mut self, text: &str) -> Result<(), Error> { fn write_str(&mut self, text: &str) -> Result<(), Error> {
let vram_manager = &mut self.vram_manager;
let tiles = &mut self.tiles;
let foreground_colour = self.foreground_colour;
let background_colour = self.background_colour;
for c in text.chars() { for c in text.chars() {
if c == '\n' { if c == '\n' {
self.current_y_pos += self.font.line_height; self.current_y_pos += self.font.line_height;
@ -105,6 +100,25 @@ impl<'a> Write for TextRenderer<'a> {
let letter = self.font.letter(c); let letter = self.font.letter(c);
self.render_letter(letter);
self.current_x_pos += letter.advance_width as i32;
}
Ok(())
}
}
fn div_ceil(quotient: i32, divisor: i32) -> i32 {
(quotient + divisor - 1) / divisor
}
impl<'a> TextRenderer<'a> {
fn render_letter(&mut self, letter: &FontLetter) {
let vram_manager = &mut self.vram_manager;
let foreground_colour = self.foreground_colour;
let background_colour = self.background_colour;
let x_start = (self.current_x_pos + letter.xmin as i32).max(0); let x_start = (self.current_x_pos + letter.xmin as i32).max(0);
let y_start = let y_start =
self.current_y_pos + self.font.ascent - letter.height as i32 - letter.ymin as i32; self.current_y_pos + self.font.ascent - letter.height as i32 - letter.ymin as i32;
@ -126,8 +140,7 @@ impl<'a> Write for TextRenderer<'a> {
let tile_y = y_tile_start + letter_y_tile; let tile_y = y_tile_start + letter_y_tile;
for letter_x_tile in 0..(x_tiles + 1) { for letter_x_tile in 0..(x_tiles + 1) {
let letter_x_start = let letter_x_start = 0.max(letter_offset_x - 8 * letter_x_tile) + 8 * letter_x_tile;
0.max(letter_offset_x - 8 * letter_x_tile) + 8 * letter_x_tile;
let letter_x_end = let letter_x_end =
(letter_offset_x + letter.width as i32).min((letter_x_tile + 1) * 8); (letter_offset_x + letter.width as i32).min((letter_x_tile + 1) * 8);
@ -152,7 +165,7 @@ impl<'a> Write for TextRenderer<'a> {
} }
if !zero { if !zero {
let tile = tiles.entry((tile_x, tile_y)).or_insert_with(|| { let tile = self.tiles.entry((tile_x, tile_y)).or_insert_with(|| {
vram_manager.new_dynamic_tile().fill_with(background_colour) vram_manager.new_dynamic_tile().fill_with(background_colour)
}); });
@ -162,19 +175,8 @@ impl<'a> Write for TextRenderer<'a> {
} }
} }
} }
self.current_x_pos += letter.advance_width as i32;
} }
Ok(())
}
}
fn div_ceil(quotient: i32, divisor: i32) -> i32 {
(quotient + divisor - 1) / divisor
}
impl<'a> TextRenderer<'a> {
pub fn commit(mut self) { pub fn commit(mut self) {
let tiles = core::mem::take(&mut self.tiles); let tiles = core::mem::take(&mut self.tiles);