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
+44 -12
View File
@@ -222,8 +222,13 @@ impl GfxBridge for Gfx {
fn render_no_scene_frame(&mut self) {
self.render_no_scene_frame()
}
fn render_scene_from_cache(&mut self, cache: &SceneViewportCache, update: &ResolverUpdate) {
self.render_scene_from_cache(cache, update)
fn render_scene_from_cache(
&mut self,
cache: &SceneViewportCache,
update: &ResolverUpdate,
resolved_glyph_slots: &[usize; 4],
) {
self.render_scene_from_cache(cache, update, resolved_glyph_slots)
}
fn load_frame_sprites(&mut self, sprites: &[Sprite]) {
self.load_frame_sprites(sprites)
@@ -646,7 +651,12 @@ impl Gfx {
/// This is the cache-backed world path accepted by DEC-0013. The canonical scene
/// is not consulted here; the renderer only consumes prepared cache materialization
/// plus sprite state and fade controls.
pub fn render_scene_from_cache(&mut self, cache: &SceneViewportCache, update: &ResolverUpdate) {
pub fn render_scene_from_cache(
&mut self,
cache: &SceneViewportCache,
update: &ResolverUpdate,
resolved_glyph_slots: &[usize; 4],
) {
self.back.fill(Color::BLACK.raw());
self.populate_layer_buckets();
@@ -665,6 +675,7 @@ impl Gfx {
self.h,
cache,
&update.copy_requests[layer_index],
resolved_glyph_slots[layer_index],
&*self.glyph_banks,
);
}
@@ -695,6 +706,7 @@ impl Gfx {
screen_h: usize,
cache: &SceneViewportCache,
request: &LayerCopyRequest,
glyph_slot: usize,
glyph_banks: &dyn GlyphBankPoolAccess,
) {
let mut target = RenderTarget { back, screen_w, screen_h };
@@ -703,8 +715,11 @@ impl Gfx {
return;
}
let Some(bank) = glyph_banks.glyph_bank_slot(layer_cache.glyph_bank_id as usize) else {
return;
let Some(bank) = glyph_banks.glyph_bank_slot(glyph_slot) else {
panic!(
"SCENE composition fatal: resolved glyph slot {} for layer {} is not resident",
glyph_slot, request.layer_index
);
};
let tile_size_px = request.tile_size as i32;
@@ -894,8 +909,10 @@ impl Gfx {
#[cfg(test)]
mod tests {
use super::*;
use crate::asset::GlyphAssetSlotIndex;
use crate::FrameComposer;
use crate::memory_banks::{GlyphBankPoolInstaller, MemoryBanks, SceneBankPoolAccess};
use prometeu_hal::asset::AssetId;
use prometeu_hal::glyph_bank::TileSize;
use prometeu_hal::scene_bank::SceneBank;
use prometeu_hal::scene_layer::{ParallaxFactor, SceneLayer};
@@ -919,7 +936,7 @@ mod tests {
}
fn make_layer(
glyph_bank_id: u8,
glyph_asset_id: AssetId,
glyph_id: u16,
palette_id: u8,
width: usize,
@@ -927,7 +944,7 @@ mod tests {
) -> SceneLayer {
SceneLayer {
active: true,
glyph_bank_id,
glyph_asset_id,
tile_size: TileSize::Size8,
parallax_factor: ParallaxFactor { x: 1.0, y: 1.0 },
tilemap: TileMap {
@@ -946,10 +963,10 @@ mod tests {
}
}
fn make_inactive_layer(glyph_bank_id: u8, width: usize, height: usize) -> SceneLayer {
fn make_inactive_layer(glyph_asset_id: AssetId, width: usize, height: usize) -> SceneLayer {
SceneLayer {
active: false,
glyph_bank_id,
glyph_asset_id,
tile_size: TileSize::Size8,
parallax_factor: ParallaxFactor { x: 1.0, y: 1.0 },
tilemap: TileMap { width, height, tiles: vec![Tile::default(); width * height] },
@@ -978,6 +995,16 @@ mod tests {
}
}
fn make_glyph_slot_index(bindings: &[(AssetId, usize)]) -> GlyphAssetSlotIndex {
let index = GlyphAssetSlotIndex::new();
let mut slots = [None; 16];
for (asset_id, slot) in bindings {
slots[*slot] = Some(*asset_id);
}
index.rebuild_from_slots(&slots);
index
}
#[test]
fn test_draw_pixel() {
let banks = Arc::new(MemoryBanks::new());
@@ -1054,7 +1081,12 @@ mod tests {
let banks = Arc::new(MemoryBanks::new());
let mut gfx = Gfx::new(32, 18, Arc::clone(&banks) as Arc<dyn GlyphBankPoolAccess>);
let mut frame_composer =
FrameComposer::new(32, 18, Arc::clone(&banks) as Arc<dyn SceneBankPoolAccess>);
FrameComposer::new(
32,
18,
Arc::clone(&banks) as Arc<dyn SceneBankPoolAccess>,
make_glyph_slot_index(&[]),
);
gfx.begin_overlay_frame();
frame_composer.begin_frame();
@@ -1095,7 +1127,7 @@ mod tests {
let mut gfx = Gfx::new(16, 16, banks);
gfx.scene_fade_level = 31;
gfx.hud_fade_level = 31;
gfx.render_scene_from_cache(&cache, &update);
gfx.render_scene_from_cache(&cache, &update, &[0, 0, 0, 0]);
assert_eq!(gfx.back[0], Color::RED.raw());
}
@@ -1146,7 +1178,7 @@ mod tests {
};
gfx.sprite_count = 2;
gfx.render_scene_from_cache(&cache, &update);
gfx.render_scene_from_cache(&cache, &update, &[0, 0, 0, 0]);
assert_eq!(gfx.back[0], Color::BLUE.raw());
}