From 157e4d5937361a29ccbd533fc957fdba6d4f8d7b Mon Sep 17 00:00:00 2001 From: jaby Date: Sun, 20 Jul 2025 14:38:03 +0200 Subject: [PATCH] Replace '{' with [ --- examples/PoolBox/assets/Makefile | 4 ++-- src/Tools/psxfileconv/src/images/args.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile index bd803e61..63b18bac 100644 --- a/examples/PoolBox/assets/Makefile +++ b/examples/PoolBox/assets/Makefile @@ -30,10 +30,10 @@ INPUT += $(OUTPUT_DIR)/JabyTails.img JabyTails_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS) INPUT += $(OUTPUT_DIR)/IMG_6921.tim -IMG_6921_TIM_FLAGS = tim full16 --clut-pos {384,255} --tex-pos {384,256} +IMG_6921_TIM_FLAGS = tim full16 --clut-pos [384,255] --tex-pos [384,256] INPUT += $(OUTPUT_DIR)/AllTheJaby.tim -AllTheJaby_TIM_FLAGS = tim full16 --tex-pos {0,0} +AllTheJaby_TIM_FLAGS = tim full16 --tex-pos [0,0] $(OUTPUT_DIR)/%.vag: audio/%.wav @mkdir -p $(OUTPUT_DIR) diff --git a/src/Tools/psxfileconv/src/images/args.rs b/src/Tools/psxfileconv/src/images/args.rs index 7ffbf402..a86c2ff0 100644 --- a/src/Tools/psxfileconv/src/images/args.rs +++ b/src/Tools/psxfileconv/src/images/args.rs @@ -23,7 +23,7 @@ pub struct Point { } impl Point { - pub const POINT_VALUE_NAME:&'static str = "{x,y}"; + pub const POINT_VALUE_NAME:&'static str = "[x,y]"; } impl std::default::Default for Point { @@ -34,7 +34,7 @@ impl std::default::Default for Point { impl ToString for Point { fn to_string(&self) -> std::string::String { - "{0,0}".to_owned() + "[0,0]".to_owned() } } @@ -42,7 +42,7 @@ impl FromStr for Point { type Err = String; fn from_str(s: &str) -> Result { - let values:Vec<&str> = s.split(&['{', ',', '}']).filter_map(|value| if value.is_empty() {None} else {Some(value)}).collect(); + let values:Vec<&str> = s.split(&['[', ',', ']']).filter_map(|value| if value.is_empty() {None} else {Some(value)}).collect(); if values.len() != 2 { return Err(format!("Two values expected for Point but found {}", values.len()));