mirror of
https://github.com/ACreTeam/ac-decomp
synced 2026-06-18 22:26:43 -04:00
clean up and format code
This commit is contained in:
@@ -6,11 +6,9 @@
|
||||
#include "JSystem/JUtility/JUTVideo.h"
|
||||
#include "types.h"
|
||||
|
||||
JUTDbPrint *JUTDbPrint::sDebugPrint;
|
||||
JUTDbPrint* JUTDbPrint::sDebugPrint;
|
||||
|
||||
JUTDbPrint::JUTDbPrint(JUTFont *font, JKRHeap *heap)
|
||||
: mColor()
|
||||
{
|
||||
JUTDbPrint::JUTDbPrint(JUTFont* font, JKRHeap* heap) : mColor() {
|
||||
mFont = font;
|
||||
mList = nullptr;
|
||||
mHeap = (heap) ? heap : JKRHeap::getCurrentHeap();
|
||||
@@ -18,14 +16,12 @@ JUTDbPrint::JUTDbPrint(JUTFont *font, JKRHeap *heap)
|
||||
mVisible = true;
|
||||
}
|
||||
|
||||
JUTDbPrint::~JUTDbPrint() {}
|
||||
JUTDbPrint::~JUTDbPrint() {
|
||||
}
|
||||
|
||||
JUTDbPrint *JUTDbPrint::start(JUTFont *font, JKRHeap *heap)
|
||||
{
|
||||
if (!sDebugPrint)
|
||||
{
|
||||
if (!heap)
|
||||
{
|
||||
JUTDbPrint* JUTDbPrint::start(JUTFont* font, JKRHeap* heap) {
|
||||
if (!sDebugPrint) {
|
||||
if (!heap) {
|
||||
heap = JKRHeap::getCurrentHeap();
|
||||
}
|
||||
sDebugPrint = new JUTDbPrint(font, heap);
|
||||
@@ -33,98 +29,83 @@ JUTDbPrint *JUTDbPrint::start(JUTFont *font, JKRHeap *heap)
|
||||
return sDebugPrint;
|
||||
}
|
||||
|
||||
JUTFont *JUTDbPrint::changeFont(JUTFont *newFont)
|
||||
{
|
||||
JUTFont *oldFont = mFont;
|
||||
if (newFont)
|
||||
{
|
||||
JUTFont* JUTDbPrint::changeFont(JUTFont* newFont) {
|
||||
JUTFont* oldFont = mFont;
|
||||
if (newFont) {
|
||||
mFont = newFont;
|
||||
}
|
||||
return oldFont;
|
||||
}
|
||||
|
||||
void JUTDbPrint::enter(int x, int y, int duration, const char *txt, int len)
|
||||
{
|
||||
if(len > 0) {
|
||||
JUTDbPrintList *pList = (JUTDbPrintList *)JKRAllocFromHeap(mHeap, sizeof(JUTDbPrintList) + len, -4);
|
||||
if (pList)
|
||||
{
|
||||
void JUTDbPrint::enter(int x, int y, int duration, const char* txt, int len) {
|
||||
if (len > 0) {
|
||||
JUTDbPrintList* pList = (JUTDbPrintList*)JKRAllocFromHeap(mHeap, sizeof(JUTDbPrintList) + len, -4);
|
||||
if (pList) {
|
||||
pList->mX = x;
|
||||
pList->mY = y;
|
||||
pList->mDuration = duration;
|
||||
pList->mLen = len;
|
||||
strcpy((char *)&pList->mStr, txt);
|
||||
strcpy((char*)&pList->mStr, txt);
|
||||
pList->mNext = mList;
|
||||
mList = pList;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void JUTDbPrint::flush() {
|
||||
void JUTDbPrint::flush() {
|
||||
// eyebrow raise emoji
|
||||
JUTDbPrintList *pList = (JUTDbPrintList *)&mList;
|
||||
JUTDbPrintList *currList = mList;
|
||||
JUTDbPrintList* pList = (JUTDbPrintList*)&mList;
|
||||
JUTDbPrintList* currList = mList;
|
||||
|
||||
if (mFont)
|
||||
{
|
||||
if (currList)
|
||||
{
|
||||
if (mFont) {
|
||||
if (currList) {
|
||||
J2DOrthoGraph orthograph(0.0f, 0.0f, 640.0f, 480.0f, -1.0f, 1.0f);
|
||||
orthograph.setPort();
|
||||
mFont->setGX();
|
||||
mFont->setCharColor(mColor);
|
||||
while (currList)
|
||||
{
|
||||
if (mVisible)
|
||||
{
|
||||
while (currList) {
|
||||
if (mVisible) {
|
||||
drawString(currList->mX, currList->mY, currList->mLen, &currList->mStr);
|
||||
}
|
||||
if (--currList->mDuration <= 0)
|
||||
{
|
||||
JUTDbPrintList *next = currList->mNext;
|
||||
if (--currList->mDuration <= 0) {
|
||||
JUTDbPrintList* next = currList->mNext;
|
||||
JKRFreeToHeap(mHeap, currList);
|
||||
pList->mNext = next;
|
||||
currList = next;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
pList = currList;
|
||||
currList = currList->mNext;
|
||||
}
|
||||
}
|
||||
}
|
||||
} }
|
||||
|
||||
void JUTDbPrint::flush(int left, int top, int right, int bottom)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void JUTDbPrint::drawString(int x, int y, int len, const unsigned char *str)
|
||||
{
|
||||
mFont->drawString_size(x, y, reinterpret_cast<const char *>(str), len, true);
|
||||
void JUTDbPrint::flush(int left, int top, int right, int bottom) {
|
||||
}
|
||||
|
||||
void JUTReport(int x, int y, const char *fmt, ...)
|
||||
{
|
||||
void JUTDbPrint::drawString(int x, int y, int len, const unsigned char* str) {
|
||||
mFont->drawString_size(x, y, reinterpret_cast<const char*>(str), len, true);
|
||||
}
|
||||
|
||||
void JUTReport(int x, int y, const char* fmt, ...) {
|
||||
va_list vl;
|
||||
va_start(vl, fmt);
|
||||
char buf[128];
|
||||
s32 n = vsnprintf(buf, sizeof(buf), fmt, vl);
|
||||
if (n >= 0) {
|
||||
JUTDbPrint::getManager()->enter(x, y, 1, buf, n < 256 ? n : 255);
|
||||
JUTDbPrint::getManager()->enter(x, y, 1, buf, n < 256 ? n : 255);
|
||||
}
|
||||
va_end();
|
||||
}
|
||||
|
||||
void JUTReport(int x, int y, int duration, const char *fmt, ...)
|
||||
{
|
||||
void JUTReport(int x, int y, int duration, const char* fmt, ...) {
|
||||
va_list vl;
|
||||
va_start(vl, fmt);
|
||||
char buf[256];
|
||||
s32 n = vsnprintf(buf, sizeof(buf), fmt, vl);
|
||||
if (n >= 0) {
|
||||
JUTDbPrint::getManager()->enter(x, y, duration, buf, n < 256 ? n : 255);
|
||||
JUTDbPrint::getManager()->enter(x, y, duration, buf, n < 256 ? n : 255);
|
||||
}
|
||||
va_end(vl);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user