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

Fully support Full16 TIM

Browse Source
This commit is contained in:
Jaby
2024-12-29 22:59:51 +01:00
parent c66b68a0e8
commit 85ae5629cd
8 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/PoolBox/application/src/Overlay/ScreenCenter/screen_center.cpp
View File

@@ -77,12 +77,10 @@ namespace ScreenCenter {
Formular{.name = PSYQ::Name, .function = PSYQ::set_offset}
};
static constexpr const auto background_img = Make::POLY_FT4(
Make::AreaI16(Make::PositionI16((GPU::Display::Width - 256)/2, (GPU::Display::Height - 240)/2), Make::SizeI16(256, 240)),
Make::PageOffset(0, 0),
Make::TPage(Make::PositionU16(384, 256), GPU::SemiTransparency::B_Half_add_F_Half, GPU::TextureColorMode::clut4),
Make::PageClut(Make::PositionU16(384, 255))
);
static constexpr const GPU::VRAM2VRAM background_img[] = { // TODO: Shouldn't current_id 0 be 0 and not 256?
GPU::VRAM2VRAM::create(Make::AreaU16(384, 240, 256, 240), Make::PositionU16(32, GPU::Display::Height)),
GPU::VRAM2VRAM::create(Make::AreaU16(384, 240, 256, 240), Make::PositionU16(32, 0)),
};
static auto frame = Frame::create();
@@ -112,8 +110,8 @@ namespace ScreenCenter {
}
auto cursor = FontWriter::update(CenterPoint);
FontWriter::bios_font_writer.write(cursor, IntroductionTest, GPU::Color24::Red());
FontWriter::bios_font_writer.write(cursor, ScreenFormulars[formular_sel].name, GPU::Color24::Red());
FontWriter::bios_font_writer.write(cursor, IntroductionTest, GPU::Color24::White());
FontWriter::bios_font_writer.write(cursor, ScreenFormulars[formular_sel].name, GPU::Color24::White());
}
static void update_interactive() {
@@ -190,7 +188,7 @@ namespace ScreenCenter {
}
static void render() {
GPU::render(background_img);
GPU::render(background_img[GPU::Display::current_id]);
frame.render();
Shared::back_menu.render();
}

BIN
examples/PoolBox/assets/IMG_6921.png (Stored with Git LFS)
View File

Binary file not shown.

4
examples/PoolBox/assets/Makefile
View File

@@ -35,7 +35,7 @@ INPUT += $(OUTPUT_DIR)/JabyTails.img
JabyTails_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
INPUT += $(OUTPUT_DIR)/IMG_6921.tim
IMG_6921_TIM_FLAGS = tim clut4 --clut-pos {384,255} --tex-pos {384,256}
IMG_6921_TIM_FLAGS = tim full16 --clut-pos {384,255} --tex-pos {384,256}
$(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav
@mkdir -p $(OUTPUT_DIR)
@@ -55,7 +55,7 @@ $(OUTPUT_DIR)/%.img: %.png
$(OUTPUT_DIR)/%.tim: %.png
@mkdir -p $(OUTPUT_DIR)
psxfileconv $< -o $@ $($*_TIM_FLAGS)
psxfileconv --lz4 $< -o $@ $($*_TIM_FLAGS)
all: $(INPUT)

2
examples/PoolBox/iso/Config.xml
View File

@@ -41,7 +41,7 @@
<File name = "TEX.IMG" lz4 = "already">../assets/bin/TexturePage.img</File>
<File name = "ICON.IMG" lz4 = "already">../assets/bin/IconTexture.img</File>
<File name = "SAND.TIM" lz4 = "none">../assets/bin/IMG_6921.tim</File>
<File name = "SAND.TIM" lz4 = "already">../assets/bin/IMG_6921.tim</File>
</Directory>
<Directory name = "XAAUDIO" hidden = "true">
<InterleavedFile name = "MIX.XA">