assets loaded by bank id instead of name
This commit is contained in:
@@ -169,9 +169,6 @@ impl AssetBridge for AssetManager {
|
||||
fn slot_info(&self, slot: SlotRef) -> SlotStats {
|
||||
self.slot_info(slot)
|
||||
}
|
||||
fn find_slot_by_name(&self, asset_name: &str, kind: BankType) -> Option<u8> {
|
||||
self.find_slot_by_name(asset_name, kind)
|
||||
}
|
||||
fn shutdown(&self) {
|
||||
self.shutdown()
|
||||
}
|
||||
@@ -824,24 +821,6 @@ impl AssetManager {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn find_slot_by_name(&self, asset_name: &str, kind: BankType) -> Option<u8> {
|
||||
let asset_id = {
|
||||
let name_to_id = self.name_to_id.read().unwrap();
|
||||
*name_to_id.get(asset_name)?
|
||||
};
|
||||
|
||||
match kind {
|
||||
BankType::TILES => {
|
||||
let slots = self.gfx_slots.read().unwrap();
|
||||
slots.iter().position(|&s| s == Some(asset_id)).map(|p| p as u8)
|
||||
}
|
||||
BankType::SOUNDS => {
|
||||
let slots = self.sound_slots.read().unwrap();
|
||||
slots.iter().position(|&s| s == Some(asset_id)).map(|p| p as u8)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn shutdown(&self) {
|
||||
self.gfx_policy.clear();
|
||||
self.sound_policy.clear();
|
||||
@@ -1062,31 +1041,6 @@ mod tests {
|
||||
assert_eq!(am.slot_info(SlotRef::audio(5)).asset_id, Some(2));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_find_slot_by_name() {
|
||||
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 mut asset_entry = test_tile_asset_entry("my_tiles", data.len());
|
||||
asset_entry.asset_id = 10;
|
||||
|
||||
let preload = vec![PreloadEntry { asset_id: 10, slot: 3 }];
|
||||
|
||||
let am = AssetManager::new(
|
||||
vec![],
|
||||
AssetsPayloadSource::empty(),
|
||||
gfx_installer,
|
||||
sound_installer,
|
||||
);
|
||||
am.initialize_for_cartridge(vec![asset_entry], preload, AssetsPayloadSource::from_bytes(data));
|
||||
|
||||
assert_eq!(am.find_slot_by_name("my_tiles", BankType::TILES), Some(3));
|
||||
assert_eq!(am.find_slot_by_name("unknown", BankType::TILES), None);
|
||||
assert_eq!(am.find_slot_by_name("my_tiles", BankType::SOUNDS), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_load_returns_asset_not_found() {
|
||||
let banks = Arc::new(MemoryBanks::new());
|
||||
|
||||
Reference in New Issue
Block a user