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

Remove the definition of transparent colour from image

Browse source
This commit is contained in:
Gwilym Kuiper 2022-10-08 16:44:26 +01:00
parent 89af366b7a
commit 1a51b3b502
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
agb-image-converter/src/config.rs
View file

@ -28,7 +28,6 @@ pub(crate) trait Config {
pub(crate) trait Image { pub(crate) trait Image {
fn filename(&self) -> String; fn filename(&self) -> String;
fn transparent_colour(&self) -> Option<Colour>;
fn tilesize(&self) -> TileSize; fn tilesize(&self) -> TileSize;
fn colours(&self) -> Colours; fn colours(&self) -> Colours;
} }
@ -65,7 +64,7 @@ impl Config for ConfigV1 {
return Some(*colour); return Some(*colour);
} }
self.images() self.image
.values() .values()
.flat_map(|image| image.transparent_colour()) .flat_map(|image| image.transparent_colour())
.next() .next()
@ -85,12 +84,6 @@ impl Image for ImageV1 {
self.filename.clone() self.filename.clone()
} }
fn transparent_colour(&self) -> Option<Colour> {
self.transparent_colour
.as_ref()
.map(|colour| colour.parse().unwrap())
}
fn tilesize(&self) -> TileSize { fn tilesize(&self) -> TileSize {
self.tile_size.into() self.tile_size.into()
} }
@ -104,6 +97,14 @@ impl Image for ImageV1 {
} }
} }
impl ImageV1 {
fn transparent_colour(&self) -> Option<Colour> {
self.transparent_colour
.as_ref()
.map(|colour| colour.parse().unwrap())
}
}
#[derive(Deserialize, Clone, Copy)] #[derive(Deserialize, Clone, Copy)]
pub enum TileSizeV1 { pub enum TileSizeV1 {
#[serde(rename = "8x8")] #[serde(rename = "8x8")]