diff --git a/crates/tools/pbxgen-stress/src/lib.rs b/crates/tools/pbxgen-stress/src/lib.rs index 611689f0..ff4b2c66 100644 --- a/crates/tools/pbxgen-stress/src/lib.rs +++ b/crates/tools/pbxgen-stress/src/lib.rs @@ -25,6 +25,9 @@ use std::fs; use std::mem::size_of; use std::path::PathBuf; +const STRESS_GLYPH_ASSET_ID: AssetId = 100; +const STRESS_SCENE_ASSET_ID: AssetId = 1; + fn asm(s: &str) -> Vec { assemble(s).expect("assemble") } @@ -224,7 +227,7 @@ fn build_assets_pack() -> Result> { let scene = build_scene_bank(); let scene_payload = encode_scene_payload(&scene); let scene_entry = AssetEntry { - asset_id: 1, + asset_id: STRESS_SCENE_ASSET_ID, asset_name: "stress_scene".into(), bank_type: BankType::SCENE, offset: glyph_payload.len() as u64, @@ -235,8 +238,10 @@ fn build_assets_pack() -> Result> { }; let asset_table = vec![glyph_entry, scene_entry]; - let preload = - vec![PreloadEntry { asset_id: 0, slot: 0 }, PreloadEntry { asset_id: 1, slot: 0 }]; + let preload = vec![ + PreloadEntry { asset_id: STRESS_GLYPH_ASSET_ID, slot: 0 }, + PreloadEntry { asset_id: STRESS_SCENE_ASSET_ID, slot: 0 }, + ]; let payload_len = glyph_payload.len() + scene_payload.len(); let header = serde_json::to_vec(&AssetsPackHeader { asset_table, preload })?; let payload_offset = (ASSETS_PA_PRELUDE_SIZE + header.len()) as u64; @@ -264,7 +269,7 @@ fn build_glyph_asset() -> (AssetEntry, Vec) { payload.extend_from_slice(&build_palette_bytes()); let entry = AssetEntry { - asset_id: 0, + asset_id: STRESS_GLYPH_ASSET_ID, asset_name: "stress_square".into(), bank_type: BankType::GLYPH, offset: 0, @@ -339,7 +344,7 @@ fn build_scene_bank() -> SceneBank { SceneLayer { active: true, - glyph_asset_id: 100, + glyph_asset_id: STRESS_GLYPH_ASSET_ID, tile_size: TileSize::Size8, parallax_factor: match layer_index { 0 => ParallaxFactor { x: 1.0, y: 1.0 }, @@ -431,8 +436,12 @@ mod tests { assert_eq!(header.asset_table.len(), 2); assert_eq!(header.preload.len(), 2); + assert_eq!(header.asset_table[0].asset_id, STRESS_GLYPH_ASSET_ID); + assert_eq!(header.asset_table[1].asset_id, STRESS_SCENE_ASSET_ID); assert_eq!(header.asset_table[0].bank_type, BankType::GLYPH); assert_eq!(header.asset_table[1].bank_type, BankType::SCENE); + assert_eq!(header.preload[0].asset_id, STRESS_GLYPH_ASSET_ID); + assert_eq!(header.preload[1].asset_id, STRESS_SCENE_ASSET_ID); assert_eq!(header.preload[0].slot, 0); assert_eq!(header.preload[1].slot, 0); assert_eq!(header.asset_table[0].offset, 0); diff --git a/test-cartridges/stress-console/assets.pa b/test-cartridges/stress-console/assets.pa index 77c82efc..ca43164c 100644 Binary files a/test-cartridges/stress-console/assets.pa and b/test-cartridges/stress-console/assets.pa differ