broken ui system
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
#include "luaapi.hh"
|
||||
#include "sceneloader.hh"
|
||||
#include "cutscene.hh"
|
||||
#include "uisystem.hh"
|
||||
|
||||
namespace psxsplash {
|
||||
class SceneManager {
|
||||
@@ -27,6 +28,10 @@ class SceneManager {
|
||||
void InitializeScene(uint8_t* splashpackData);
|
||||
void GameTick(psyqo::GPU &gpu);
|
||||
|
||||
// Font access (set from main.cpp after uploadSystemFont)
|
||||
static void SetFont(psyqo::Font<>* font) { s_font = font; }
|
||||
static psyqo::Font<>* GetFont() { return s_font; }
|
||||
|
||||
// Trigger event callbacks (called by CollisionSystem)
|
||||
void fireTriggerEnter(uint16_t triggerObjIdx, uint16_t otherObjIdx);
|
||||
void fireTriggerStay(uint16_t triggerObjIdx, uint16_t otherObjIdx);
|
||||
@@ -119,6 +124,9 @@ class SceneManager {
|
||||
int m_cutsceneCount = 0;
|
||||
CutscenePlayer m_cutscenePlayer;
|
||||
|
||||
// UI system (v13+)
|
||||
UISystem m_uiSystem;
|
||||
|
||||
psxsplash::Controls m_controls;
|
||||
|
||||
psxsplash::Camera m_currentCamera;
|
||||
@@ -141,6 +149,9 @@ class SceneManager {
|
||||
|
||||
bool freecam = false;
|
||||
|
||||
// Static font pointer (set from main.cpp)
|
||||
static psyqo::Font<>* s_font;
|
||||
|
||||
// Scene transition state
|
||||
int m_currentSceneIndex = 0;
|
||||
int m_pendingSceneIndex = -1; // -1 = no pending load
|
||||
|
||||
Reference in New Issue
Block a user