asset manager load by asset id and slot index
This commit is contained in:
@@ -110,7 +110,6 @@ impl<T> BankPolicy<T> {
|
||||
|
||||
pub struct AssetManager {
|
||||
assets: Arc<RwLock<HashMap<AssetId, AssetEntry>>>,
|
||||
name_to_id: Arc<RwLock<HashMap<String, AssetId>>>,
|
||||
handles: Arc<RwLock<HashMap<HandleId, LoadHandleInfo>>>,
|
||||
next_handle_id: Mutex<HandleId>,
|
||||
assets_data: Arc<RwLock<AssetsPayloadSource>>,
|
||||
@@ -153,8 +152,8 @@ impl AssetBridge for AssetManager {
|
||||
) {
|
||||
self.initialize_for_cartridge(assets, preload, assets_data)
|
||||
}
|
||||
fn load(&self, asset_name: &str, slot: SlotRef) -> Result<HandleId, AssetLoadError> {
|
||||
self.load(asset_name, slot)
|
||||
fn load(&self, asset_id: AssetId, slot_index: usize) -> Result<HandleId, AssetLoadError> {
|
||||
self.load(asset_id, slot_index)
|
||||
}
|
||||
fn status(&self, handle: HandleId) -> LoadStatus {
|
||||
self.status(handle)
|
||||
@@ -268,15 +267,12 @@ impl AssetManager {
|
||||
sound_installer: Arc<dyn SoundBankPoolInstaller>,
|
||||
) -> Self {
|
||||
let mut asset_map = HashMap::new();
|
||||
let mut name_to_id = HashMap::new();
|
||||
for entry in assets {
|
||||
name_to_id.insert(entry.asset_name.clone(), entry.asset_id);
|
||||
asset_map.insert(entry.asset_id, entry);
|
||||
}
|
||||
|
||||
Self {
|
||||
assets: Arc::new(RwLock::new(asset_map)),
|
||||
name_to_id: Arc::new(RwLock::new(name_to_id)),
|
||||
gfx_installer,
|
||||
sound_installer,
|
||||
gfx_slots: Arc::new(RwLock::new(std::array::from_fn(|_| None))),
|
||||
@@ -299,11 +295,8 @@ impl AssetManager {
|
||||
self.shutdown();
|
||||
{
|
||||
let mut asset_map = self.assets.write().unwrap();
|
||||
let mut name_to_id = self.name_to_id.write().unwrap();
|
||||
asset_map.clear();
|
||||
name_to_id.clear();
|
||||
for entry in assets.iter() {
|
||||
name_to_id.insert(entry.asset_name.clone(), entry.asset_id);
|
||||
asset_map.insert(entry.asset_id, entry.clone());
|
||||
}
|
||||
}
|
||||
@@ -381,21 +374,18 @@ impl AssetManager {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn load(&self, asset_name: &str, slot: SlotRef) -> Result<HandleId, AssetLoadError> {
|
||||
if slot.index >= 16 {
|
||||
pub fn load(&self, asset_id: AssetId, slot_index: usize) -> Result<HandleId, AssetLoadError> {
|
||||
if slot_index >= 16 {
|
||||
return Err(AssetLoadError::SlotIndexInvalid);
|
||||
}
|
||||
let entry = {
|
||||
let assets = self.assets.read().unwrap();
|
||||
let name_to_id = self.name_to_id.read().unwrap();
|
||||
let id = name_to_id.get(asset_name).ok_or(AssetLoadError::AssetNotFound)?;
|
||||
assets.get(id).ok_or(AssetLoadError::BackendError)?.clone()
|
||||
assets.get(&asset_id).ok_or(AssetLoadError::AssetNotFound)?.clone()
|
||||
};
|
||||
let slot = match entry.bank_type {
|
||||
BankType::TILES => SlotRef::gfx(slot_index),
|
||||
BankType::SOUNDS => SlotRef::audio(slot_index),
|
||||
};
|
||||
let asset_id = entry.asset_id;
|
||||
|
||||
if slot.asset_type != entry.bank_type {
|
||||
return Err(AssetLoadError::SlotKindMismatch);
|
||||
}
|
||||
|
||||
let mut next_id = self.next_handle_id.lock().unwrap();
|
||||
let handle_id = *next_id;
|
||||
@@ -1021,9 +1011,7 @@ mod tests {
|
||||
gfx_installer,
|
||||
sound_installer,
|
||||
);
|
||||
let slot = SlotRef::gfx(0);
|
||||
|
||||
let handle = am.load("test_tiles", slot).expect("Should start loading");
|
||||
let handle = am.load(0, 0).expect("Should start loading");
|
||||
|
||||
let mut status = am.status(handle);
|
||||
let start = Instant::now();
|
||||
@@ -1062,13 +1050,13 @@ mod tests {
|
||||
sound_installer,
|
||||
);
|
||||
|
||||
let handle1 = am.load("test_tiles", SlotRef::gfx(0)).unwrap();
|
||||
let handle1 = am.load(0, 0).unwrap();
|
||||
let start = Instant::now();
|
||||
while am.status(handle1) != LoadStatus::READY && start.elapsed().as_secs() < 5 {
|
||||
thread::sleep(std::time::Duration::from_millis(10));
|
||||
}
|
||||
|
||||
let handle2 = am.load("test_tiles", SlotRef::gfx(1)).unwrap();
|
||||
let handle2 = am.load(0, 1).unwrap();
|
||||
assert_eq!(am.status(handle2), LoadStatus::READY);
|
||||
|
||||
let staging = am.gfx_policy.staging.read().unwrap();
|
||||
@@ -1105,9 +1093,7 @@ mod tests {
|
||||
gfx_installer,
|
||||
sound_installer,
|
||||
);
|
||||
let slot = SlotRef::audio(0);
|
||||
|
||||
let handle = am.load("test_sound", slot).expect("Should start loading");
|
||||
let handle = am.load(1, 0).expect("Should start loading");
|
||||
|
||||
let start = Instant::now();
|
||||
while am.status(handle) != LoadStatus::READY && start.elapsed().as_secs() < 5 {
|
||||
@@ -1171,7 +1157,7 @@ mod tests {
|
||||
let am =
|
||||
AssetManager::new(vec![], AssetsPayloadSource::empty(), gfx_installer, sound_installer);
|
||||
|
||||
let result = am.load("missing", SlotRef::gfx(0));
|
||||
let result = am.load(999, 0);
|
||||
|
||||
assert_eq!(result, Err(AssetLoadError::AssetNotFound));
|
||||
}
|
||||
@@ -1189,29 +1175,11 @@ mod tests {
|
||||
sound_installer,
|
||||
);
|
||||
|
||||
let result = am.load("test_tiles", SlotRef::gfx(16));
|
||||
let result = am.load(0, 16);
|
||||
|
||||
assert_eq!(result, Err(AssetLoadError::SlotIndexInvalid));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_load_returns_slot_kind_mismatch() {
|
||||
let banks = Arc::new(MemoryBanks::new());
|
||||
let gfx_installer = Arc::clone(&banks) as Arc<dyn TileBankPoolInstaller>;
|
||||
let sound_installer = Arc::clone(&banks) as Arc<dyn SoundBankPoolInstaller>;
|
||||
let data = test_tile_asset_data();
|
||||
let am = AssetManager::new(
|
||||
vec![test_tile_asset_entry("test_tiles", 16, 16)],
|
||||
AssetsPayloadSource::from_bytes(data),
|
||||
gfx_installer,
|
||||
sound_installer,
|
||||
);
|
||||
|
||||
let result = am.load("test_tiles", SlotRef::audio(0));
|
||||
|
||||
assert_eq!(result, Err(AssetLoadError::SlotKindMismatch));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_status_returns_unknown_handle() {
|
||||
let banks = Arc::new(MemoryBanks::new());
|
||||
@@ -1239,7 +1207,7 @@ mod tests {
|
||||
assert_eq!(am.commit(999), AssetOpStatus::UnknownHandle);
|
||||
assert_eq!(am.cancel(999), AssetOpStatus::UnknownHandle);
|
||||
|
||||
let handle = am.load("test_tiles", SlotRef::gfx(0)).expect("load must allocate handle");
|
||||
let handle = am.load(0, 0).expect("load must allocate handle");
|
||||
let start = Instant::now();
|
||||
while am.status(handle) != LoadStatus::READY && start.elapsed().as_secs() < 5 {
|
||||
thread::sleep(std::time::Duration::from_millis(10));
|
||||
|
||||
Reference in New Issue
Block a user