Merge branch 'worktree-agent-ae760a17ac34a8093'

This commit is contained in:
Richard Zink committed 2026-11-06 10:25:26 +01:00
commit 22cc4d9446
5 files changed
+976 -33

No files matched your search

+4 -1
View File
@@ -99,6 +99,7 @@ pub struct Gfx {
pub atlas: Texture2D,
pub sprites: Texture2D,
pub cursors: Texture2D, // mouse pointer frames, 16x16 each (see CURSOR_*)
pub badges: Texture2D, // achievement badges, 32x32 each (see badges.rs)
pub font: Texture2D, // Dinowyde (glyphs of 6x8 px ordered by Unicode, see font_slot) and DINOBYTE
pub font_map: FontMap, // which glyphs the two fonts hold
}
@@ -2106,7 +2107,9 @@ impl Gfx {
font.set_filter(FilterMode::Nearest);
let cursors = Texture2D::from_image(&gen_cursors());
cursors.set_filter(FilterMode::Nearest);
Gfx { atlas, sprites, cursors, font, font_map }
let badges = Texture2D::from_image(&crate::badges::gen_badges());
badges.set_filter(FilterMode::Nearest);
Gfx { atlas, sprites, cursors, badges, font, font_map }
}
pub fn cell(id: u32) -> Rect {