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

Fix issue with 16x16 sprites with more than 15 colours

Browse source
This commit is contained in:
Gwilym Inzani 2023-07-08 17:06:00 +01:00
parent 1eb0505e50
commit 682a63b055
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
agb-image-converter/src/lib.rs
View file

@ -183,6 +183,7 @@ fn include_gfx_from_config(
&mut optimiser, &mut optimiser,
&image, &image,
tile_size, tile_size,
tile_size,
config.transparent_colour(), config.transparent_colour(),
); );
@ -305,7 +306,13 @@ pub fn include_aseprite_inner(input: TokenStream) -> TokenStream {
); );
let image = Image::load_from_dyn_image(frame); let image = Image::load_from_dyn_image(frame);
add_to_optimiser(&mut optimiser, &image, 8, Some(transparent_colour)); add_to_optimiser(
&mut optimiser,
&image,
width as usize,
height as usize,
Some(transparent_colour),
);
images.push(image); images.push(image);
} }
} }
@ -413,19 +420,20 @@ fn convert_image(
fn add_to_optimiser( fn add_to_optimiser(
palette_optimiser: &mut palette16::Palette16Optimiser, palette_optimiser: &mut palette16::Palette16Optimiser,
image: &Image, image: &Image,
tile_size: usize, tile_width: usize,
tile_height: usize,
transparent_colour: Option<Colour>, transparent_colour: Option<Colour>,
) { ) {
let tiles_x = image.width / tile_size; let tiles_x = image.width / tile_width;
let tiles_y = image.height / tile_size; let tiles_y = image.height / tile_height;
for y in 0..tiles_y { for y in 0..tiles_y {
for x in 0..tiles_x { for x in 0..tiles_x {
let mut palette = palette16::Palette16::new(); let mut palette = palette16::Palette16::new();
for j in 0..tile_size { for j in 0..tile_height {
for i in 0..tile_size { for i in 0..tile_width {
let colour = image.colour(x * tile_size + i, y * tile_size + j); let colour = image.colour(x * tile_width + i, y * tile_height + j);
palette.add_colour(match (colour.is_transparent(), transparent_colour) { palette.add_colour(match (colour.is_transparent(), transparent_colour) {
(true, Some(transparent_colour)) => transparent_colour, (true, Some(transparent_colour)) => transparent_colour,
@ -460,7 +468,7 @@ fn palette_tile_data(
let mut tile_data = Vec::new(); let mut tile_data = Vec::new();
for (image_idx, image) in images.iter().enumerate() { for (image_idx, image) in images.iter().enumerate() {
add_image_to_tile_data(&mut tile_data, image, optimiser, image_idx) add_image_to_tile_data(&mut tile_data, image, optimiser, image_idx, true)
} }
let tile_data = collapse_to_4bpp(&tile_data); let tile_data = collapse_to_4bpp(&tile_data);
@ -482,6 +490,7 @@ fn add_image_to_tile_data(
image: &Image, image: &Image,
optimiser: &Palette16OptimisationResults, optimiser: &Palette16OptimisationResults,
assignment_offset: usize, assignment_offset: usize,
is_sprite: bool,
) { ) {
let tile_size = 8; let tile_size = 8;
let tiles_x = image.width / tile_size; let tiles_x = image.width / tile_size;
@ -489,7 +498,13 @@ fn add_image_to_tile_data(
for y in 0..tiles_y { for y in 0..tiles_y {
for x in 0..tiles_x { for x in 0..tiles_x {
let palette_index = optimiser.assignments[y * tiles_x + x + assignment_offset]; let assignment = if is_sprite {
assignment_offset
} else {
y * tiles_x + x + assignment_offset
};
let palette_index = optimiser.assignments[assignment];
let palette = &optimiser.optimised_palettes[palette_index]; let palette = &optimiser.optimised_palettes[palette_index];
for inner_y in 0..tile_size / 8 { for inner_y in 0..tile_size / 8 {

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

@ -47,7 +47,7 @@ pub(crate) fn generate_code(
let (tile_data, assignments) = if let Some(assignment_offset) = assignment_offset { let (tile_data, assignments) = if let Some(assignment_offset) = assignment_offset {
let mut tile_data = Vec::new(); let mut tile_data = Vec::new();
add_image_to_tile_data(&mut tile_data, image, results, assignment_offset); add_image_to_tile_data(&mut tile_data, image, results, assignment_offset, false);
let tile_data = collapse_to_4bpp(&tile_data); let tile_data = collapse_to_4bpp(&tile_data);