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

Refactor to use a builder pattern

Browse source
This commit is contained in:
Gwilym Kuiper 2021-06-05 17:45:21 +01:00
parent e2925eb917
commit c6b1c4b824
3 changed files with 58 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
agb-image-converter/Cargo.lock generated
View file

@ -19,6 +19,7 @@ name = "agb_image_converter"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"image", "image",
"typed-builder",
] ]
[[package]] [[package]]
@ -277,6 +278,24 @@ dependencies = [
"miniz_oxide 0.3.7", "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]] [[package]]
name = "rayon" name = "rayon"
version = "1.5.0" version = "1.5.0"
@ -314,6 +333,17 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" 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]] [[package]]
name = "tiff" name = "tiff"
version = "0.6.1" version = "0.6.1"
@ -325,6 +355,23 @@ dependencies = [
"weezl", "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]] [[package]]
name = "weezl" name = "weezl"
version = "0.1.5" version = "0.1.5"

1
agb-image-converter/Cargo.toml
View file

@ -8,3 +8,4 @@ description = "Library for converting graphics for use on the Game Boy Advance"
[dependencies] [dependencies]
image = "0.23.14" image = "0.23.14"
typed-builder = "0.9.0"

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

@ -2,6 +2,8 @@ use std::fs::File;
use std::io::BufWriter; use std::io::BufWriter;
use std::path::PathBuf; use std::path::PathBuf;
use typed_builder::TypedBuilder;
mod colour; mod colour;
mod image_loader; mod image_loader;
mod palette16; mod palette16;
@ -26,14 +28,16 @@ impl TileSize {
} }
} }
#[derive(TypedBuilder)]
pub struct ImageConverterConfig { pub struct ImageConverterConfig {
pub transparent_colour: Option<Colour>, #[builder(default, setter(strip_option))]
pub tile_size: TileSize, transparent_colour: Option<Colour>,
pub input_image: PathBuf, tile_size: TileSize,
pub output_file: PathBuf, input_image: PathBuf,
output_file: PathBuf,
} }
pub fn convert_image(settings: &ImageConverterConfig) { pub fn convert_image(settings: ImageConverterConfig) {
let image = Image::load_from_file(&settings.input_image); let image = Image::load_from_file(&settings.input_image);
let tile_size = settings.tile_size.to_size(); let tile_size = settings.tile_size.to_size();