added asset management
This commit is contained in:
@@ -410,7 +410,8 @@ mod tests {
|
||||
app_mode: AppMode::Game,
|
||||
entrypoint: "0".to_string(),
|
||||
program: rom,
|
||||
assets_path: None,
|
||||
assets: vec![],
|
||||
asset_table: vec![],
|
||||
};
|
||||
os.initialize_vm(&mut vm, &cartridge);
|
||||
|
||||
@@ -450,7 +451,8 @@ mod tests {
|
||||
app_mode: AppMode::Game,
|
||||
entrypoint: "0".to_string(),
|
||||
program: rom,
|
||||
assets_path: None,
|
||||
assets: vec![],
|
||||
asset_table: vec![],
|
||||
};
|
||||
os.initialize_vm(&mut vm, &cartridge);
|
||||
|
||||
@@ -860,6 +862,82 @@ impl NativeInterface for PrometeuOS {
|
||||
let level = vm.pop_integer()?;
|
||||
self.syscall_log_write(vm, level, tag, msg)
|
||||
}
|
||||
|
||||
// --- Asset Syscalls ---
|
||||
Syscall::AssetLoad => {
|
||||
let asset_id = match vm.pop()? {
|
||||
Value::String(s) => s,
|
||||
_ => return Err("Expected string asset_id".into()),
|
||||
};
|
||||
let asset_type_val = vm.pop_integer()? as u32;
|
||||
let slot_index = vm.pop_integer()? as usize;
|
||||
|
||||
let asset_type = match asset_type_val {
|
||||
0 => crate::model::BankType::TILES,
|
||||
_ => return Err("Invalid asset type".to_string()),
|
||||
};
|
||||
let slot = crate::model::SlotRef { asset_type, index: slot_index };
|
||||
|
||||
match hw.assets().load(&asset_id, slot) {
|
||||
Ok(handle) => {
|
||||
vm.push(Value::Int64(handle as i64));
|
||||
Ok(1000)
|
||||
}
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
Syscall::AssetStatus => {
|
||||
let handle = vm.pop_integer()? as u32;
|
||||
let status = hw.assets().status(handle);
|
||||
let status_val = match status {
|
||||
crate::model::LoadStatus::PENDING => 0,
|
||||
crate::model::LoadStatus::LOADING => 1,
|
||||
crate::model::LoadStatus::READY => 2,
|
||||
crate::model::LoadStatus::COMMITTED => 3,
|
||||
crate::model::LoadStatus::CANCELED => 4,
|
||||
crate::model::LoadStatus::ERROR => 5,
|
||||
};
|
||||
vm.push(Value::Int64(status_val));
|
||||
Ok(100)
|
||||
}
|
||||
Syscall::AssetCommit => {
|
||||
let handle = vm.pop_integer()? as u32;
|
||||
hw.assets().commit(handle);
|
||||
vm.push(Value::Null);
|
||||
Ok(100)
|
||||
}
|
||||
Syscall::AssetCancel => {
|
||||
let handle = vm.pop_integer()? as u32;
|
||||
hw.assets().cancel(handle);
|
||||
vm.push(Value::Null);
|
||||
Ok(100)
|
||||
}
|
||||
Syscall::BankInfo => {
|
||||
let asset_type_val = vm.pop_integer()? as u32;
|
||||
let asset_type = match asset_type_val {
|
||||
0 => crate::model::BankType::TILES,
|
||||
_ => return Err("Invalid asset type".to_string()),
|
||||
};
|
||||
let pool = hw.memory_banks().gfx.pool.read().unwrap();
|
||||
let info = hw.assets().bank_info(asset_type, &*pool);
|
||||
let json = serde_json::to_string(&info).unwrap_or_default();
|
||||
vm.push(Value::String(json));
|
||||
Ok(500)
|
||||
}
|
||||
Syscall::BankSlotInfo => {
|
||||
let slot_index = vm.pop_integer()? as usize;
|
||||
let asset_type_val = vm.pop_integer()? as u32;
|
||||
let asset_type = match asset_type_val {
|
||||
0 => crate::model::BankType::TILES,
|
||||
_ => return Err("Invalid asset type".to_string()),
|
||||
};
|
||||
let slot = crate::model::SlotRef { asset_type, index: slot_index };
|
||||
let pool = hw.memory_banks().gfx.pool.read().unwrap();
|
||||
let info = hw.assets().slot_info(slot, &*pool);
|
||||
let json = serde_json::to_string(&info).unwrap_or_default();
|
||||
vm.push(Value::String(json));
|
||||
Ok(500)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -41,6 +41,16 @@ pub enum Syscall {
|
||||
// Log
|
||||
LogWrite = 0x5001,
|
||||
LogWriteTag = 0x5002,
|
||||
|
||||
// Asset
|
||||
AssetLoad = 0x6001,
|
||||
AssetStatus = 0x6002,
|
||||
AssetCommit = 0x6003,
|
||||
AssetCancel = 0x6004,
|
||||
|
||||
// Bank
|
||||
BankInfo = 0x6101,
|
||||
BankSlotInfo = 0x6102,
|
||||
}
|
||||
|
||||
impl Syscall {
|
||||
@@ -74,6 +84,12 @@ impl Syscall {
|
||||
0x4007 => Some(Self::FsDelete),
|
||||
0x5001 => Some(Self::LogWrite),
|
||||
0x5002 => Some(Self::LogWriteTag),
|
||||
0x6001 => Some(Self::AssetLoad),
|
||||
0x6002 => Some(Self::AssetStatus),
|
||||
0x6003 => Some(Self::AssetCommit),
|
||||
0x6004 => Some(Self::AssetCancel),
|
||||
0x6101 => Some(Self::BankInfo),
|
||||
0x6102 => Some(Self::BankSlotInfo),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
@@ -140,6 +156,12 @@ impl Syscall {
|
||||
"fs.delete" => Some(Self::FsDelete),
|
||||
"log.write" => Some(Self::LogWrite),
|
||||
"log.writeTag" | "log.write_tag" => Some(Self::LogWriteTag),
|
||||
"asset.load" => Some(Self::AssetLoad),
|
||||
"asset.status" => Some(Self::AssetStatus),
|
||||
"asset.commit" => Some(Self::AssetCommit),
|
||||
"asset.cancel" => Some(Self::AssetCancel),
|
||||
"bank.info" => Some(Self::BankInfo),
|
||||
"bank.slotInfo" | "bank.slot_info" => Some(Self::BankSlotInfo),
|
||||
_ => {
|
||||
None
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user