From e6d56304e43f10846ce679536d77968babda5870 Mon Sep 17 00:00:00 2001 From: ashley Date: Thu, 2 Nov 2023 01:00:01 -0400 Subject: [PATCH] WIP - New metatile converter --- src/reskit/level/converter.rs | 25 ++++++++- src/reskit/level/dmapack.rs | 19 +++++++ src/reskit/level/mod.rs | 1 + src/reskit/level/system.rs | 97 ----------------------------------- 4 files changed, 43 insertions(+), 99 deletions(-) create mode 100644 src/reskit/level/dmapack.rs diff --git a/src/reskit/level/converter.rs b/src/reskit/level/converter.rs index 9ff8f3c..caad9cc 100644 --- a/src/reskit/level/converter.rs +++ b/src/reskit/level/converter.rs @@ -1,9 +1,10 @@ -use std::{error::Error, fs::read_to_string, path::Path, borrow::Cow, collections::HashSet}; +use std::{error::Error, fs::read_to_string, path::Path, borrow::Cow, collections::HashSet, convert::TryInto}; use euclid::default::Rect; use image::{DynamicImage, GenericImageView}; use linked_hash_map::LinkedHashMap; use roxmltree::Node; use crate::reskit::{utility::print_warning, cli::settings::TileOrder}; +use super::dmapack; #[derive(Debug)] pub struct TiledTilemap { @@ -22,6 +23,7 @@ pub struct Metatile { pub source: String, pub width: u16, pub height: u16, + pub pack: dmapack::PackSettings, pub tiles: Vec } @@ -268,6 +270,25 @@ pub fn get_metatile( id: u32, tileset: Node, working_directory: &str ) -> Result if let Some( extension ) = formatted_path.extension() { let extension = extension.to_string_lossy(); if extension == "tmx" { + // Before we discard tileset, obtain dmapack bucket and slot + let bucket: u16 = tileset.descendants() + .find( | node | node.tag_name() == "property".into() && node.attribute( "name" ) == Some( "reskit-dmapack-bucket" ) ) + .ok_or( "invalid file: no dmapack bucket specified for metatile" )? + .attribute( "value" ) + .ok_or( "invalid file: reskit-dmapack-bucket property has no value" )? + .parse()?; + let slot: Vec = tileset.descendants() + .find( | node | node.tag_name() == "property".into() && node.attribute( "name" ) == Some( "reskit-dmapack" ) ) + .ok_or( "invalid file: no dmapack slot specified for metatile" )? + .attribute( "value" ) + .ok_or( "invalid file: reskit-dmapack property has no value" )? + .split( "," ) + .map( | each | each.trim().parse::().expect( "fatal: non-u16 value specified for reskit-dmapack" ) ) + .collect(); + let slot: [u16; 2] = slot[0..2].try_into()?; + + let pack = dmapack::PackSettings { bucket, slot }; + // Case where source is a nested tileset. Open the .tmx file let file = read_to_string( full_path.clone() )?; let tmx_document = roxmltree::Document::parse( &file )?; @@ -301,7 +322,7 @@ pub fn get_metatile( id: u32, tileset: Node, working_directory: &str ) -> Result val - 1 } } ).collect(); - return Ok( Some( Metatile { id, source, width, height, tiles } ) ) + return Ok( Some( Metatile { id, source, width, height, pack, tiles } ) ) } } diff --git a/src/reskit/level/dmapack.rs b/src/reskit/level/dmapack.rs new file mode 100644 index 0000000..63dbb8f --- /dev/null +++ b/src/reskit/level/dmapack.rs @@ -0,0 +1,19 @@ +use std::{error::Error, collections::{HashSet, HashMap}}; +use super::converter::Metatile; + +#[derive(Debug, PartialEq)] +pub struct PackSettings { + pub bucket: u16, + pub slot: [u16; 2] +} + +pub type Bucket = Vec; + +pub fn get_buckets( metatiles: &Vec ) -> Result, Box> { + let mut buckets: HashMap = HashMap::new(); + + // Prepare buckets. Each bucket is exactly 64 tiles wide, and as tall as the largest + // height in the bucket. + + todo!() +} \ No newline at end of file diff --git a/src/reskit/level/mod.rs b/src/reskit/level/mod.rs index 0621a95..3c7a72d 100644 --- a/src/reskit/level/mod.rs +++ b/src/reskit/level/mod.rs @@ -1,3 +1,4 @@ pub mod converter; +pub mod dmapack; pub mod ecs; pub mod system; \ No newline at end of file diff --git a/src/reskit/level/system.rs b/src/reskit/level/system.rs index 3811e83..577148c 100644 --- a/src/reskit/level/system.rs +++ b/src/reskit/level/system.rs @@ -132,105 +132,8 @@ pub fn get_tiles( tilemap: &TiledTilemap ) -> Result<(Vec, Vec), Box Result, Box> { - // Assemble header of offsets (as we go) - let header_offset = ( tilemap.metatiles.len() * 2 ) + 2; - let mut header: Vec = vec![]; - - // Assemble definitions - let mut definitions: Vec = vec![]; - for metatile in &tilemap.metatiles { - let mut subdefinitions: Vec = vec![]; - subdefinitions.extend( metatile.width.to_be_bytes() ); - subdefinitions.extend( metatile.height.to_be_bytes() ); - - let ( tilemap_index, palettes ) = get_tilemap_prefix_palette( &metatile.source, &tilemap.tileset )?; - for tile in &metatile.tiles { - let palette = { - if *tile == 0 { - 0 - } else { - let palette = palettes.get( *tile as usize ).ok_or( "internal error: no correlation between tile index and palette index" )?; - if let Ok( palette ) = palette.ok_or( "" ) { - palette - } else { - println!( "{:?}", palettes ); - return Err( format!( "invalid file: tile \"{}\" in metatile tilemap does not name reskit-palette attribute", tile ) )?; - } - } - }; - - let nametable_entry: u16 = ( ( palette as u16 ) << 13 ) | ( ( tile + tilemap_index as u32 ) as u16 ); - subdefinitions.extend( nametable_entry.to_be_bytes() ); - } - - let this_offset = header_offset + definitions.len(); - header.extend( ( this_offset as u16 ).to_be_bytes() ); - - definitions.extend( subdefinitions ); - } - - // Assemble instances - let mut instances: Vec = vec![]; - - let layer_b: Option<&Layer> = tilemap.layers.iter().find( | layer | matches!( layer, Layer::Metatile { system_plane: SystemPlane::MdPlaneB, tiles: _ } ) ); - if let Some( layer_b ) = layer_b { - let tiles = match layer_b { Layer::Metatile { system_plane: _, tiles } => tiles }; - let mut subdefinitions: Vec = vec![]; - - for tile_y in 0..tilemap.height { - for tile_x in 0..tilemap.width { - let item_at = tiles.get( ( tile_y * tilemap.width ) + tile_x ).ok_or( "internal error: tilemap does not correlate to width/height" )?; - if *item_at != 0 { - // What index-ID was that? - let index_id = tilemap.metatiles.iter().position( | metatile | metatile.id == *item_at ).ok_or( "invalid file: metatile id not found" )?; - - // Write the data to subdefinitions - subdefinitions.extend( ( index_id as u16 ).to_be_bytes() ); - subdefinitions.extend( ( ( tile_x * 8 ) as u16 ).to_be_bytes() ); - subdefinitions.extend( ( ( tile_y * 8 ) as u16 ).to_be_bytes() ); - } - } - } - - instances.extend( ( ( subdefinitions.len() / 6 ) as u16 ).to_be_bytes() ); - instances.extend( subdefinitions ); - } else { - instances.extend( ( 0 as u16 ).to_be_bytes() ); - } - - let layer_a: Option<&Layer> = tilemap.layers.iter().find( | layer | matches!( layer, Layer::Metatile { system_plane: SystemPlane::MdPlaneA, tiles: _ } ) ); - if let Some( layer_a ) = layer_a { - let tiles = match layer_a { Layer::Metatile { system_plane: _, tiles } => tiles }; - let mut subdefinitions: Vec = vec![]; - - for tile_y in 0..tilemap.height { - for tile_x in 0..tilemap.width { - let item_at = tiles.get( ( tile_y * tilemap.width ) + tile_x ).ok_or( "internal error: tilemap does not correlate to width/height" )?; - if *item_at != 0 { - // What index-ID was that? - let index_id = tilemap.metatiles.iter().position( | metatile | metatile.id == *item_at ).ok_or( "invalid file: metatile id not found" )?; - - // Write the data to subdefinitions - subdefinitions.extend( ( index_id as u16 ).to_be_bytes() ); - subdefinitions.extend( ( ( tile_x * 8 ) as u16 ).to_be_bytes() ); - subdefinitions.extend( ( ( tile_y * 8 ) as u16 ).to_be_bytes() ); - } - } - } - - instances.extend( ( ( subdefinitions.len() / 6 ) as u16 ).to_be_bytes() ); - instances.extend( subdefinitions ); - } else { - instances.extend( ( 0 as u16 ).to_be_bytes() ); - } - // Write the final result let mut result: Vec = vec![]; - let offset_to_instances = header_offset + definitions.len(); - result.extend( ( offset_to_instances as u16 ).to_be_bytes() ); - result.extend( header ); - result.extend( definitions ); - result.extend( instances ); Ok( result ) }