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

Merge branch 'ToolBox_CDDA' into ToolBox_CDDA_CDXA

Browse Source
This commit is contained in:
jaby
2024-05-21 21:33:13 +02:00
parent d334f19d4d deb5bf8442
commit e3c4bf1fc0
22 changed files with 266 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/PoolBox/PoolBox.code-workspace
View File

@@ -93,7 +93,7 @@
"settings": {
"C_Cpp.default.includePath": [
"${env:JABY_ENGINE_PATH}/include",
"${env:JABY_ENGINE_PATH}/Support/include"
"${env:JABY_ENGINE_PATH}/support/include"
],
"C_Cpp.default.compilerPath": "",
"C_Cpp.default.cStandard": "c17",

2
examples/PoolBox/application/Makefile
View File

@@ -3,7 +3,7 @@ OVERLAY_CONFIG = Overlays.json
include $(JABY_ENGINE_DIR)/mkfile/common/Wildcard.mk
SRCS = $(call rwildcard, src, c cpp)
INCLUDES += -I$(JABY_ENGINE_DIR)/Support/include -I$(JABY_ENGINE_DIR)/include
INCLUDES += -I$(JABY_ENGINE_DIR)/support/include -I$(JABY_ENGINE_DIR)/include
CCFLAGS += -save-temps=obj
SUPPORT_LIBS += FontWriter

6
examples/PoolBox/application/src/application.cpp
View File

@@ -7,6 +7,7 @@
#include <FontWriter/font_writer.hpp>
#include <PSX/Audio/CDDA.hpp>
#include <PSX/Periphery/periphery.hpp>
#include <PSX/System/callbacks.hpp>
#include <stdio.hpp>
using namespace JabyEngine;
@@ -155,6 +156,10 @@ namespace LoadingScene {
static void run() {
if(old_state_changer != state_changer) {
printf("Loading new state...\n");
Callback::VSyncCallback::install([]() {
printf("Still loading...\n");
});
update();
GPU::swap_buffers_vsync(1);
@@ -165,6 +170,7 @@ namespace LoadingScene {
state_changer.asset_load();
old_state_changer = state_changer;
CDDA::pop_play();
Callback::VSyncCallback::uninstall();
}
state_changer.main();