diff --git a/include/dusk/dusk.h b/include/dusk/dusk.h new file mode 100644 index 0000000000..d84e496827 --- /dev/null +++ b/include/dusk/dusk.h @@ -0,0 +1,8 @@ +#ifndef DUSK_DUSK_H +#define DUSK_DUSK_H + +#include + +extern AuroraInfo auroraInfo; + +#endif // DUSK_DUSK_H diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 5046090942..47118bc3cc 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -43,6 +43,11 @@ #include "d/d_cursor_mng.h" #endif +#if TARGET_PC +#include "dusk/imgui.h" +#include "dusk/dusk.h" +#endif + class mDoGph_HIO_c : public JORReflexible { public: mDoGph_HIO_c() { @@ -2119,6 +2124,10 @@ int mDoGph_Painter() { JAWExtSystem::draw(); #endif +#if TARGET_PC + imgui_main(&auroraInfo); +#endif + mDoGph_gInf_c::endRender(); #if WIDESCREEN_SUPPORT diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 212052afa4..5f8d0312ff 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -41,6 +41,7 @@ #include #include "SSystem/SComponent/c_API.h" #include "dusk/dvd_emu.h" +#include "dusk/dusk.h" #include #include @@ -128,6 +129,8 @@ s32 LOAD_COPYDATE(void*) { return 1; } +AuroraInfo auroraInfo; + void main01(void) { OS_REPORT("\x1b[m"); GXSetColorUpdate(GX_ENABLE); @@ -212,7 +215,7 @@ int game_main(int argc, char* argv[]) { config.configPath = "."; config.logCallback = &aurora_log_callback; - aurora_initialize(argc, argv, &config); + auroraInfo = aurora_initialize(argc, argv, &config); // 2. Setup Virtual Game RAM // Simulates Gamecube RAM (24MB + Audio etc, we take 256MB)