Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
4 changed files with 14 additions and 4 deletions
Showing only changes of commit 2e2389ba9a - Show all commits

View File

@ -7,12 +7,14 @@
enum LBA {
__jabyengine_start_lba_request
__jabyengine_request_lba_for(FONT, "ASSETS/FONT.BIN"),
__jabyengine_request_lba_for(ICON, "ASSETS/ICON.BIN"),
__jabyengine_end_lba_request
};
static void load_assets() {
static const JabyEngine::CDFile Assets[] = {
JabyEngine::CDFileBuilder::simple_tim(LBA::FONT, JabyEngine::SimpleTIM(320, 0, 320, 256)),
JabyEngine::CDFileBuilder::simple_tim(LBA::FONT, JabyEngine::SimpleTIM(320, 0, 320, 510)),
JabyEngine::CDFileBuilder::simple_tim(LBA::ICON, JabyEngine::SimpleTIM(320, 256, 320, 511)),
};
const auto buffer_cfg = JabyEngine::CDFileProcessor::BufferConfiguration::new_default();
@ -44,7 +46,7 @@ void main() {
const JabyEngine::GPU::POLY_FT3 triangle2(
{{0, 0}, {64, 0}, {64, 64}}, {{0, 0}, {64, 0}, {64, 64}},
JabyEngine::GPU::TPage(320, 0, JabyEngine::GPU::SemiTransparency::B_Half_add_F_Half, JabyEngine::GPU::TexturePageColor::$4bit),
JabyEngine::GPU::PageClut(320, 256),
JabyEngine::GPU::PageClut(320, 510),
JabyEngine::GPU::Color24(0xFF, 0xFF, 0xFF));
const JabyEngine::GPU::POLY_G3 triangle3({
{{0 + FirstOffsetX, 0}, {0xFF, 0x0, 0x0}},
@ -55,7 +57,7 @@ void main() {
{{64 + FirstOffsetX, 64}, {64, 64}, {0x0, 0x0, 0xFF}},
{{64 + FirstOffsetX, 0}, {64, 0}, {0x0, 0xFF, 0x0}}},
JabyEngine::GPU::TPage(320, 0, JabyEngine::GPU::SemiTransparency::B_Half_add_F_Half, JabyEngine::GPU::TexturePageColor::$4bit),
JabyEngine::GPU::PageClut(320, 256));
JabyEngine::GPU::PageClut(320, 510));
load_assets();

BIN
examples/PoolBox/assets/IconTexture.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -7,7 +7,11 @@ $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4
all: $(OUTPUT_DIR)/TexturePage.bin
$(OUTPUT_DIR)/IconTexture.bin: IconTexture.png
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4
all: $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin
clean:
rm -fr $(OUTPUT_DIR)

View File

@ -8,6 +8,7 @@
<Main name = "XXXX_AAA.AA" lba_source = "application/src/main.cpp">application/bin/PSX-release/PoolBox.psexe</Main>
<Directory name="ASSETS">
<File name = "FONT.BIN" lz4 = "already">assets/bin/TexturePage.bin</File>
<File name = "ICON.BIN" lz4 = "already">assets/bin/IconTexture.bin</File>
</Directory>
</Track>
</ISO_Project>