mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-06-16 22:00:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

clean up and format code

Browse Source
This commit is contained in:
SwareJonge
2025-06-17 23:46:35 +02:00
parent c5e5f47880
commit c545a42c15
93 changed files with 7033 additions and 7909 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/static/JSystem/JFramework/JFWSystem.cpp
+19 -26
View File
@@ -24,22 +24,20 @@ u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000;
s32 JFWSystem::CSetUpParam::streamPriority = 8;
s32 JFWSystem::CSetUpParam::decompPriority = 7;
s32 JFWSystem::CSetUpParam::aPiecePriority = 6;
const ResFONT *JFWSystem::CSetUpParam::systemFontRes = &JUTResFONT_Ascfont_fix12;
const _GXRenderModeObj *JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf;
const ResFONT* JFWSystem::CSetUpParam::systemFontRes = &JUTResFONT_Ascfont_fix12;
const _GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf;
u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24F8;
JKRHeap *JFWSystem::rootHeap;
JKRHeap *JFWSystem::systemHeap;
JKRThread *JFWSystem::mainThread;
JUTDbPrint *JFWSystem::debugPrint;
JUTFont *JFWSystem::systemFont;
JUTConsoleManager *JFWSystem::systemConsoleManager;
JUTConsole *JFWSystem::systemConsole;
JKRHeap* JFWSystem::rootHeap;
JKRHeap* JFWSystem::systemHeap;
JKRThread* JFWSystem::mainThread;
JUTDbPrint* JFWSystem::debugPrint;
JUTFont* JFWSystem::systemFont;
JUTConsoleManager* JFWSystem::systemConsoleManager;
JUTConsole* JFWSystem::systemConsole;
bool JFWSystem::sInitCalled;
void JFWSystem::firstInit()
{
#line 80
void JFWSystem::firstInit() {
JUT_ASSERT(rootHeap == 0);
OSInit();
DVDInit();
@@ -47,23 +45,21 @@ void JFWSystem::firstInit()
systemHeap = JKRExpHeap::create(CSetUpParam::sysHeapSize, rootHeap, false);
}
void JFWSystem::init()
{
#line 101
void JFWSystem::init() {
JUT_ASSERT(sInitCalled == false);
if (rootHeap == 0)
firstInit();
sInitCalled = true;
JKRAram::create(CSetUpParam::aramAudioBufSize, CSetUpParam::aramGraphBufSize, CSetUpParam::streamPriority, CSetUpParam::decompPriority,
CSetUpParam::aPiecePriority);
JKRAram::create(CSetUpParam::aramAudioBufSize, CSetUpParam::aramGraphBufSize, CSetUpParam::streamPriority,
CSetUpParam::decompPriority, CSetUpParam::aPiecePriority);
mainThread = new JKRThread(OSGetCurrentThread(), 4);
mainThread = new JKRThread(OSGetCurrentThread(), 4);
JUTVideo::createManager(CSetUpParam::renderMode);
JUTCreateFifo(CSetUpParam::fifoBufSize);
JUTGamePad::init();
JUTDirectPrint *directPrint = JUTDirectPrint::start();
JUTDirectPrint* directPrint = JUTDirectPrint::start();
JUTAssertion::create();
JUTException::create(directPrint);
systemFont = new JUTResFont(CSetUpParam::systemFontRes, nullptr);
@@ -73,13 +69,10 @@ void JFWSystem::init()
systemConsole = JUTConsole::create(60, 200, nullptr);
systemConsole->setFont(systemFont);
if (CSetUpParam::renderMode->efbHeight < 300)
{
if (CSetUpParam::renderMode->efbHeight < 300) {
systemConsole->setFontSize(systemFont->getWidth() * 0.85f, systemFont->getHeight() * 0.5f);
systemConsole->setPosition(20, 25);
}
else
{
} else {
systemConsole->setFontSize(systemFont->getWidth() * 0.85f, systemFont->getHeight());
systemConsole->setPosition(20, 50);
}
@@ -88,6 +81,6 @@ void JFWSystem::init()
systemConsole->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE);
JUTSetReportConsole(systemConsole);
JUTSetWarningConsole(systemConsole);
void *mem = systemHeap->alloc(CSetUpParam::exConsoleBufferSize, 4);
void* mem = systemHeap->alloc(CSetUpParam::exConsoleBufferSize, 4);
JUTException::createConsole(mem, CSetUpParam::exConsoleBufferSize);
}
}