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

Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
Conversation 0 Commits 595 Files Changed 361 +86 -86
20 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2aca10953d - Show all commits

8
examples/PoolBox/assets/Makefile
View File

@ -40,19 +40,19 @@ JabyTails_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
$(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv $< -o $@ xa
fileconv $< -o $@ xa
$(OUTPUT_DIR)/%.vag: audio/temp/%.wav
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv --lz4 $< -o $@ vag
fileconv --lz4 $< -o $@ vag
$(OUTPUT_DIR)/%.xa: audio/%.wav
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv $< -o $@ xa
fileconv $< -o $@ xa
$(OUTPUT_DIR)/%.img: %.png
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv --lz4 $< -o $@ $($*_FLAGS)
fileconv --lz4 $< -o $@ $($*_FLAGS)
all: $(INPUT)

6
src/Library/Makefile
View File

@ -33,13 +33,13 @@ $(LIB_DIR)/$(ARTIFACT).a: $(TARGET).a
@mkdir -p $(LIB_DIR)
cp $(TARGET).a $(LIB_DIR)/$(ARTIFACT).a
# Improve later
# TODO: Improve later
# rule to make the boot image
$(SPLASH_IMAGE): ressources/Splash.png
jaby_engine_fconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@
fileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@
$(SPLASH_IMAGE_NTSC): ressources/Splash_ntsc.png
jaby_engine_fconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@
fileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@
#Rules section for default compilation and linking
all: $(SPLASH_IMAGE) $(SPLASH_IMAGE_NTSC) $(LIB_DIR)/$(ARTIFACT).a

2
src/Tools/Makefile
View File

@ -1,4 +1,4 @@
PROJECTS = cpp_out jaby_engine_fconv mkoverlay psxcdgen_ex psxreadmap wslpath
PROJECTS = cpp_out fileconv mkoverlay psxcdgen_ex psxreadmap wslpath
.PHONY: $(PROJECTS)
$(foreach var,$(PROJECTS),$(var)):

6
src/Tools/Tests/Test.mk
View File

@ -4,7 +4,7 @@ test_cpp_out: always
@echo "Planschbecken" | ./../cpp_out/target/x86_64-unknown-linux-gnu/release/cpp_out --name Dino -o "Test_Planschbecken.cpp"
@echo "Planschbecken" | ./../cpp_out/target/x86_64-unknown-linux-gnu/release/cpp_out --name Dino -o "Test_Planschbecken.hpp"
test_jaby_engine_fconv: always
# @./../jaby_engine_fconv/target/x86_64-unknown-linux-musl/release/jaby_engine_fconv -o Test_Planschi.bin Test_PNG.PNG simple-tim full16
@./../jaby_engine_fconv/target/x86_64-unknown-linux-gnu/release/jaby_engine_fconv --lz4 -o Test_Planschi.bin ../../Library/ressources/Splash.PNG simple-tim full16
test_fileconv: always
# @./../fileconv/target/x86_64-unknown-linux-musl/release/fileconv -o Test_Planschi.bin Test_PNG.PNG simple-tim full16
@./../fileconv/target/x86_64-unknown-linux-gnu/release/fileconv --lz4 -o Test_Planschi.bin ../../Library/ressources/Splash.PNG simple-tim full16
always: ;

140
src/Tools/Tools.code-workspace
View File

@ -1,73 +1,73 @@
{
"folders": [
{
"path": "."
}
],
"settings": {
"cargo_task": [
"./ all!Unix: All",
"cpp_out all!Unix: cpp_out",
"jaby_engine_fconv all!Unix: jaby_engine_fconv",
"mkoverlay all!Unix: mkoverlay",
"psxcdgen_ex all!Unix: psxcdgen_ex",
"psxcdread all!Unix: psxcdread",
"psxreadmap all!Unix: psxreadmap",
"wslpath all!Unix: wslpath",
"folders": [
{
"path": "."
}
],
"settings": {
"cargo_task": [
"./ all!Unix: All",
"cpp_out all!Unix: cpp_out",
"fileconv all!Unix: fileconv",
"mkoverlay all!Unix: mkoverlay",
"psxcdgen_ex all!Unix: psxcdgen_ex",
"psxcdread all!Unix: psxcdread",
"psxreadmap all!Unix: psxreadmap",
"wslpath all!Unix: wslpath",
"./ all-windows!Windows: All",
"cpp_out all-windows!Windows: cpp_out",
"jaby_engine_fconv all-windows!Windows: jaby_engine_fconv",
"mkoverlay all-windows!Windows: mkoverlay",
"psxcdgen_ex all-windows!Windows: psxcdgen_ex",
"psxcdread all-windows!Windows: psxcdread",
"psxreadmap all-windows!Windows: psxreadmap",
"wslpath all-windows!Windows: wslpath"
]
},
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "cargo",
"type": "shell",
"group": {
"kind": "build"
},
"windows": {
"command": "wsl --shell-type login make -C ${input:windows_cargo_task} CARGO_CMD=${input:cargo cmd} BUILD_PROFILE=${input:build cfg}"
},
"linux": {
"command": "make -C ${input:linux_cargo_task} BUILD_PROFILE=${input:build cfg}"
},
"problemMatcher": []
}
],
"inputs": [
{
"id": "windows_cargo_task",
"type": "command",
"command": "shellCommand.execute",
"args": {
"command": "powershell",
"commandArgs": ["-command", "'${config:cargo_task}'.Replace(',',\"`n\")"],
"fieldSeparator": "!"
}
},
{
"id": "build cfg",
"type": "pickString",
"options": ["debug", "release"],
"default": "release",
"description": "build configuration"
},
{
"id": "cargo cmd",
"type":"pickString",
"options": ["build", "check", "update", "clean", "run", "tree"],
"default": "build",
"description": "cargo command to run"
}
]
}
"./ all-windows!Windows: All",
"cpp_out all-windows!Windows: cpp_out",
"fileconv all-windows!Windows: fileconv",
"mkoverlay all-windows!Windows: mkoverlay",
"psxcdgen_ex all-windows!Windows: psxcdgen_ex",
"psxcdread all-windows!Windows: psxcdread",
"psxreadmap all-windows!Windows: psxreadmap",
"wslpath all-windows!Windows: wslpath"
]
},
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "cargo",
"type": "shell",
"group": {
"kind": "build"
},
"windows": {
"command": "wsl --shell-type login make -C ${input:windows_cargo_task} CARGO_CMD=${input:cargo cmd} BUILD_PROFILE=${input:build cfg}"
},
"linux": {
"command": "make -C ${input:linux_cargo_task} BUILD_PROFILE=${input:build cfg}"
},
"problemMatcher": []
}
],
"inputs": [
{
"id": "windows_cargo_task",
"type": "command",
"command": "shellCommand.execute",
"args": {
"command": "powershell",
"commandArgs": ["-command", "'${config:cargo_task}'.Replace(',',\"`n\")"],
"fieldSeparator": "!"
}
},
{
"id": "build cfg",
"type": "pickString",
"options": ["debug", "release"],
"default": "release",
"description": "build configuration"
},
{
"id": "cargo cmd",
"type":"pickString",
"options": ["build", "check", "update", "clean", "run", "tree"],
"default": "build",
"description": "cargo command to run"
}
]
}
}

