Asset Entry Metadata Normalization Contract

This commit is contained in:
2026-04-09 08:25:37 +01:00
parent 9228fb1e29
commit 52d4a91c71
6 changed files with 110 additions and 138 deletions
+10 -17
View File
@@ -186,29 +186,22 @@ impl AssetManager {
fn decode_tile_bank_layout(
entry: &AssetEntry,
) -> Result<(TileSize, usize, usize, usize), String> {
let tile_size_val =
entry.metadata.get("tile_size").and_then(|v| v.as_u64()).ok_or("Missing tile_size")?;
let width =
entry.metadata.get("width").and_then(|v| v.as_u64()).ok_or("Missing width")? as usize;
let height =
entry.metadata.get("height").and_then(|v| v.as_u64()).ok_or("Missing height")? as usize;
let palette_count = entry
.metadata
.get("palette_count")
.and_then(|v| v.as_u64())
.ok_or("Missing palette_count")? as usize;
let meta = entry.metadata_as_tiles()?;
let tile_size = match tile_size_val {
let tile_size = match meta.tile_size {
8 => TileSize::Size8,
16 => TileSize::Size16,
32 => TileSize::Size32,
_ => return Err(format!("Invalid tile_size: {}", tile_size_val)),
_ => return Err(format!("Invalid tile_size: {}", meta.tile_size)),
};
if palette_count != TILE_BANK_PALETTE_COUNT_V1 {
return Err(format!("Invalid palette_count: {}", palette_count));
if meta.palette_count as usize != TILE_BANK_PALETTE_COUNT_V1 {
return Err(format!("Invalid palette_count: {}", meta.palette_count));
}
let width = meta.width as usize;
let height = meta.height as usize;
let logical_pixels = width.checked_mul(height).ok_or("TileBank dimensions overflow")?;
let serialized_pixel_bytes = logical_pixels.div_ceil(2);
let serialized_size = serialized_pixel_bytes
@@ -637,8 +630,8 @@ impl AssetManager {
entry: &AssetEntry,
buffer: &[u8],
) -> Result<SoundBank, String> {
let sample_rate =
entry.metadata.get("sample_rate").and_then(|v| v.as_u64()).unwrap_or(44100) as u32;
let meta = entry.metadata_as_sounds()?;
let sample_rate = meta.sample_rate;
let mut data = Vec::with_capacity(buffer.len() / 2);
for i in (0..buffer.len()).step_by(2) {
+37
View File
@@ -24,6 +24,43 @@ pub struct AssetEntry {
pub metadata: serde_json::Value,
}
#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct TilesMetadata {
pub tile_size: u32,
pub width: u32,
pub height: u32,
pub palette_count: u32,
}
#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct SoundsMetadata {
pub sample_rate: u32,
}
impl AssetEntry {
pub fn metadata_as_tiles(&self) -> Result<TilesMetadata, String> {
if self.bank_type != BankType::TILES {
return Err(format!(
"Asset {} is not a TILES bank (type: {:?})",
self.asset_id, self.bank_type
));
}
serde_json::from_value(self.metadata.clone())
.map_err(|e| format!("Invalid TILES metadata for asset {}: {}", self.asset_id, e))
}
pub fn metadata_as_sounds(&self) -> Result<SoundsMetadata, String> {
if self.bank_type != BankType::SOUNDS {
return Err(format!(
"Asset {} is not a SOUNDS bank (type: {:?})",
self.asset_id, self.bank_type
));
}
serde_json::from_value(self.metadata.clone())
.map_err(|e| format!("Invalid SOUNDS metadata for asset {}: {}", self.asset_id, e))
}
}
#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct PreloadEntry {
pub asset_id: AssetId,