alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 00:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Finalize the code generation

Browse source
This commit is contained in:
Gwilym Kuiper 2021-07-26 23:38:22 +01:00
parent 3626e2cb18
commit 0796247a2e
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
agb-image-converter/src/rust_generator.rs
View file

@ -24,7 +24,8 @@ pub(crate) fn generate_code(
.into_iter() .into_iter()
.map(|colour| colour.to_rgb15()) .map(|colour| colour.to_rgb15())
.chain(iter::repeat(0)) .chain(iter::repeat(0))
.take(16); .take(16)
.map(|colour| colour as u16);
quote! { quote! {
#crate_prefix::display::palette16::Palette16::new([ #crate_prefix::display::palette16::Palette16::new([
@ -48,7 +49,7 @@ pub(crate) fn generate_code(
for inner_y in 0..tile_size / 8 { for inner_y in 0..tile_size / 8 {
for inner_x in 0..tile_size / 8 { for inner_x in 0..tile_size / 8 {
for j in inner_y * 8..inner_y * 8 + 8 { for j in inner_y * 8..inner_y * 8 + 8 {
for i in inner_x * 8..inner_x * 8 + 8 { for i in (inner_x * 8..inner_x * 8 + 8).rev() {
let colour = image.colour(x * tile_size + i, y * tile_size + j); let colour = image.colour(x * tile_size + i, y * tile_size + j);
tile_data.push(palette.colour_index(colour)); tile_data.push(palette.colour_index(colour));
} }
@ -58,7 +59,10 @@ pub(crate) fn generate_code(
} }
} }
let assignments = &results.assignments; let tile_data = tile_data.chunks(8)
.map(|chunk| chunk.iter().fold(0u32, |acc, &x| (acc << 4) | (x as u32)));
let assignments = results.assignments.iter().map(|&x| x as u8);
quote! { quote! {
#[allow(non_upper_case_globals)] #[allow(non_upper_case_globals)]