jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Replace '{' with [

This commit is contained in:
jaby 2025-07-20 14:38:03 +02:00
parent f25548085f
commit 157e4d5937
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/PoolBox/assets/Makefile
View File

@ -30,10 +30,10 @@ INPUT += $(OUTPUT_DIR)/JabyTails.img
JabyTails_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS) JabyTails_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
INPUT += $(OUTPUT_DIR)/IMG_6921.tim 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 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 $(OUTPUT_DIR)/%.vag: audio/%.wav
@mkdir -p $(OUTPUT_DIR) @mkdir -p $(OUTPUT_DIR)

6
src/Tools/psxfileconv/src/images/args.rs
View File

@ -23,7 +23,7 @@ pub struct Point {
} }
impl 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 { impl std::default::Default for Point {
@ -34,7 +34,7 @@ impl std::default::Default for Point {
impl ToString for Point { impl ToString for Point {
fn to_string(&self) -> std::string::String { 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; type Err = String;
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
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 { if values.len() != 2 {
return Err(format!("Two values expected for Point but found {}", values.len())); return Err(format!("Two values expected for Point but found {}", values.len()));