We've got a window with game code commented out!
This commit is contained in:
parent
5eb32764a5
commit
1bd8f3e14e
3 changed files with 46 additions and 29 deletions
|
|
@ -15,17 +15,30 @@ endif ()
|
|||
add_subdirectory(extern/aurora EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(extern/musyx EXCLUDE_FROM_ALL)
|
||||
|
||||
add_executable(marioparty4
|
||||
set(DOLPHIN_FILES
|
||||
# libraries/dolphin_pc/GX.c
|
||||
# libraries/dolphin_pc/vi.c
|
||||
# libraries/dolphin_pc/pad_evdev.c
|
||||
# libraries/dolphin_pc/pad_dinput.c
|
||||
)
|
||||
|
||||
set(GAME_FILES
|
||||
src/game/main.c
|
||||
src/game/init.c
|
||||
# libraries/dolphin_pc/GX.c
|
||||
# libraries/dolphin_pc/vi.c
|
||||
# libraries/dolphin_pc/pad_evdev.c
|
||||
# libraries/dolphin_pc/pad_dinput.c
|
||||
# src/port/byteswap.cpp
|
||||
# src/game/init.c
|
||||
)
|
||||
|
||||
set(PORT_FILES
|
||||
# src/port/byteswap.cpp
|
||||
src/port/imgui.cpp
|
||||
src/port/stubs.c
|
||||
)
|
||||
)
|
||||
|
||||
source_group("Dolphin" FILES ${DOLPHIN_FILES})
|
||||
source_group("Game" FILES ${GAME_FILES})
|
||||
source_group("Port" FILES ${PORT_FILES})
|
||||
|
||||
add_executable(marioparty4 ${DOLPHIN_FILES} ${GAME_FILES} ${PORT_FILES})
|
||||
target_compile_definitions(marioparty4 PRIVATE TARGET_PC VERSION=0)
|
||||
target_compile_definitions(musyx PRIVATE MUSY_VERSION_MAJOR=1 MUSY_VERSION_MINOR=5 MUSY_VERSION_PATCH=4)
|
||||
target_include_directories(marioparty4 PRIVATE include)
|
||||
target_link_libraries(marioparty4 PRIVATE aurora::aurora aurora::main musyx)
|
||||
|
|
|
|||
|
|
@ -106,11 +106,11 @@ void main(void)
|
|||
HuDvdErrWait = 0;
|
||||
SystemInitF = 0;
|
||||
#if VERSION_NTSC
|
||||
HuSysInit(&GXNtsc480IntDf);
|
||||
//HuSysInit(&GXNtsc480IntDf);
|
||||
#else
|
||||
HuSysInit(&GXPal528IntDf);
|
||||
#endif
|
||||
HuPrcInit();
|
||||
/*HuPrcInit();
|
||||
HuPadInit();
|
||||
GWInit();
|
||||
pfInit();
|
||||
|
|
@ -133,7 +133,7 @@ void main(void)
|
|||
if (VIGetNextField() == 0) {
|
||||
OSReport("VI_FIELD_BELOW\n");
|
||||
VIWaitForRetrace();
|
||||
}
|
||||
}*/
|
||||
while (1) {
|
||||
#ifdef TARGET_PC
|
||||
const AuroraEvent *event = aurora_update();
|
||||
|
|
@ -152,17 +152,17 @@ void main(void)
|
|||
break;
|
||||
}
|
||||
#endif
|
||||
retrace = VIGetRetraceCount();
|
||||
/*retrace = VIGetRetraceCount();
|
||||
if (HuSoftResetButtonCheck() != 0 || HuDvdErrWait != 0) {
|
||||
continue;
|
||||
}
|
||||
HuPerfZero();
|
||||
}*/
|
||||
//HuPerfZero();
|
||||
|
||||
HuPerfBegin(2);
|
||||
//HuPerfBegin(2);
|
||||
#ifdef TARGET_PC
|
||||
aurora_begin_frame();
|
||||
#endif
|
||||
HuSysBeforeRender();
|
||||
/* HuSysBeforeRender();
|
||||
GXSetGPMetric(GX_PERF0_CLIP_VTX, GX_PERF1_VERTICES);
|
||||
GXClearGPMetric();
|
||||
GXSetVCacheMetric(GX_VC_ALL);
|
||||
|
|
@ -184,21 +184,21 @@ void main(void)
|
|||
HuPerfEnd(0);
|
||||
|
||||
pfDrawFonts();
|
||||
HuPerfEnd(1);
|
||||
HuPerfEnd(1);*/
|
||||
|
||||
#ifdef TARGET_PC
|
||||
imgui_main(&auroraInfo);
|
||||
aurora_end_frame();
|
||||
#endif
|
||||
|
||||
msmMusFdoutEnd();
|
||||
/*msmMusFdoutEnd();
|
||||
HuSysDoneRender(retrace);
|
||||
GXReadGPMetric(&met0, &met1);
|
||||
GXReadVCacheMetric(&vcheck, &vmiss, &vstall);
|
||||
GXReadPixMetric(&top_pixels_in, &top_pixels_out, &bot_pixels_in, &bot_pixels_out, &clr_pixels_in, &total_copy_clks);
|
||||
GXReadMemMetric(&cp_req, &tc_req, &cpu_rd_req, &cpu_wr_req, &dsp_req, &io_req, &vi_req, &pe_req, &rf_req, &fi_req);
|
||||
HuPerfEnd(2);
|
||||
GlobalCounter++;
|
||||
GlobalCounter++;*/
|
||||
|
||||
#ifdef TARGET_PC
|
||||
frame_limiter();
|
||||
|
|
@ -210,16 +210,16 @@ void main(void)
|
|||
#endif
|
||||
}
|
||||
|
||||
void HuSysVWaitSet(s16 vcount)
|
||||
{
|
||||
minimumVcount = vcount;
|
||||
minimumVcountf = vcount;
|
||||
}
|
||||
|
||||
s16 HuSysVWaitGet(s16 param)
|
||||
{
|
||||
return (s16) minimumVcount;
|
||||
}
|
||||
//void HuSysVWaitSet(s16 vcount)
|
||||
//{
|
||||
// minimumVcount = vcount;
|
||||
// minimumVcountf = vcount;
|
||||
//}
|
||||
//
|
||||
//s16 HuSysVWaitGet(s16 param)
|
||||
//{
|
||||
// return (s16) minimumVcount;
|
||||
//}
|
||||
|
||||
s32 rnd_seed = 0x0000D9ED;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,10 @@ extern "C"
|
|||
#include <numeric>
|
||||
#include <thread>
|
||||
|
||||
#if _WIN32
|
||||
#include "Windows.h"
|
||||
#endif
|
||||
|
||||
static bool m_frameRate = true;
|
||||
static bool m_pipelineInfo = true;
|
||||
static bool m_graphicsBackend = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue