implements PLN-0041 scene glyph runtime resolution

This commit is contained in:
2026-04-24 11:08:39 +01:00
parent 26686c288c
commit 0d6ff430a0
14 changed files with 368 additions and 109 deletions
+81 -46
View File
@@ -32,6 +32,35 @@ type StagingMap<T> = HashMap<HandleId, StagedValue<T>>;
type AssetTable = HashMap<AssetId, AssetEntry>;
type HandleTable = HashMap<HandleId, LoadHandleInfo>;
#[derive(Clone, Default)]
pub struct GlyphAssetSlotIndex {
slots_by_asset_id: Arc<RwLock<HashMap<AssetId, usize>>>,
}
impl GlyphAssetSlotIndex {
pub fn new() -> Self {
Self { slots_by_asset_id: Arc::new(RwLock::new(HashMap::new())) }
}
pub fn glyph_slot_for_asset(&self, asset_id: AssetId) -> Option<usize> {
self.slots_by_asset_id.read().unwrap().get(&asset_id).copied()
}
pub fn rebuild_from_slots(&self, slots: &[Option<AssetId>; 16]) {
let mut map = self.slots_by_asset_id.write().unwrap();
map.clear();
for (slot, asset_id) in slots.iter().enumerate() {
if let Some(asset_id) = asset_id {
map.insert(*asset_id, slot);
}
}
}
fn clear(&self) {
self.slots_by_asset_id.write().unwrap().clear();
}
}
const GLYPH_BANK_PALETTE_COUNT_V1: usize = 64;
const GLYPH_BANK_COLORS_PER_PALETTE: usize = 16;
const GLYPH_BANK_PALETTE_BYTES_V1: usize =
@@ -163,6 +192,7 @@ pub struct AssetManager {
/// Track what is installed in each hardware slot (for stats/info).
gfx_slots: Arc<RwLock<[Option<AssetId>; 16]>>,
glyph_slot_index: GlyphAssetSlotIndex,
sound_slots: Arc<RwLock<[Option<AssetId>; 16]>>,
scene_slots: Arc<RwLock<[Option<AssetId>; 16]>>,
@@ -309,6 +339,7 @@ impl AssetManager {
sound_installer,
scene_installer,
gfx_slots: Arc::new(RwLock::new(std::array::from_fn(|_| None))),
glyph_slot_index: GlyphAssetSlotIndex::new(),
sound_slots: Arc::new(RwLock::new(std::array::from_fn(|_| None))),
scene_slots: Arc::new(RwLock::new(std::array::from_fn(|_| None))),
gfx_policy: BankPolicy::new(),
@@ -361,6 +392,7 @@ impl AssetManager {
let mut slots = self.gfx_slots.write().unwrap();
if slot_index < slots.len() {
slots[slot_index] = Some(entry.asset_id);
self.glyph_slot_index.rebuild_from_slots(&slots);
}
}
}
@@ -746,7 +778,7 @@ impl AssetManager {
let mut decoded_size = 0_usize;
let layers = std::array::from_fn(|_| SceneLayer {
active: false,
glyph_bank_id: 0,
glyph_asset_id: 0,
tile_size: TileSize::Size8,
parallax_factor: ParallaxFactor { x: 1.0, y: 1.0 },
tilemap: TileMap { width: 0, height: 0, tiles: Vec::new() },
@@ -762,8 +794,13 @@ impl AssetManager {
}
let flags = buffer[offset];
let glyph_bank_id = buffer[offset + 1];
let tile_size_raw = buffer[offset + 2];
let glyph_asset_id = i32::from_le_bytes([
buffer[offset + 1],
buffer[offset + 2],
buffer[offset + 3],
buffer[offset + 4],
]);
let tile_size_raw = buffer[offset + 5];
let tile_size = match tile_size_raw {
8 => TileSize::Size8,
16 => TileSize::Size16,
@@ -771,39 +808,39 @@ impl AssetManager {
other => return Err(format!("Invalid SCENE tile size: {}", other)),
};
let parallax_factor_x = f32::from_le_bytes([
buffer[offset + 4],
buffer[offset + 5],
buffer[offset + 6],
buffer[offset + 7],
]);
let parallax_factor_y = f32::from_le_bytes([
buffer[offset + 8],
buffer[offset + 9],
buffer[offset + 10],
buffer[offset + 11],
]);
let parallax_factor_y = f32::from_le_bytes([
buffer[offset + 12],
buffer[offset + 13],
buffer[offset + 14],
buffer[offset + 15],
]);
if !parallax_factor_x.is_finite() || !parallax_factor_y.is_finite() {
return Err("Invalid SCENE parallax_factor".to_string());
}
let width = u32::from_le_bytes([
buffer[offset + 12],
buffer[offset + 13],
buffer[offset + 14],
buffer[offset + 15],
]) as usize;
let height = u32::from_le_bytes([
buffer[offset + 16],
buffer[offset + 17],
buffer[offset + 18],
buffer[offset + 19],
]) as usize;
let tile_count = u32::from_le_bytes([
let height = u32::from_le_bytes([
buffer[offset + 20],
buffer[offset + 21],
buffer[offset + 22],
buffer[offset + 23],
]) as usize;
let tile_count = u32::from_le_bytes([
buffer[offset + 24],
buffer[offset + 25],
buffer[offset + 26],
buffer[offset + 27],
]) as usize;
let expected_tile_count =
width.checked_mul(height).ok_or("SCENE tile count overflow")?;
@@ -845,7 +882,7 @@ impl AssetManager {
*layer = SceneLayer {
active: (flags & 0b0000_0001) != 0,
glyph_bank_id,
glyph_asset_id,
tile_size,
parallax_factor: ParallaxFactor { x: parallax_factor_x, y: parallax_factor_y },
tilemap: TileMap { width, height, tiles },
@@ -960,6 +997,7 @@ impl AssetManager {
let mut slots = self.gfx_slots.write().unwrap();
if h.slot.index < slots.len() {
slots[h.slot.index] = Some(h._asset_id);
self.glyph_slot_index.rebuild_from_slots(&slots);
}
h.status = LoadStatus::COMMITTED;
}
@@ -1089,9 +1127,14 @@ impl AssetManager {
self.handles.write().unwrap().clear();
self.pending_commits.lock().unwrap().clear();
self.gfx_slots.write().unwrap().fill(None);
self.glyph_slot_index.clear();
self.sound_slots.write().unwrap().fill(None);
self.scene_slots.write().unwrap().fill(None);
}
pub fn glyph_asset_slot_index(&self) -> GlyphAssetSlotIndex {
self.glyph_slot_index.clone()
}
}
#[cfg(test)]
@@ -1144,9 +1187,13 @@ mod tests {
fn test_scene() -> SceneBank {
let make_layer =
|glyph_bank_id: u8, parallax_x: f32, parallax_y: f32, tile_size: TileSize| SceneLayer {
active: glyph_bank_id != 3,
glyph_bank_id,
|glyph_asset_id: AssetId,
active: bool,
parallax_x: f32,
parallax_y: f32,
tile_size: TileSize| SceneLayer {
active,
glyph_asset_id,
tile_size,
parallax_factor: ParallaxFactor { x: parallax_x, y: parallax_y },
tilemap: TileMap {
@@ -1155,37 +1202,25 @@ mod tests {
tiles: vec![
Tile {
active: true,
glyph: Glyph {
glyph_id: 10 + glyph_bank_id as u16,
palette_id: glyph_bank_id,
},
glyph: Glyph { glyph_id: 10, palette_id: 1 },
flip_x: false,
flip_y: false,
},
Tile {
active: true,
glyph: Glyph {
glyph_id: 20 + glyph_bank_id as u16,
palette_id: glyph_bank_id + 1,
},
glyph: Glyph { glyph_id: 20, palette_id: 2 },
flip_x: true,
flip_y: false,
},
Tile {
active: true,
glyph: Glyph {
glyph_id: 30 + glyph_bank_id as u16,
palette_id: glyph_bank_id + 2,
},
glyph: Glyph { glyph_id: 30, palette_id: 3 },
flip_x: false,
flip_y: true,
},
Tile {
active: glyph_bank_id != 2,
glyph: Glyph {
glyph_id: 40 + glyph_bank_id as u16,
palette_id: glyph_bank_id + 3,
},
active,
glyph: Glyph { glyph_id: 40, palette_id: 4 },
flip_x: true,
flip_y: true,
},
@@ -1195,10 +1230,10 @@ mod tests {
SceneBank {
layers: [
make_layer(0, 1.0, 1.0, TileSize::Size16),
make_layer(1, 0.5, 0.75, TileSize::Size8),
make_layer(2, 1.0, 0.5, TileSize::Size32),
make_layer(3, 0.25, 0.25, TileSize::Size16),
make_layer(100, true, 1.0, 1.0, TileSize::Size16),
make_layer(101, true, 0.5, 0.75, TileSize::Size8),
make_layer(102, true, 1.0, 0.5, TileSize::Size32),
make_layer(103, false, 0.25, 0.25, TileSize::Size16),
],
}
}
@@ -1224,9 +1259,9 @@ mod tests {
for layer in &scene.layers {
let layer_flags = if layer.active { 0b0000_0001 } else { 0 };
data.push(layer_flags);
data.push(layer.glyph_bank_id);
data.extend_from_slice(&layer.glyph_asset_id.to_le_bytes());
data.push(layer.tile_size as u8);
data.push(0);
data.extend_from_slice(&0_u16.to_le_bytes());
data.extend_from_slice(&layer.parallax_factor.x.to_le_bytes());
data.extend_from_slice(&layer.parallax_factor.y.to_le_bytes());
data.extend_from_slice(&(layer.tilemap.width as u32).to_le_bytes());
@@ -1358,7 +1393,7 @@ mod tests {
let decoded = AssetManager::decode_scene_bank_from_buffer(&entry, &data).expect("scene");
assert_eq!(decoded.layers[1].glyph_bank_id, 1);
assert_eq!(decoded.layers[1].glyph_asset_id, 101);
assert_eq!(decoded.layers[1].parallax_factor.x, 0.5);
assert_eq!(decoded.layers[2].tile_size, TileSize::Size32);
assert_eq!(decoded.layers[0].tilemap.tiles[1].flip_x, true);
@@ -1382,7 +1417,7 @@ mod tests {
fn test_decode_scene_bank_rejects_invalid_tile_size() {
let scene = test_scene();
let mut data = encode_scene_payload(&scene);
data[14] = 12;
data[17] = 12;
let entry = test_scene_asset_entry("scene", &data, &scene);
let err = AssetManager::decode_scene_bank_from_buffer(&entry, &data).unwrap_err();
@@ -1406,7 +1441,7 @@ mod tests {
fn test_decode_scene_bank_rejects_tile_count_mismatch() {
let scene = test_scene();
let mut data = encode_scene_payload(&scene);
data[32..36].copy_from_slice(&5_u32.to_le_bytes());
data[36..40].copy_from_slice(&5_u32.to_le_bytes());
let entry = test_scene_asset_entry("scene", &data, &scene);
let err = AssetManager::decode_scene_bank_from_buffer(&entry, &data).unwrap_err();