2
src/Tools/jaby_engine_fconv/Cargo.toml → src/Tools/fileconv/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "jaby_engine_fconv"
name = "fileconv"
version = "0.5.0"
edition = "2021"

2
src/Tools/jaby_engine_fconv/Makefile → src/Tools/fileconv/Makefile
View File

@ -1,6 +1,6 @@
include ../Common.mk
ARTIFACT = jaby_engine_fconv
ARTIFACT = fileconv
.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
$(WINDOWS_ARTIFACT):

0
src/Tools/jaby_engine_fconv/src/audio/mod.rs → src/Tools/fileconv/src/audio/mod.rs
View File

0
src/Tools/jaby_engine_fconv/src/audio/vag/mod.rs → src/Tools/fileconv/src/audio/vag/mod.rs
View File

0
src/Tools/jaby_engine_fconv/src/audio/xa/mod.rs → src/Tools/fileconv/src/audio/xa/mod.rs
View File

0
src/Tools/jaby_engine_fconv/src/images/mod.rs → src/Tools/fileconv/src/images/mod.rs
View File

0
src/Tools/jaby_engine_fconv/src/images/reduced_tim/color_clut.rs → src/Tools/fileconv/src/images/reduced_tim/color_clut.rs
View File

0
src/Tools/jaby_engine_fconv/src/images/reduced_tim/color_full16.rs → src/Tools/fileconv/src/images/reduced_tim/color_full16.rs
View File

0
src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs → src/Tools/fileconv/src/images/reduced_tim/mod.rs
View File

0
src/Tools/jaby_engine_fconv/src/images/reduced_tim/types.rs → src/Tools/fileconv/src/images/reduced_tim/types.rs
View File

0
src/Tools/jaby_engine_fconv/src/lib.rs → src/Tools/fileconv/src/lib.rs
View File

2
src/Tools/jaby_engine_fconv/src/main.rs → src/Tools/fileconv/src/main.rs
View File

@ -1,5 +1,5 @@
use clap::{Parser, Subcommand};
use jaby_engine_fconv::{audio::*, images::*, nothing};
use fileconv::{audio::*, images::*, nothing};
use std::path::PathBuf;
use tool_helper::{exit_with_error, print_warning, Error};

0
src/Tools/jaby_engine_fconv/src/nothing/mod.rs → src/Tools/fileconv/src/nothing/mod.rs
View File

2
support/src/FontWriter/Makefile
View File

@ -21,7 +21,7 @@ LIB_OBJS = $(filter-out $(MAIN_BOOT_OBJ) $(OVERLAY_BOOT_OBJ),$(OBJS))
#$(info $$var2 is [${LIB_OBJS}])
$(DEFAULT_FONT_IMAGE): ressources/DefaultFont.png
jaby_engine_fconv --lz4 $< simple-tim clut4 --semi-trans --color-trans | cpp_out --name default_font_data -o $@
fileconv --lz4 $< simple-tim clut4 --semi-trans --color-trans | cpp_out --name default_font_data -o $@
#Linking rule
$(TARGET).a: $(LIB_OBJS)

2
template/JabyEngine-PSX_Game/assets/Makefile
View File

@ -6,7 +6,7 @@ OUTPUT_DIR = bin
# Create build targets like
# $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png
# @mkdir -p $(OUTPUT_DIR)
# jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4
# fileconv --lz4 $< -o $@ simple-tim clut4
all: #$(OUTPUT_DIR)/TexturePage.bin