From f24ffc73458c963125bf099af1d81126bceb84d8 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 9 Jan 2024 18:06:42 -0500 Subject: [PATCH] misc cleanup --- include/JSystem/JUtility/JUTDataHeader.h | 4 ++-- include/JSystem/JUtility/JUTFont.h | 17 +++++------------ include/d/actor/d_a_goal_flag.h | 10 ++++++++++ include/d/actor/d_a_pedestal.h | 6 +++++- src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | 6 +++--- src/JSystem/JUtility/JUTCacheFont.cpp | 13 +++++++------ src/JSystem/JUtility/JUTResFont.cpp | 9 +++++---- src/d/actor/d_a_pedestal.cpp | 6 ------ src/f_pc/f_pc_manager.cpp | 4 ++-- 9 files changed, 39 insertions(+), 36 deletions(-) diff --git a/include/JSystem/JUtility/JUTDataHeader.h b/include/JSystem/JUtility/JUTDataHeader.h index 051c6e812..4b4fe0ef6 100644 --- a/include/JSystem/JUtility/JUTDataHeader.h +++ b/include/JSystem/JUtility/JUTDataHeader.h @@ -7,10 +7,10 @@ struct JUTDataBlockHeader { /* 0x0 */ u32 mType; - /* 0x4 */ u32 mNextOffset; + /* 0x4 */ u32 mSize; const JUTDataBlockHeader* getNext() const { // fake inline - return reinterpret_cast(reinterpret_cast(this) + mNextOffset); + return reinterpret_cast(reinterpret_cast(this) + mSize); } }; diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index 982dc3c4b..e655985fb 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -2,18 +2,11 @@ #define JUTFONT_H #include "JSystem/JUtility/TColor.h" +#include "JSystem/JUtility/JUTDataHeader.h" #include "string.h" -struct BlockHeader { - const BlockHeader* getNext() const { - return reinterpret_cast(reinterpret_cast(this) + size); - } - u32 magic; - u32 size; -}; - struct ResFONT { - struct INF1 : BlockHeader { + struct INF1 : JUTDataBlockHeader { /* 0x08 */ u16 fontType; /* 0x0A */ u16 ascent; /* 0x0C */ u16 descent; @@ -22,13 +15,13 @@ struct ResFONT { /* 0x12 */ u16 defaultCode; }; - struct WID1 : BlockHeader { + struct WID1 : JUTDataBlockHeader { /* 0x08 */ u16 startCode; /* 0x0A */ u16 endCode; /* 0x0C */ u8 mChunkNum[4]; }; - struct MAP1 : BlockHeader { + struct MAP1 : JUTDataBlockHeader { /* 0x08 */ u16 mappingMethod; /* 0x0A */ u16 startCode; /* 0x0C */ u16 endCode; @@ -36,7 +29,7 @@ struct ResFONT { /* 0x10 */ u16 mLeading; }; - struct GLY1 : BlockHeader { + struct GLY1 : JUTDataBlockHeader { /* 0x08 */ u16 startCode; /* 0x0A */ u16 endCode; /* 0x0C */ u16 cellWidth; diff --git a/include/d/actor/d_a_goal_flag.h b/include/d/actor/d_a_goal_flag.h index a8b87f1cf..43f3c5ac5 100644 --- a/include/d/actor/d_a_goal_flag.h +++ b/include/d/actor/d_a_goal_flag.h @@ -30,6 +30,16 @@ public: class daGFlag_packet_c { public: + void changeCurrentPos() {} + void getDPos() {} + void getMtx() {} + void getNrm() {} + void getOffsetVec() {} + void getPos() {} + void getTexObjP() {} + void getToonTexObjP() {} + void setTevStr(dKy_tevstr_c*) {} + void setTexObj(unsigned char); void setToonTexObj(); void draw(); diff --git a/include/d/actor/d_a_pedestal.h b/include/d/actor/d_a_pedestal.h index de5ee7a6c..0ea786d05 100644 --- a/include/d/actor/d_a_pedestal.h +++ b/include/d/actor/d_a_pedestal.h @@ -52,7 +52,11 @@ namespace daPedestal { void execute(JPABaseEmitter*); void end(); void makeEmitter(unsigned short, const cXyz*, const csXyz*, const cXyz*); - void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char); + + void getEmitter() {} + void setAngle(const csXyz*) {} + void setPos(const cXyz*) {} + void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {} }; }; diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp index 8643dd7e2..e809580ec 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -309,7 +309,7 @@ void J3DModelLoader::readVertex(const J3DVertexBlock* i_block) { } else if (nrm_end != NULL) { vertex_data.mNrmNum = ((u32)nrm_end - (u32)vertex_data.mVtxNrmArray) / nrm_size + 1; } else { - vertex_data.mNrmNum = (i_block->mNextOffset - (u32)i_block->mpVtxNrmArray) / nrm_size + 1; + vertex_data.mNrmNum = (i_block->mSize - (u32)i_block->mpVtxNrmArray) / nrm_size + 1; } void* color0_end = NULL; @@ -324,13 +324,13 @@ void J3DModelLoader::readVertex(const J3DVertexBlock* i_block) { } else if (color0_end != NULL) { vertex_data.mColNum = ((u32)color0_end - (u32)vertex_data.mVtxColorArray[0]) / 4 + 1; } else { - vertex_data.mColNum = (i_block->mNextOffset - (u32)i_block->mpVtxColorArray[0]) / 4 + 1; + vertex_data.mColNum = (i_block->mSize - (u32)i_block->mpVtxColorArray[0]) / 4 + 1; } if (vertex_data.mVtxTexCoordArray[0] == NULL) { vertex_data.mTexCoordNum = 0; } else { - vertex_data.mTexCoordNum = (i_block->mNextOffset - (u32)i_block->mpVtxTexCoordArray[0]) / 8 + 1; + vertex_data.mTexCoordNum = (i_block->mSize - (u32)i_block->mpVtxTexCoordArray[0]) / 8 + 1; } } diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index f859787b4..6a6674b02 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -7,6 +7,7 @@ #include "JSystem/JKernel/JKRAram.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" +#include "JSystem/JUtility/JUTDataHeader.h" #include "dolphin/gx/GX.h" /* 802C03D4-802C0454 .text __ct__12JUTCacheFontFPC7ResFONTUlP7JKRHeap */ @@ -81,15 +82,15 @@ int JUTCacheFont::getMemorySize(const ResFONT* p_font, u16* o_widCount, u32* o_w u8* fontInf = (u8*)p_font->data; for (int i = 0; i < p_font->numBlocks; i++) { - switch (((BlockHeader*)fontInf)->magic) { + switch (((JUTDataBlockHeader*)fontInf)->mType) { case 'INF1': break; case 'WID1': - totalWidSize += ((BlockHeader*)fontInf)->size; + totalWidSize += ((JUTDataBlockHeader*)fontInf)->mSize; widBlockCount++; break; case 'GLY1': - totalGlySize += ((BlockHeader*)fontInf)->size; + totalGlySize += ((JUTDataBlockHeader*)fontInf)->mSize; glyTexSize = ((ResFONT::GLY1*)fontInf)->textureSize; glyBlockCount++; if (glyTexSize > maxGlyTexSize) { @@ -97,7 +98,7 @@ int JUTCacheFont::getMemorySize(const ResFONT* p_font, u16* o_widCount, u32* o_w } break; case 'MAP1': - totalMapSize += ((BlockHeader*)fontInf)->size; + totalMapSize += ((JUTDataBlockHeader*)fontInf)->mSize; mapBlockCount++; break; default: @@ -105,7 +106,7 @@ int JUTCacheFont::getMemorySize(const ResFONT* p_font, u16* o_widCount, u32* o_w break; } - fontInf += ((BlockHeader*)fontInf)->size; + fontInf += ((JUTDataBlockHeader*)fontInf)->mSize; } if (o_widCount != NULL) { @@ -295,7 +296,7 @@ void JUTCacheFont::setBlock() { if (iVar1 == NULL) { OSPanic(__FILE__, 476, "Cannot alloc ARAM area."); } - piVar5->magic = aramAddress; + piVar5->mType = aramAddress; if (piVar5->textureSize > mMaxSheetSize) { mMaxSheetSize = piVar5->textureSize; } diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/src/JSystem/JUtility/JUTResFont.cpp index c1f0db9e6..4856c7077 100644 --- a/src/JSystem/JUtility/JUTResFont.cpp +++ b/src/JSystem/JUtility/JUTResFont.cpp @@ -8,6 +8,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" +#include "JSystem/JUtility/JUTDataHeader.h" #include "dolphin/gx/GX.h" #include "dolphin/types.h" @@ -107,9 +108,9 @@ void JUTResFont::countBlock() { mGlyphBlockNum = 0; mMapBlockNum = 0; - const BlockHeader* header = (BlockHeader*)mResFont->data; + const JUTDataBlockHeader* header = (JUTDataBlockHeader*)mResFont->data; for (u32 i = 0; i < mResFont->numBlocks; i++, header = header->getNext()) { - switch (header->magic) { + switch (header->mType) { case 'WID1': mWidthBlockNum++; break; @@ -134,9 +135,9 @@ void JUTResFont::setBlock() { int mapNum = 0; mMaxCode = -1; - const BlockHeader* header = (BlockHeader*)mResFont->data; + const JUTDataBlockHeader* header = (JUTDataBlockHeader*)mResFont->data; for (u32 i = 0; i < mResFont->numBlocks; i++, header = header->getNext()) { - switch (header->magic) { + switch (header->mType) { case 'INF1': mInfoBlock = (ResFONT::INF1*)header; u32 u = mInfoBlock->fontType; diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index 170088ace..c6fb11a5d 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -160,9 +160,3 @@ void daPedestal::daPds_infiniteEcallBack_c::end() { void daPedestal::daPds_infiniteEcallBack_c::makeEmitter(unsigned short, const cXyz*, const csXyz*, const cXyz*) { /* Nonmatching */ } - -/* 00001288-00001290 .text setup__Q210daPedestal25daPds_infiniteEcallBack_cFP14JPABaseEmitterPC4cXyzPC5csXyzSc */ -void daPedestal::daPds_infiniteEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) { - /* Nonmatching */ -} - diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index aa6a8dde7..921cae168 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -53,7 +53,7 @@ BOOL fpcM_IsCreating(unsigned int pID) { return fpcCt_IsCreatingByID(pID); } -struct BMG_INF1 : BlockHeader { +struct BMG_INF1 : JUTDataBlockHeader { /* 0x08 */ u8 m08[0x10 - 0x08]; /* 0x10 */ u32 entries[6]; }; @@ -77,7 +77,7 @@ void messageSet(u32 status) { #else BMG_INF1* inf1 = (BMG_INF1*)&msg_data[0x20]; #endif - const char * msg = (const char*)((u8*)inf1->getNext() + sizeof(BlockHeader) + inf1->entries[status]); + const char * msg = (const char*)((u8*)inf1->getNext() + sizeof(JUTDataBlockHeader) + inf1->entries[status]); J2DTextBox * tpane = new J2DTextBox('TXT1', JGeometry::TBox2(0.0f, 0.0f, 660.0f, 200.0f), (ResFONT*)font_data, msg, HBIND_CENTER, VBIND_CENTER); JUT_ASSERT(VERSION_SELECT(0x12b, 0x141, 0x141), tpane != 0);