From 542669470adbf0b59558f41fbb897d789e40141c Mon Sep 17 00:00:00 2001 From: jaby Date: Sun, 29 Dec 2024 14:43:06 +0100 Subject: [PATCH] Make clut and texture pos optional --- src/Tools/psxfileconv/Cargo.toml | 2 +- src/Tools/psxfileconv/src/images/args.rs | 6 ++++++ src/Tools/psxfileconv/src/images/tim/mod.rs | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Tools/psxfileconv/Cargo.toml b/src/Tools/psxfileconv/Cargo.toml index 3b6a2079..ee4b3b20 100644 --- a/src/Tools/psxfileconv/Cargo.toml +++ b/src/Tools/psxfileconv/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "psxfileconv" -version = "0.8.5" +version = "0.8.6" edition = "2021" [profile.release] diff --git a/src/Tools/psxfileconv/src/images/args.rs b/src/Tools/psxfileconv/src/images/args.rs index 166b0c27..b4849a95 100644 --- a/src/Tools/psxfileconv/src/images/args.rs +++ b/src/Tools/psxfileconv/src/images/args.rs @@ -32,6 +32,12 @@ impl std::default::Default for Point { } } +impl ToString for Point { + fn to_string(&self) -> std::string::String { + "{0,0}".to_owned() + } +} + impl FromStr for Point { type Err = String; diff --git a/src/Tools/psxfileconv/src/images/tim/mod.rs b/src/Tools/psxfileconv/src/images/tim/mod.rs index 20a67f59..d08ad1a0 100644 --- a/src/Tools/psxfileconv/src/images/tim/mod.rs +++ b/src/Tools/psxfileconv/src/images/tim/mod.rs @@ -11,10 +11,10 @@ pub struct Arguments { #[clap(flatten)] global: super::args::Arguments, - #[clap(long, value_parser, value_name = Point::POINT_VALUE_NAME)] + #[clap(long, value_parser, default_value_t, value_name = Point::POINT_VALUE_NAME)] clut_pos: Point, - #[clap(long, value_parser, value_name = Point::POINT_VALUE_NAME)] + #[clap(long, value_parser, default_value_t, value_name = Point::POINT_VALUE_NAME)] tex_pos: Point, }