1 Commits

Author SHA1 Message Date
157e4d5937 Replace '{' with [ 2025-07-20 14:38:03 +02:00
8 changed files with 34 additions and 15 deletions

View File

@@ -1,3 +0,0 @@
CompileFlags:
Remove: [-fmodules-ts, -mno-shared, -mno-llsc, -march=r2000, -mtune=r2000, implied_comparison_category_type_not_found]
Compiler: mipsel-linux-gnu-g++

2
.gitignore vendored
View File

@@ -9,8 +9,6 @@
**/config **/config
.lfsconfig .lfsconfig
.cache
compile_commands.json
*.d *.d
*.a *.a

View File

@@ -11,7 +11,7 @@
{ {
"label": "build", "label": "build",
"type": "shell", "type": "shell",
"command": "${env:JABY_ENGINE_PATH}/scripts/podman_jaby_engine.sh ${workspaceFolder}:. bear -- make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region} CUSTOM_CONFIG=${input:custom config}", "command": "${env:JABY_ENGINE_PATH}/scripts/podman_jaby_engine.sh ${workspaceFolder}:. make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region} CUSTOM_CONFIG=${input:custom config}",
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": true "isDefault": true

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)

View File

@@ -224,7 +224,7 @@ namespace JabyEngine {
return Size::create(static_cast<T>(size.width), static_cast<T>(size.height)); return Size::create(static_cast<T>(size.width), static_cast<T>(size.height));
} }
bool operator<=>(const Size<T>&) const = default; auto operator<=>(const Size<T>&) const = default;
}; };
using SizeI8 = Size<int8_t>; using SizeI8 = Size<int8_t>;
using SizeU8 = Size<uint8_t>; using SizeU8 = Size<uint8_t>;

View File

@@ -19,13 +19,13 @@
{ {
"label": "make", "label": "make",
"type": "shell", "type": "shell",
"command": "../../scripts/podman_jaby_engine.sh ../../:src/Library bear --output ${workspaceFolder}/../../compile_commands.json -- make ${input:target} BUILD_PROFILE=${input:build cfg} PSX_TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}", "command": "../../scripts/podman_jaby_engine.sh ../../:src/Library make ${input:target} BUILD_PROFILE=${input:build cfg} PSX_TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}",
"group": "build" "group": "build"
}, },
{ {
"label": "make_all", "label": "make_all",
"type": "shell", "type": "shell",
"command": "../../scripts/podman_jaby_engine.sh ../../:src/Library bear --output ${workspaceFolder}/../../compile_commands.json -- make -f MakeAll.mk ${input:target prefix}_${input:target} BUILD_PROFILE=${input:build cfg} CUSTOM_CONFIG=${input:config options}", "command": "../../scripts/podman_jaby_engine.sh ../../:src/Library make -f MakeAll.mk ${input:target prefix}_${input:target} BUILD_PROFILE=${input:build cfg} CUSTOM_CONFIG=${input:config options}",
"group": "build" "group": "build"
} }
], ],
@@ -75,5 +75,29 @@
}, },
"settings": { "settings": {
"cmake.configureOnOpen": false, "cmake.configureOnOpen": false,
"C_Cpp.default.includePath": [
"include",
"../../include"
],
"C_Cpp.default.compilerPath": "",
"C_Cpp.default.cStandard": "c17",
"C_Cpp.default.cppStandard": "c++20",
"C_Cpp.default.intelliSenseMode": "linux-gcc-x86",
"C_Cpp.default.compilerArgs": [
],
"C_Cpp.default.defines": [
"JABYENGINE_PAL",
"__DEBUG_SPU_MMU__",
"__friends=public"
],
"files.exclude": {
"**/*.o": true,
"**/*.dep": true
},
"files.associations": {
"stdio.h": "c",
"TUTO0.C": "cpp",
"MAIN.C": "cpp"
}
} }
} }

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()));

View File

@@ -19,7 +19,7 @@
{ {
"label": "make", "label": "make",
"type": "shell", "type": "shell",
"command": "../../scripts/podman_jaby_engine.sh ${workspaceFolder}/..:src/FontWriter bear --output ${workspaceFolder}/../compile_commands.json -- make ${input:target} BUILD_PROFILE=${input:build cfg}", "command": "../../scripts/podman_jaby_engine.sh ${workspaceFolder}/..:src/FontWriter make ${input:target} BUILD_PROFILE=${input:build cfg}",
"group": "build" "group": "build"
} }
], ],