improve hardware font
Intrepid/Prometeu/Runtime/pipeline/head There was a failure building this commit

This commit is contained in:
2026-05-22 08:39:10 +01:00
parent eb398846a0
commit 70c6bd17c8
18 changed files with 150 additions and 188 deletions
+149 -62
View File
@@ -64,7 +64,7 @@ pub struct Gfx {
layer_buckets: [Vec<usize>; 4],
}
const GLYPH_UNKNOWN: [u8; 5] = [0x7, 0x7, 0x7, 0x7, 0x7];
// const GLYPH_UNKNOWN: [u8; 5] = [0x7, 0x7, 0x7, 0x7, 0x7];
struct RenderTarget<'a> {
back: &'a mut [u16],
@@ -81,57 +81,123 @@ struct CachedTileDraw<'a> {
tile_size: prometeu_hal::glyph_bank::TileSize,
}
pub const HW_FONT_WIDTH: usize = 7;
pub const HW_FONT_HEIGHT: usize = 6;
pub const HW_FONT_SPACING_X: usize = 1;
pub const HW_FONT_SPACING_Y: usize = 2;
pub const HW_FONT_ADVANCE_X: usize = HW_FONT_WIDTH + HW_FONT_SPACING_X; // 8
pub const HW_FONT_ADVANCE_Y: usize = HW_FONT_HEIGHT + HW_FONT_SPACING_Y; // 8
pub const GLYPH_UNKNOWN: [u8; HW_FONT_HEIGHT] = [
0x7F, // #######
0x41, // #.....#
0x5D, // #.###.#
0x55, // #.#.#.#
0x41, // #.....#
0x7F, // #######
];
pub const GLYPH_SPACE: [u8; HW_FONT_HEIGHT] = [
0x00, // .......
0x00, // .......
0x00, // .......
0x00, // .......
0x00, // .......
0x00, // .......
];
#[inline]
fn glyph_for_char(c: char) -> &'static [u8; 5] {
match c.to_ascii_uppercase() {
'0' => &[0x7, 0x5, 0x5, 0x5, 0x7],
'1' => &[0x2, 0x6, 0x2, 0x2, 0x7],
'2' => &[0x7, 0x1, 0x7, 0x4, 0x7],
'3' => &[0x7, 0x1, 0x7, 0x1, 0x7],
'4' => &[0x5, 0x5, 0x7, 0x1, 0x1],
'5' => &[0x7, 0x4, 0x7, 0x1, 0x7],
'6' => &[0x7, 0x4, 0x7, 0x5, 0x7],
'7' => &[0x7, 0x1, 0x1, 0x1, 0x1],
'8' => &[0x7, 0x5, 0x7, 0x5, 0x7],
'9' => &[0x7, 0x5, 0x7, 0x1, 0x7],
'A' => &[0x7, 0x5, 0x7, 0x5, 0x5],
'B' => &[0x6, 0x5, 0x6, 0x5, 0x6],
'C' => &[0x7, 0x4, 0x4, 0x4, 0x7],
'D' => &[0x6, 0x5, 0x5, 0x5, 0x6],
'E' => &[0x7, 0x4, 0x6, 0x4, 0x7],
'F' => &[0x7, 0x4, 0x6, 0x4, 0x4],
'G' => &[0x7, 0x4, 0x5, 0x5, 0x7],
'H' => &[0x5, 0x5, 0x7, 0x5, 0x5],
'I' => &[0x7, 0x2, 0x2, 0x2, 0x7],
'J' => &[0x1, 0x1, 0x1, 0x5, 0x2],
'K' => &[0x5, 0x5, 0x6, 0x5, 0x5],
'L' => &[0x4, 0x4, 0x4, 0x4, 0x7],
'M' => &[0x5, 0x7, 0x5, 0x5, 0x5],
'N' => &[0x5, 0x5, 0x5, 0x5, 0x5],
'O' => &[0x7, 0x5, 0x5, 0x5, 0x7],
'P' => &[0x7, 0x5, 0x7, 0x4, 0x4],
'Q' => &[0x7, 0x5, 0x5, 0x7, 0x1],
'R' => &[0x7, 0x5, 0x6, 0x5, 0x5],
'S' => &[0x7, 0x4, 0x7, 0x1, 0x7],
'T' => &[0x7, 0x2, 0x2, 0x2, 0x2],
'U' => &[0x5, 0x5, 0x5, 0x5, 0x7],
'V' => &[0x5, 0x5, 0x5, 0x5, 0x2],
'W' => &[0x5, 0x5, 0x5, 0x7, 0x5],
'X' => &[0x5, 0x5, 0x2, 0x5, 0x5],
'Y' => &[0x5, 0x5, 0x2, 0x2, 0x2],
'Z' => &[0x7, 0x1, 0x2, 0x4, 0x7],
':' => &[0x0, 0x2, 0x0, 0x2, 0x0],
'.' => &[0x0, 0x0, 0x0, 0x0, 0x2],
',' => &[0x0, 0x0, 0x0, 0x2, 0x4],
'!' => &[0x2, 0x2, 0x2, 0x0, 0x2],
'?' => &[0x7, 0x1, 0x2, 0x0, 0x2],
' ' => &[0x0, 0x0, 0x0, 0x0, 0x0],
'|' => &[0x2, 0x2, 0x2, 0x2, 0x2],
'/' => &[0x1, 0x1, 0x2, 0x4, 0x4],
'(' => &[0x2, 0x4, 0x4, 0x4, 0x2],
')' => &[0x2, 0x1, 0x1, 0x1, 0x2],
'>' => &[0x4, 0x2, 0x1, 0x2, 0x4],
'<' => &[0x1, 0x2, 0x4, 0x2, 0x1],
pub fn glyph_for_char(c: char) -> &'static [u8; HW_FONT_HEIGHT] {
match c {
'0' => &[0x3E, 0x41, 0x45, 0x49, 0x41, 0x3E],
'1' => &[0x08, 0x18, 0x08, 0x08, 0x08, 0x1C],
'2' => &[0x3E, 0x41, 0x01, 0x0E, 0x30, 0x7F],
'3' => &[0x7E, 0x01, 0x1E, 0x01, 0x41, 0x3E],
'4' => &[0x42, 0x42, 0x42, 0x7F, 0x02, 0x02],
'5' => &[0x7F, 0x40, 0x7E, 0x01, 0x41, 0x3E],
'6' => &[0x3E, 0x40, 0x7E, 0x41, 0x41, 0x3E],
'7' => &[0x7F, 0x01, 0x02, 0x04, 0x08, 0x08],
'8' => &[0x3E, 0x41, 0x3E, 0x41, 0x41, 0x3E],
'9' => &[0x3E, 0x41, 0x41, 0x3F, 0x01, 0x3E],
'a' => &[0x00, 0x3E, 0x01, 0x3F, 0x41, 0x3F],
'b' => &[0x40, 0x40, 0x7E, 0x41, 0x41, 0x7E],
'c' => &[0x00, 0x3E, 0x41, 0x40, 0x41, 0x3E],
'd' => &[0x01, 0x01, 0x3F, 0x41, 0x41, 0x3F],
'e' => &[0x00, 0x3E, 0x41, 0x7F, 0x40, 0x3E],
'f' => &[0x0E, 0x10, 0x3E, 0x10, 0x10, 0x10],
'g' => &[0x00, 0x3F, 0x41, 0x3F, 0x01, 0x3E],
'h' => &[0x40, 0x40, 0x7E, 0x41, 0x41, 0x41],
'i' => &[0x08, 0x00, 0x18, 0x08, 0x08, 0x1C],
'j' => &[0x04, 0x00, 0x0C, 0x04, 0x44, 0x38],
'k' => &[0x40, 0x42, 0x44, 0x78, 0x44, 0x42],
'l' => &[0x18, 0x08, 0x08, 0x08, 0x08, 0x1C],
'm' => &[0x00, 0x76, 0x49, 0x49, 0x49, 0x49],
'n' => &[0x00, 0x7E, 0x41, 0x41, 0x41, 0x41],
'o' => &[0x00, 0x3E, 0x41, 0x41, 0x41, 0x3E],
'p' => &[0x00, 0x7E, 0x41, 0x7E, 0x40, 0x40],
'q' => &[0x00, 0x3F, 0x41, 0x3F, 0x01, 0x01],
'r' => &[0x00, 0x5E, 0x61, 0x40, 0x40, 0x40],
's' => &[0x00, 0x3F, 0x40, 0x3E, 0x01, 0x7E],
't' => &[0x10, 0x10, 0x7C, 0x10, 0x10, 0x0E],
'u' => &[0x00, 0x41, 0x41, 0x41, 0x43, 0x3D],
'v' => &[0x00, 0x41, 0x41, 0x22, 0x22, 0x1C],
'w' => &[0x00, 0x41, 0x49, 0x49, 0x55, 0x22],
'x' => &[0x00, 0x41, 0x22, 0x1C, 0x22, 0x41],
'y' => &[0x00, 0x41, 0x41, 0x3F, 0x01, 0x3E],
'z' => &[0x00, 0x7F, 0x02, 0x0C, 0x10, 0x7F],
'A' => &[0x3E, 0x41, 0x41, 0x7F, 0x41, 0x41],
'B' => &[0x7E, 0x41, 0x7E, 0x41, 0x41, 0x7E],
'C' => &[0x3E, 0x41, 0x40, 0x40, 0x41, 0x3E],
'D' => &[0x7E, 0x41, 0x41, 0x41, 0x41, 0x7E],
'E' => &[0x7F, 0x40, 0x7C, 0x40, 0x40, 0x7F],
'F' => &[0x7F, 0x40, 0x7C, 0x40, 0x40, 0x40],
'G' => &[0x3E, 0x41, 0x40, 0x4F, 0x41, 0x3E],
'H' => &[0x41, 0x41, 0x7F, 0x41, 0x41, 0x41],
'I' => &[0x7F, 0x08, 0x08, 0x08, 0x08, 0x7F],
'J' => &[0x01, 0x01, 0x01, 0x41, 0x41, 0x3E],
'K' => &[0x41, 0x42, 0x7C, 0x42, 0x41, 0x41],
'L' => &[0x40, 0x40, 0x40, 0x40, 0x40, 0x7F],
'M' => &[0x41, 0x63, 0x55, 0x49, 0x41, 0x41],
'N' => &[0x41, 0x61, 0x51, 0x49, 0x45, 0x43],
'O' => &[0x3E, 0x41, 0x41, 0x41, 0x41, 0x3E],
'P' => &[0x7E, 0x41, 0x41, 0x7E, 0x40, 0x40],
'Q' => &[0x3E, 0x41, 0x41, 0x49, 0x45, 0x3F],
'R' => &[0x7E, 0x41, 0x41, 0x7E, 0x42, 0x41],
'S' => &[0x3F, 0x40, 0x3E, 0x01, 0x41, 0x3E],
'T' => &[0x7F, 0x08, 0x08, 0x08, 0x08, 0x08],
'U' => &[0x41, 0x41, 0x41, 0x41, 0x41, 0x3E],
'V' => &[0x41, 0x41, 0x41, 0x22, 0x22, 0x1C],
'W' => &[0x41, 0x41, 0x49, 0x55, 0x63, 0x41],
'X' => &[0x41, 0x22, 0x1C, 0x1C, 0x22, 0x41],
'Y' => &[0x41, 0x22, 0x1C, 0x08, 0x08, 0x08],
'Z' => &[0x7F, 0x02, 0x04, 0x08, 0x10, 0x7F],
':' => &[0x00, 0x08, 0x08, 0x00, 0x08, 0x08],
'.' => &[0x00, 0x00, 0x00, 0x00, 0x18, 0x18],
',' => &[0x00, 0x00, 0x00, 0x00, 0x18, 0x10],
'!' => &[0x08, 0x08, 0x08, 0x08, 0x00, 0x08],
'?' => &[0x3E, 0x41, 0x01, 0x0E, 0x00, 0x08],
' ' => &GLYPH_SPACE,
'|' => &[0x08, 0x08, 0x08, 0x08, 0x08, 0x08],
'/' => &[0x01, 0x02, 0x04, 0x08, 0x10, 0x40],
'\\' => &[0x40, 0x10, 0x08, 0x04, 0x02, 0x01],
'(' => &[0x04, 0x08, 0x10, 0x10, 0x08, 0x04],
')' => &[0x10, 0x08, 0x04, 0x04, 0x08, 0x10],
'>' => &[0x20, 0x10, 0x08, 0x10, 0x20, 0x00],
'<' => &[0x02, 0x04, 0x08, 0x04, 0x02, 0x00],
'-' => &[0x00, 0x00, 0x7F, 0x00, 0x00, 0x00],
'_' => &[0x00, 0x00, 0x00, 0x00, 0x00, 0x7F],
'+' => &[0x00, 0x08, 0x08, 0x3E, 0x08, 0x08],
'=' => &[0x00, 0x00, 0x3E, 0x00, 0x3E, 0x00],
'*' => &[0x00, 0x22, 0x14, 0x7F, 0x14, 0x22],
'#' => &[0x14, 0x14, 0x7F, 0x14, 0x7F, 0x14],
'%' => &[0x61, 0x62, 0x04, 0x08, 0x13, 0x23],
'@' => &[0x3E, 0x41, 0x5D, 0x55, 0x5E, 0x40],
_ => &GLYPH_UNKNOWN,
}
}
@@ -798,9 +864,23 @@ impl Gfx {
pub fn draw_text(&mut self, x: i32, y: i32, text: &str, color: Color) {
let mut cx = x;
let mut cy = y;
for c in text.chars() {
self.draw_char(cx, y, c, color);
cx += 4;
match c {
'\n' => {
cx = x;
cy += HW_FONT_ADVANCE_Y as i32;
}
'\r' => {}
'\t' => {
cx += (HW_FONT_ADVANCE_X * 4) as i32;
}
_ => {
self.draw_char(cx, cy, c, color);
cx += HW_FONT_ADVANCE_X as i32;
}
}
}
}
@@ -811,25 +891,32 @@ impl Gfx {
let screen_w = self.w as i32;
let screen_h = self.h as i32;
if x >= screen_w || y >= screen_h || x + 3 <= 0 || y + 5 <= 0 {
let glyph_w = HW_FONT_WIDTH as i32;
let glyph_h = HW_FONT_HEIGHT as i32;
if x >= screen_w || y >= screen_h || x + glyph_w <= 0 || y + glyph_h <= 0 {
return;
}
let glyph = glyph_for_char(c);
let raw = color.0;
let row_start = (-y).clamp(0, 5) as usize;
let row_end = (screen_h - y).clamp(0, 5) as usize;
let col_start = (-x).clamp(0, 3) as usize;
let col_end = (screen_w - x).clamp(0, 3) as usize;
let row_start = (-y).clamp(0, glyph_h) as usize;
let row_end = (screen_h - y).clamp(0, glyph_h) as usize;
for (row_idx, row) in
glyph.iter().enumerate().skip(row_start).take(row_end.saturating_sub(row_start))
{
let col_start = (-x).clamp(0, glyph_w) as usize;
let col_end = (screen_w - x).clamp(0, glyph_w) as usize;
for row_idx in row_start..row_end {
let row = glyph[row_idx];
let py = (y + row_idx as i32) as usize;
let base = py * self.w;
for col_idx in col_start..col_end {
if (row >> (2 - col_idx)) & 1 == 1 {
let bit = HW_FONT_WIDTH - 1 - col_idx;
if ((row >> bit) & 1) != 0 {
let px = (x + col_idx as i32) as usize;
self.back[base + px] = raw;
}
@@ -252,11 +252,7 @@ fn draw_button(gfx: &mut dyn GfxBridge, rect: Rect, label: &str, hovered: bool)
}
fn draw_buffer_text(gfx: &mut dyn GfxBridge, x: i32, y: i32, text: &str, color: Color) {
let mut cx = x;
for ch in text.chars() {
gfx.draw_char(cx, y, ch, color);
cx += 4;
}
gfx.draw_text(x, y, text, color);
}
#[cfg(test)]