Merge pull request #45 from gwilymk/allow-agb-image-converter-to-be-used-in-any-crate

Allow agb image converter to be used in any crate
This commit is contained in:
Corwin 2021-06-05 17:53:39 +01:00 committed by GitHub
commit 7a97591432
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 70 additions and 8 deletions

View file

@ -19,6 +19,7 @@ name = "agb_image_converter"
version = "0.1.0"
dependencies = [
"image",
"typed-builder",
]
[[package]]
@ -277,6 +278,24 @@ dependencies = [
"miniz_oxide 0.3.7",
]
[[package]]
name = "proc-macro2"
version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
dependencies = [
"unicode-xid",
]
[[package]]
name = "quote"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rayon"
version = "1.5.0"
@ -314,6 +333,17 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "syn"
version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]]
name = "tiff"
version = "0.6.1"
@ -325,6 +355,23 @@ dependencies = [
"weezl",
]
[[package]]
name = "typed-builder"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "345426c7406aa355b60c5007c79a2d1f5b605540072795222f17f6443e6a9c6f"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "unicode-xid"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
[[package]]
name = "weezl"
version = "0.1.5"

View file

@ -7,4 +7,5 @@ license = "MPL-2.0"
description = "Library for converting graphics for use on the Game Boy Advance"
[dependencies]
image = "0.23.14"
image = "0.23.14"
typed-builder = "0.9.0"

View file

@ -2,6 +2,8 @@ use std::fs::File;
use std::io::BufWriter;
use std::path::PathBuf;
use typed_builder::TypedBuilder;
mod colour;
mod image_loader;
mod palette16;
@ -26,14 +28,19 @@ impl TileSize {
}
}
#[derive(TypedBuilder)]
pub struct ImageConverterConfig {
pub transparent_colour: Option<Colour>,
pub tile_size: TileSize,
pub input_image: PathBuf,
pub output_file: PathBuf,
#[builder(default, setter(strip_option))]
transparent_colour: Option<Colour>,
tile_size: TileSize,
input_image: PathBuf,
output_file: PathBuf,
#[builder(default, setter(strip_option))]
crate_prefix: Option<String>,
}
pub fn convert_image(settings: &ImageConverterConfig) {
pub fn convert_image(settings: ImageConverterConfig) {
let image = Image::load_from_file(&settings.input_image);
let tile_size = settings.tile_size.to_size();
@ -52,6 +59,7 @@ pub fn convert_image(settings: &ImageConverterConfig) {
&optimisation_results,
&image,
settings.tile_size,
settings.crate_prefix.unwrap_or("agb".to_owned()),
)
.expect("Failed to write data");
}

View file

@ -10,14 +10,20 @@ pub(crate) fn generate_code(
results: &Palette16OptimisationResults,
image: &Image,
tile_size: TileSize,
crate_prefix: String,
) -> io::Result<()> {
writeln!(
output,
"pub const PALETTE_DATA: &[crate::display::palette16::Palette16] = &[",
"pub const PALETTE_DATA: &[{}::display::palette16::Palette16] = &[",
crate_prefix,
)?;
for palette in &results.optimised_palettes {
write!(output, " crate::display::palette16::Palette16::new([")?;
write!(
output,
" {}::display::palette16::Palette16::new([",
crate_prefix
)?;
for colour in palette.clone() {
write!(output, "0x{:08x}, ", colour.to_rgb15())?;