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 5 additions and 6 deletions
Showing only changes of commit 9b55428dc8 - Show all commits

View File

@ -77,7 +77,8 @@ namespace ScreenCenter {
Formular{.name = PSYQ::Name, .function = PSYQ::set_offset}
};
static constexpr const GPU::VRAM2VRAM background_img[] = { // TODO: Shouldn't current_id 0 be 0 and not 256?
static constexpr const GPU::VRAM2VRAM background_img[] = {
// current_id of 0 will be rendering on (0, 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)),
};

View File

@ -1,6 +1,6 @@
<PSXCD>
<!--
TODO: Support this?
TODO: Support configurable default values for this
<Defaults>
<Data lead-out="0:2:0"\>
<Directory hidden="true"\>

View File

@ -33,7 +33,6 @@ $(LIB_DIR)/$(ARTIFACT).a: $(TARGET).a
@mkdir -p $(LIB_DIR)
cp $(TARGET).a $(LIB_DIR)/$(ARTIFACT).a
# TODO: Improve later
# rule to make the boot image
$(SPLASH_IMAGE): ressources/Splash.png
psxfileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@

View File

@ -5,8 +5,7 @@
namespace JabyEngine {
namespace GPU {
uint8_t Display :: current_id = 1; //< Setup will call exchange and set it to 0
uint8_t Display :: current_id = 0;
namespace internal {
#ifdef __SUPPORT_PS3__
uintptr_t DMA :: MADR = 0;
@ -16,7 +15,7 @@ namespace JabyEngine {
static void interrupt_handler(uint32_t);
auto irq_callback = SysCall::InterruptCallback::from(interrupt_verifier, interrupt_handler);
VSyncCallback vsync_callback = nullptr; //< TODO: Typedef later
VSyncCallback vsync_callback = nullptr;
static uint8_t vsync_counter = 0;
bool vsync_lock_callback = false;