implements PLN-0011

This commit is contained in:
2026-04-13 20:13:16 +01:00
parent 70cde0d975
commit e1afc164ae
22 changed files with 1905 additions and 348 deletions
+171 -31
View File
@@ -1,5 +1,5 @@
#![allow(clippy::collapsible_if)]
use crate::memory_banks::{GlyphBankPoolInstaller, SoundBankPoolInstaller};
use crate::memory_banks::{GlyphBankPoolInstaller, SceneBankPoolInstaller, SoundBankPoolInstaller};
use prometeu_hal::AssetBridge;
use prometeu_hal::asset::{
AssetCodec, AssetEntry, AssetId, AssetLoadError, AssetOpStatus, BankTelemetry, BankType,
@@ -9,6 +9,7 @@ use prometeu_hal::cartridge::AssetsPayloadSource;
use prometeu_hal::color::Color;
use prometeu_hal::glyph_bank::{GlyphBank, TileSize};
use prometeu_hal::sample::Sample;
use prometeu_hal::scene_bank::SceneBank;
use prometeu_hal::sound_bank::SoundBank;
use std::collections::HashMap;
use std::io::Read;
@@ -151,15 +152,19 @@ pub struct AssetManager {
/// Narrow hardware interfaces
gfx_installer: Arc<dyn GlyphBankPoolInstaller>,
sound_installer: Arc<dyn SoundBankPoolInstaller>,
scene_installer: Arc<dyn SceneBankPoolInstaller>,
/// Track what is installed in each hardware slot (for stats/info).
gfx_slots: Arc<RwLock<[Option<AssetId>; 16]>>,
sound_slots: Arc<RwLock<[Option<AssetId>; 16]>>,
scene_slots: Arc<RwLock<[Option<AssetId>; 16]>>,
/// Residency policy for GFX glyph banks.
gfx_policy: BankPolicy<GlyphBank>,
/// Residency policy for sound banks.
sound_policy: BankPolicy<SoundBank>,
/// Residency policy for scene banks.
scene_policy: BankPolicy<SceneBank>,
// Commits that are ready to be applied at the next frame boundary.
pending_commits: Mutex<Vec<HandleId>>,
@@ -275,6 +280,7 @@ impl AssetManager {
match (entry.bank_type, entry.codec) {
(BankType::GLYPH, AssetCodec::None) => Ok(AssetOpMode::StageInMemory),
(BankType::SOUNDS, AssetCodec::None) => Ok(AssetOpMode::DirectFromSlice),
(BankType::SCENE, AssetCodec::None) => Ok(AssetOpMode::DirectFromSlice),
}
}
@@ -283,6 +289,7 @@ impl AssetManager {
assets_data: AssetsPayloadSource,
gfx_installer: Arc<dyn GlyphBankPoolInstaller>,
sound_installer: Arc<dyn SoundBankPoolInstaller>,
scene_installer: Arc<dyn SceneBankPoolInstaller>,
) -> Self {
let mut asset_map = HashMap::new();
for entry in assets {
@@ -293,10 +300,13 @@ impl AssetManager {
assets: Arc::new(RwLock::new(asset_map)),
gfx_installer,
sound_installer,
scene_installer,
gfx_slots: Arc::new(RwLock::new(std::array::from_fn(|_| None))),
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(),
sound_policy: BankPolicy::new(),
scene_policy: BankPolicy::new(),
handles: Arc::new(RwLock::new(HashMap::new())),
next_handle_id: Mutex::new(1),
assets_data: Arc::new(RwLock::new(assets_data)),
@@ -345,17 +355,7 @@ impl AssetManager {
if slot_index < slots.len() {
slots[slot_index] = Some(entry.asset_id);
}
// println!(
// "[AssetManager] Preloaded tile asset '{}' (id: {}) into slot {}",
// entry.asset_name, entry.asset_id, slot_index
// );
}
// else {
// eprintln!(
// "[AssetManager] Failed to preload tile asset '{}'",
// entry.asset_name
// );
// }
}
BankType::SOUNDS => {
if let Ok(bank) =
@@ -372,23 +372,27 @@ impl AssetManager {
if slot_index < slots.len() {
slots[slot_index] = Some(entry.asset_id);
}
// println!(
// "[AssetManager] Preloaded sound asset '{}' (id: {}) into slot {}",
// entry.asset_name, entry.asset_id, slot_index
// );
}
// else {
// eprintln!(
// "[AssetManager] Failed to preload sound asset '{}'",
// entry.asset_name
// );
// }
}
BankType::SCENE => {
if let Ok(bank) =
Self::perform_load_scene_bank(&entry, self.assets_data.clone())
{
let bank_arc = Arc::new(bank);
self.scene_policy.put_resident(
entry.asset_id,
Arc::clone(&bank_arc),
entry.decoded_size as usize,
);
self.scene_installer.install_scene_bank(slot_index, bank_arc);
let mut slots = self.scene_slots.write().unwrap();
if slot_index < slots.len() {
slots[slot_index] = Some(entry.asset_id);
}
}
}
}
}
// else {
// eprintln!("[AssetManager] Preload failed: asset id '{}' not found in table", item.asset_id);
// }
}
}
@@ -403,6 +407,7 @@ impl AssetManager {
let slot = match entry.bank_type {
BankType::GLYPH => SlotRef::gfx(slot_index),
BankType::SOUNDS => SlotRef::audio(slot_index),
BankType::SCENE => SlotRef::scene(slot_index),
};
let mut next_id = self.next_handle_id.lock().unwrap();
@@ -427,6 +432,14 @@ impl AssetManager {
false
}
}
BankType::SCENE => {
if let Some(bank) = self.scene_policy.get_resident(asset_id) {
self.scene_policy.stage(handle_id, bank, entry.decoded_size as usize);
true
} else {
false
}
}
};
if already_resident {
@@ -450,6 +463,7 @@ impl AssetManager {
// Capture policies for the worker thread
let gfx_policy = self.gfx_policy.clone();
let sound_policy = self.sound_policy.clone();
let scene_policy = self.scene_policy.clone();
thread::spawn(move || {
// Update status to LOADING
@@ -510,6 +524,34 @@ impl AssetManager {
entry_clone.decoded_size as usize,
);
let mut handles_map = handles.write().unwrap();
if let Some(h) = handles_map.get_mut(&handle_id) {
if h.status == LoadStatus::LOADING {
h.status = LoadStatus::READY;
}
}
} else {
let mut handles_map = handles.write().unwrap();
if let Some(h) = handles_map.get_mut(&handle_id) {
h.status = LoadStatus::ERROR;
}
}
}
BankType::SCENE => {
let result = Self::perform_load_scene_bank(&entry_clone, assets_data);
if let Ok(scenebank) = result {
let bank_arc = Arc::new(scenebank);
let resident_arc = scene_policy.put_resident(
asset_id,
bank_arc,
entry_clone.decoded_size as usize,
);
scene_policy.stage(
handle_id,
resident_arc,
entry_clone.decoded_size as usize,
);
let mut handles_map = handles.write().unwrap();
if let Some(h) = handles_map.get_mut(&handle_id) {
if h.status == LoadStatus::LOADING {
@@ -642,6 +684,17 @@ impl AssetManager {
}
}
fn perform_load_scene_bank(
entry: &AssetEntry,
assets_data: Arc<RwLock<AssetsPayloadSource>>,
) -> Result<SceneBank, String> {
let _ = (entry, assets_data);
// TODO: SCENE payloads must not be decoded from ad-hoc JSON.
// Close and document the binary scene-bank format first, then implement
// the runtime decoder here using the canonical binary contract.
todo!("SCENE binary payload format is still open")
}
fn decode_sound_bank_from_buffer(
entry: &AssetEntry,
buffer: &[u8],
@@ -709,6 +762,7 @@ impl AssetManager {
}
self.gfx_policy.take_staging(handle);
self.sound_policy.take_staging(handle);
self.scene_policy.take_staging(handle);
final_status
}
@@ -740,6 +794,16 @@ impl AssetManager {
h.status = LoadStatus::COMMITTED;
}
}
BankType::SCENE => {
if let Some((bank, _)) = self.scene_policy.take_staging(handle_id) {
self.scene_installer.install_scene_bank(h.slot.index, bank);
let mut slots = self.scene_slots.write().unwrap();
if h.slot.index < slots.len() {
slots[h.slot.index] = Some(h._asset_id);
}
h.status = LoadStatus::COMMITTED;
}
}
}
}
}
@@ -747,7 +811,11 @@ impl AssetManager {
}
pub fn bank_telemetry(&self) -> Vec<BankTelemetry> {
vec![self.bank_telemetry_for(BankType::GLYPH), self.bank_telemetry_for(BankType::SOUNDS)]
vec![
self.bank_telemetry_for(BankType::GLYPH),
self.bank_telemetry_for(BankType::SOUNDS),
self.bank_telemetry_for(BankType::SCENE),
]
}
fn bank_telemetry_for(&self, kind: BankType) -> BankTelemetry {
@@ -758,6 +826,9 @@ impl AssetManager {
BankType::SOUNDS => {
self.sound_slots.read().unwrap().iter().filter(|slot| slot.is_some()).count()
}
BankType::SCENE => {
self.scene_slots.read().unwrap().iter().filter(|slot| slot.is_some()).count()
}
};
BankTelemetry { bank_type: kind, used_slots, total_slots: 16 }
@@ -805,6 +876,27 @@ impl AssetManager {
(0, None)
};
SlotStats { asset_id, asset_name, generation: 0, resident_bytes: bytes }
}
BankType::SCENE => {
let slots = self.scene_slots.read().unwrap();
let asset_id = slots.get(slot.index).and_then(|s| *s);
let (bytes, asset_name) = if let Some(id) = &asset_id {
let bytes = self
.scene_policy
.resident
.read()
.unwrap()
.get(id)
.map(|entry| entry.bytes)
.unwrap_or(0);
let name = self.assets.read().unwrap().get(id).map(|e| e.asset_name.clone());
(bytes, name)
} else {
(0, None)
};
SlotStats { asset_id, asset_name, generation: 0, resident_bytes: bytes }
}
}
@@ -813,10 +905,12 @@ impl AssetManager {
pub fn shutdown(&self) {
self.gfx_policy.clear();
self.sound_policy.clear();
self.scene_policy.clear();
self.handles.write().unwrap().clear();
self.pending_commits.lock().unwrap().clear();
self.gfx_slots.write().unwrap().fill(None);
self.sound_slots.write().unwrap().fill(None);
self.scene_slots.write().unwrap().fill(None);
}
}
@@ -933,11 +1027,28 @@ mod tests {
assert_eq!(AssetManager::op_mode_for(&entry), Ok(AssetOpMode::DirectFromSlice));
}
#[test]
fn test_op_mode_for_scene_none_reads_direct_from_slice() {
let entry = AssetEntry {
asset_id: 2,
asset_name: "scene".to_string(),
bank_type: BankType::SCENE,
offset: 0,
size: 32,
decoded_size: 32,
codec: AssetCodec::None,
metadata: serde_json::json!({}),
};
assert_eq!(AssetManager::op_mode_for(&entry), Ok(AssetOpMode::DirectFromSlice));
}
#[test]
fn test_asset_loading_flow() {
let banks = Arc::new(MemoryBanks::new());
let gfx_installer = Arc::clone(&banks) as Arc<dyn GlyphBankPoolInstaller>;
let sound_installer = Arc::clone(&banks) as Arc<dyn SoundBankPoolInstaller>;
let scene_installer = Arc::clone(&banks) as Arc<dyn SceneBankPoolInstaller>;
let data = test_glyph_asset_data();
let asset_entry = test_glyph_asset_entry("test_glyphs", 16, 16);
@@ -947,6 +1058,7 @@ mod tests {
AssetsPayloadSource::from_bytes(data),
gfx_installer,
sound_installer,
scene_installer,
);
let handle = am.load(0, 0).expect("Should start loading");
@@ -976,6 +1088,7 @@ mod tests {
let banks = Arc::new(MemoryBanks::new());
let gfx_installer = Arc::clone(&banks) as Arc<dyn GlyphBankPoolInstaller>;
let sound_installer = Arc::clone(&banks) as Arc<dyn SoundBankPoolInstaller>;
let scene_installer = Arc::clone(&banks) as Arc<dyn SceneBankPoolInstaller>;
let data = test_glyph_asset_data();
let asset_entry = test_glyph_asset_entry("test_glyphs", 16, 16);
@@ -985,6 +1098,7 @@ mod tests {
AssetsPayloadSource::from_bytes(data),
gfx_installer,
sound_installer,
scene_installer,
);
let handle1 = am.load(0, 0).unwrap();
@@ -1007,6 +1121,7 @@ mod tests {
let banks = Arc::new(MemoryBanks::new());
let gfx_installer = Arc::clone(&banks) as Arc<dyn GlyphBankPoolInstaller>;
let sound_installer = Arc::clone(&banks) as Arc<dyn SoundBankPoolInstaller>;
let scene_installer = Arc::clone(&banks) as Arc<dyn SceneBankPoolInstaller>;
// 100 samples of 16-bit PCM (zeros)
let data = vec![0u8; 200];
@@ -1030,6 +1145,7 @@ mod tests {
AssetsPayloadSource::from_bytes(data),
gfx_installer,
sound_installer,
scene_installer,
);
let handle = am.load(1, 0).expect("Should start loading");
@@ -1052,6 +1168,7 @@ mod tests {
let banks = Arc::new(MemoryBanks::new());
let gfx_installer = Arc::clone(&banks) as Arc<dyn GlyphBankPoolInstaller>;
let sound_installer = Arc::clone(&banks) as Arc<dyn SoundBankPoolInstaller>;
let scene_installer = Arc::clone(&banks) as Arc<dyn SceneBankPoolInstaller>;
let data = vec![0u8; 200];
@@ -1071,8 +1188,13 @@ mod tests {
let preload = vec![PreloadEntry { asset_id: 2, slot: 5 }];
let am =
AssetManager::new(vec![], AssetsPayloadSource::empty(), gfx_installer, sound_installer);
let am = AssetManager::new(
vec![],
AssetsPayloadSource::empty(),
gfx_installer,
sound_installer,
scene_installer,
);
// Before init, slot 5 is empty
assert!(banks.sound_bank_slot(5).is_none());
@@ -1093,8 +1215,14 @@ mod tests {
let banks = Arc::new(MemoryBanks::new());
let gfx_installer = Arc::clone(&banks) as Arc<dyn GlyphBankPoolInstaller>;
let sound_installer = Arc::clone(&banks) as Arc<dyn SoundBankPoolInstaller>;
let am =
AssetManager::new(vec![], AssetsPayloadSource::empty(), gfx_installer, sound_installer);
let scene_installer = Arc::clone(&banks) as Arc<dyn SceneBankPoolInstaller>;
let am = AssetManager::new(
vec![],
AssetsPayloadSource::empty(),
gfx_installer,
sound_installer,
scene_installer,
);
let result = am.load(999, 0);
@@ -1106,12 +1234,14 @@ mod tests {
let banks = Arc::new(MemoryBanks::new());
let gfx_installer = Arc::clone(&banks) as Arc<dyn GlyphBankPoolInstaller>;
let sound_installer = Arc::clone(&banks) as Arc<dyn SoundBankPoolInstaller>;
let scene_installer = Arc::clone(&banks) as Arc<dyn SceneBankPoolInstaller>;
let data = test_glyph_asset_data();
let am = AssetManager::new(
vec![test_glyph_asset_entry("test_glyphs", 16, 16)],
AssetsPayloadSource::from_bytes(data),
gfx_installer,
sound_installer,
scene_installer,
);
let result = am.load(0, 16);
@@ -1124,8 +1254,14 @@ mod tests {
let banks = Arc::new(MemoryBanks::new());
let gfx_installer = Arc::clone(&banks) as Arc<dyn GlyphBankPoolInstaller>;
let sound_installer = Arc::clone(&banks) as Arc<dyn SoundBankPoolInstaller>;
let am =
AssetManager::new(vec![], AssetsPayloadSource::empty(), gfx_installer, sound_installer);
let scene_installer = Arc::clone(&banks) as Arc<dyn SceneBankPoolInstaller>;
let am = AssetManager::new(
vec![],
AssetsPayloadSource::empty(),
gfx_installer,
sound_installer,
scene_installer,
);
assert_eq!(am.status(999), LoadStatus::UnknownHandle);
}
@@ -1135,12 +1271,14 @@ mod tests {
let banks = Arc::new(MemoryBanks::new());
let gfx_installer = Arc::clone(&banks) as Arc<dyn GlyphBankPoolInstaller>;
let sound_installer = Arc::clone(&banks) as Arc<dyn SoundBankPoolInstaller>;
let scene_installer = Arc::clone(&banks) as Arc<dyn SceneBankPoolInstaller>;
let data = test_glyph_asset_data();
let am = AssetManager::new(
vec![test_glyph_asset_entry("test_glyphs", 16, 16)],
AssetsPayloadSource::from_bytes(data),
gfx_installer,
sound_installer,
scene_installer,
);
assert_eq!(am.commit(999), AssetOpStatus::UnknownHandle);
@@ -1162,6 +1300,7 @@ mod tests {
let banks = Arc::new(MemoryBanks::new());
let gfx_installer = Arc::clone(&banks) as Arc<dyn GlyphBankPoolInstaller>;
let sound_installer = Arc::clone(&banks) as Arc<dyn SoundBankPoolInstaller>;
let scene_installer = Arc::clone(&banks) as Arc<dyn SceneBankPoolInstaller>;
let width = 16;
let height = 16;
@@ -1172,6 +1311,7 @@ mod tests {
AssetsPayloadSource::from_bytes(data),
gfx_installer,
sound_installer,
scene_installer,
);
// Initially zero