Compare commits
3 Commits
topic/bg/f
...
9a5918f3f7
| Author | SHA1 | Date | |
|---|---|---|---|
| 9a5918f3f7 | |||
| 18ebf33e2c | |||
| d8065f6266 |
3
.clangd
Normal file
3
.clangd
Normal file
@@ -0,0 +1,3 @@
|
||||
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
2
.gitignore
vendored
@@ -9,6 +9,8 @@
|
||||
**/config
|
||||
|
||||
.lfsconfig
|
||||
.cache
|
||||
compile_commands.json
|
||||
|
||||
*.d
|
||||
*.a
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
{
|
||||
"label": "build",
|
||||
"type": "shell",
|
||||
"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}",
|
||||
"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}",
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -224,7 +224,7 @@ namespace JabyEngine {
|
||||
return Size::create(static_cast<T>(size.width), static_cast<T>(size.height));
|
||||
}
|
||||
|
||||
auto operator<=>(const Size<T>&) const = default;
|
||||
bool operator<=>(const Size<T>&) const = default;
|
||||
};
|
||||
using SizeI8 = Size<int8_t>;
|
||||
using SizeU8 = Size<uint8_t>;
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
{
|
||||
"label": "make",
|
||||
"type": "shell",
|
||||
"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}",
|
||||
"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}",
|
||||
"group": "build"
|
||||
},
|
||||
{
|
||||
"label": "make_all",
|
||||
"type": "shell",
|
||||
"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}",
|
||||
"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}",
|
||||
"group": "build"
|
||||
}
|
||||
],
|
||||
@@ -75,29 +75,5 @@
|
||||
},
|
||||
"settings": {
|
||||
"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"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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<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 {
|
||||
return Err(format!("Two values expected for Point but found {}", values.len()));
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
{
|
||||
"label": "make",
|
||||
"type": "shell",
|
||||
"command": "../../scripts/podman_jaby_engine.sh ${workspaceFolder}/..:src/FontWriter make ${input:target} BUILD_PROFILE=${input:build cfg}",
|
||||
"command": "../../scripts/podman_jaby_engine.sh ${workspaceFolder}/..:src/FontWriter bear --output ${workspaceFolder}/../compile_commands.json -- make ${input:target} BUILD_PROFILE=${input:build cfg}",
|
||||
"group": "build"
|
||||
}
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user