add string over index
This commit is contained in:
@@ -627,6 +627,24 @@ 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();
|
||||
@@ -811,4 +829,36 @@ mod tests {
|
||||
assert!(banks.sound_bank_slot(5).is_some());
|
||||
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 mut data = vec![0u8; 256]; // pixels
|
||||
data.extend_from_slice(&[0u8; 2048]); // palette
|
||||
|
||||
let asset_entry = AssetEntry {
|
||||
asset_id: 10,
|
||||
asset_name: "my_tiles".to_string(),
|
||||
bank_type: BankType::TILES,
|
||||
offset: 0,
|
||||
size: data.len() as u64,
|
||||
decoded_size: data.len() as u64,
|
||||
codec: "RAW".to_string(),
|
||||
metadata: serde_json::json!({ "tile_size": 16, "width": 16, "height": 16 }),
|
||||
};
|
||||
|
||||
let preload = vec![
|
||||
PreloadEntry { asset_name: "my_tiles".to_string(), slot: 3 }
|
||||
];
|
||||
|
||||
let am = AssetManager::new(vec![], vec![], gfx_installer, sound_installer);
|
||||
am.initialize_for_cartridge(vec![asset_entry], preload, 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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -471,6 +471,54 @@ mod tests {
|
||||
assert_eq!(os.get_color(3), Color::from_raw(3));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_gfx_set_sprite_syscall_pops() {
|
||||
let mut os = PrometeuOS::new(None);
|
||||
let mut vm = VirtualMachine::default();
|
||||
let mut hw = Hardware::new();
|
||||
|
||||
// Push arguments in order 1 to 10
|
||||
vm.push(Value::String("mouse_cursor".to_string())); // arg1: assetName
|
||||
vm.push(Value::Int32(0)); // arg2: id
|
||||
|
||||
// Simulating touch.x and touch.y syscalls
|
||||
vm.push(Value::Int32(10)); // arg3: x (returned from syscall)
|
||||
vm.push(Value::Int32(20)); // arg4: y (returned from syscall)
|
||||
|
||||
vm.push(Value::Int32(0)); // arg5: tileId
|
||||
vm.push(Value::Int32(0)); // arg6: paletteId
|
||||
vm.push(Value::Boolean(true)); // arg7: active
|
||||
vm.push(Value::Boolean(false)); // arg8: flipX
|
||||
vm.push(Value::Boolean(false)); // arg9: flipY
|
||||
vm.push(Value::Int32(4)); // arg10: priority
|
||||
|
||||
let res = os.syscall(0x1007, &mut vm, &mut hw);
|
||||
assert!(res.is_ok(), "GfxSetSprite syscall should succeed, but got: {:?}", res.err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_gfx_set_sprite_with_swapped_arguments_repro() {
|
||||
let mut os = PrometeuOS::new(None);
|
||||
let mut vm = VirtualMachine::default();
|
||||
let mut hw = Hardware::new();
|
||||
|
||||
// Repro: what if the compiler is pushing in reverse order?
|
||||
vm.push(Value::Int32(4)); // arg10?
|
||||
vm.push(Value::Boolean(false));
|
||||
vm.push(Value::Boolean(false));
|
||||
vm.push(Value::Boolean(true));
|
||||
vm.push(Value::Int32(0));
|
||||
vm.push(Value::Int32(0));
|
||||
vm.push(Value::Int32(20));
|
||||
vm.push(Value::Int32(10));
|
||||
vm.push(Value::Int32(0));
|
||||
vm.push(Value::String("mouse_cursor".to_string())); // arg1?
|
||||
|
||||
let res = os.syscall(0x1007, &mut vm, &mut hw);
|
||||
assert!(res.is_err());
|
||||
assert_eq!(res.err().unwrap(), "Expected integer"); // Because it tries to pop priority but gets a string
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_syscall_log_write_and_rate_limit() {
|
||||
let mut os = PrometeuOS::new(None);
|
||||
@@ -650,18 +698,24 @@ impl NativeInterface for PrometeuOS {
|
||||
vm.push(Value::Null);
|
||||
Ok(200)
|
||||
}
|
||||
// gfx.set_sprite(id, x, y, tile_id, bank_id, palette_id, active, flip_x, flip_y, priority)
|
||||
// gfx.set_sprite(asset_name, id, x, y, tile_id, palette_id, active, flip_x, flip_y, priority)
|
||||
Syscall::GfxSetSprite => {
|
||||
let priority = vm.pop_integer()? as u8;
|
||||
let flip_y = vm.pop_integer()? != 0;
|
||||
let flip_x = vm.pop_integer()? != 0;
|
||||
let active = vm.pop_integer()? != 0;
|
||||
let palette_id = vm.pop_integer()? as u8;
|
||||
let bank_id = vm.pop_integer()? as u8;
|
||||
let tile_id = vm.pop_integer()? as u16;
|
||||
let y = vm.pop_integer()? as i32;
|
||||
let x = vm.pop_integer()? as i32;
|
||||
let index = vm.pop_integer()? as usize;
|
||||
let val = vm.pop()?;
|
||||
let asset_name = match val {
|
||||
Value::String(ref s) => s.clone(),
|
||||
_ => return Err(format!("Expected string asset_name in GfxSetSprite, but got {:?}", val).into()),
|
||||
};
|
||||
|
||||
let bank_id = hw.assets().find_slot_by_name(&asset_name, crate::model::BankType::TILES).unwrap_or(0);
|
||||
|
||||
if index < 512 {
|
||||
hw.gfx_mut().sprites[index] = crate::model::Sprite {
|
||||
@@ -747,7 +801,7 @@ impl NativeInterface for PrometeuOS {
|
||||
Ok(300)
|
||||
}
|
||||
|
||||
// audio.play(bank_id, sample_id, voice_id, volume, pan, pitch, loop_mode)
|
||||
// audio.play(asset_name, sample_id, voice_id, volume, pan, pitch, loop_mode)
|
||||
Syscall::AudioPlay => {
|
||||
let loop_mode = match vm.pop_integer()? {
|
||||
0 => crate::hardware::LoopMode::Off,
|
||||
@@ -758,7 +812,13 @@ impl NativeInterface for PrometeuOS {
|
||||
let volume = vm.pop_integer()? as u8;
|
||||
let voice_id = vm.pop_integer()? as usize;
|
||||
let sample_id = vm.pop_integer()? as u16;
|
||||
let bank_id = vm.pop_integer()? as u8;
|
||||
let val = vm.pop()?;
|
||||
let asset_name = match val {
|
||||
Value::String(ref s) => s.clone(),
|
||||
_ => return Err(format!("Expected string asset_name in AudioPlay, but got {:?}", val).into()),
|
||||
};
|
||||
|
||||
let bank_id = hw.assets().find_slot_by_name(&asset_name, crate::model::BankType::SOUNDS).unwrap_or(0);
|
||||
|
||||
hw.audio_mut().play(bank_id, sample_id, voice_id, volume, pan, pitch, 0, loop_mode);
|
||||
vm.push(Value::Null);
|
||||
|
||||
Reference in New Issue
Block a user