diff --git a/CMakeLists.txt b/CMakeLists.txt index cb232671..48a3ecab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,11 +30,12 @@ add_subdirectory(extern/aurora EXCLUDE_FROM_ALL) add_subdirectory(extern/musyx EXCLUDE_FROM_ALL) set(DOLPHIN_FILES - src/dolphin/os/OSAlloc.c - src/dolphin/os/OSArena.c - src/dolphin/mtx/mtx.c - src/dolphin/mtx/mtx44.c - src/dolphin/mtx/vec.c + src/dolphin/mtx/mtx.c + src/dolphin/mtx/mtx44.c + src/dolphin/mtx/vec.c + src/dolphin/os/OSAlloc.c + src/dolphin/os/OSArena.c + src/dolphin/os/OSStopwatch.c ) set(GAME_FILES @@ -43,12 +44,19 @@ set(GAME_FILES src/game/flag.c src/game/font.c src/game/frand.c + src/game/hsfanim.c + src/game/hsfdraw.c + src/game/hsfman.c + src/game/hsfmotion.c src/game/gamework.c src/game/main.c src/game/malloc.c src/game/memory.c src/game/init.c + src/game/sprman.c + src/game/sprput.c src/game/pad.c + src/game/perf.c src/game/printfunc.c src/game/process.c ) diff --git a/src/game/main.c b/src/game/main.c index 195995d7..039fcd55 100644 --- a/src/game/main.c +++ b/src/game/main.c @@ -116,13 +116,13 @@ void main(void) // HuSprInit(); // Hu3DInit(); // HuDataInit(); - // HuPerfInit(); + HuPerfInit(); // HuPerfCreate("USR0", 0xFF, 0xFF, 0xFF, 0xFF); // HuPerfCreate("USR1", 0, 0xFF, 0xFF, 0xFF); // WipeInit(RenderMode); for (i = 0; i < 4; i++) { - // GWPlayerCfg[i].character = -1; + GWPlayerCfg[i].character = -1; } // omMasterInit(0, _ovltbl, OVL_COUNT, OVL_BOOT); @@ -151,24 +151,24 @@ void main(void) if (HuSoftResetButtonCheck() != 0 || HuDvdErrWait != 0) { continue; }*/ - // HuPerfZero(); + HuPerfZero(); - // HuPerfBegin(2); + HuPerfBegin(2); #ifdef TARGET_PC aurora_begin_frame(); #endif - /* HuSysBeforeRender(); - GXSetGPMetric(GX_PERF0_CLIP_VTX, GX_PERF1_VERTICES); - GXClearGPMetric(); - GXSetVCacheMetric(GX_VC_ALL); - GXClearVCacheMetric(); - GXClearPixMetric(); - GXClearMemMetric(); + // HuSysBeforeRender(); + GXSetGPMetric(GX_PERF0_CLIP_VTX, GX_PERF1_VERTICES); + GXClearGPMetric(); + GXSetVCacheMetric(GX_VC_ALL); + GXClearVCacheMetric(); + GXClearPixMetric(); + GXClearMemMetric(); - HuPerfBegin(0); - Hu3DPreProc(); - HuPadRead(); - pfClsScr();*/ + HuPerfBegin(0); + Hu3DPreProc(); + HuPadRead(); + pfClsScr(); HuPrcCall(1); /* MGSeqMain();