From a0fdc414b17737b0bc57e44ba6400963c724a916 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 7 Sep 2024 17:34:24 -0400 Subject: [PATCH] Remove leading underscore from uses of GX enums --- include/JSystem/J3DGraphBase/J3DShape.h | 4 ++-- include/JSystem/J3DGraphBase/J3DSys.h | 2 +- include/JSystem/JUtility/JUTException.h | 2 +- include/JSystem/JUtility/JUTPalette.h | 6 +++--- include/JSystem/JUtility/JUTTexture.h | 4 ++-- include/JSystem/JUtility/JUTXfb.h | 2 +- include/d/d_demo.h | 6 +++--- include/d/d_ovlp_fade4.h | 2 +- src/JSystem/J3DGraphBase/J3DShape.cpp | 4 ++-- src/JSystem/JFramework/JFWDisplay.cpp | 2 +- src/JSystem/JUtility/JUTPalette.cpp | 4 ++-- src/JSystem/JUtility/JUTTexture.cpp | 12 ++++++------ src/m_Do/m_Do_graphic.cpp | 2 +- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h index 2140e8c2b..c96709d69 100644 --- a/include/JSystem/J3DGraphBase/J3DShape.h +++ b/include/JSystem/J3DGraphBase/J3DShape.h @@ -77,8 +77,8 @@ class J3DShape { }; void initialize(); - void addTexMtxIndexInDL(_GXAttr, u32); - void addTexMtxIndexInVcd(_GXAttr); + void addTexMtxIndexInDL(GXAttr, u32); + void addTexMtxIndexInVcd(GXAttr); void calcNBTScale(Vec const&, Mtx33*, Mtx33*); u32 countBumpMtxNum() const; void loadVtxArray() const; diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h index 73257ed15..9c98f9120 100644 --- a/include/JSystem/J3DGraphBase/J3DSys.h +++ b/include/JSystem/J3DGraphBase/J3DSys.h @@ -137,7 +137,7 @@ struct J3DSys { J3DSys(); void loadPosMtxIndx(int, u16) const; void loadNrmMtxIndx(int, u16) const; - void setTexCacheRegion(_GXTexCacheSize); + void setTexCacheRegion(GXTexCacheSize); void drawInit(); void reinitGX(); void reinitGenMode(); diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 3fea4e3af..7dc79cc9c 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -14,7 +14,7 @@ class JUTDirectPrint; class JUTExternalFB { public: - JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32); + JUTExternalFB(GXRenderModeObj*, GXGamma, void*, u32); private: /* 0x00 */ _GXRenderModeObj* mRenderMode; diff --git a/include/JSystem/JUtility/JUTPalette.h b/include/JSystem/JUtility/JUTPalette.h index 2eb547504..7a53b52b2 100644 --- a/include/JSystem/JUtility/JUTPalette.h +++ b/include/JSystem/JUtility/JUTPalette.h @@ -14,14 +14,14 @@ struct ResTLUT { class JUTPalette { public: - JUTPalette(_GXTlut p1, _GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) { + JUTPalette(GXTlut p1, _GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) { this->storeTLUT(p1, p2, p3, p4, p5); } JUTPalette(GXTlut tlutNo, ResTLUT* p_tlutRes) { storeTLUT(tlutNo, p_tlutRes); } - void storeTLUT(_GXTlut, ResTLUT*); - void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*); + void storeTLUT(GXTlut, ResTLUT*); + void storeTLUT(GXTlut, _GXTlutFmt, JUTTransparency, u16, void*); bool load(); u8 getTlutName() const { return mTlutName; } diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index cce7e9521..81d3d19f2 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -55,9 +55,9 @@ class JUTTexture { void storeTIMG(ResTIMG const*, JUTPalette*); void attachPalette(JUTPalette*); void init(); - void initTexObj(_GXTlut); + void initTexObj(GXTlut); void initTexObj(); - void load(_GXTexMapID); + void load(GXTexMapID); const ResTIMG* getTexInfo() const { return mTexInfo; } u8 getFormat() const { return mTexInfo->format; } diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h index 4ca1f567d..fee9796de 100644 --- a/include/JSystem/JUtility/JUTXfb.h +++ b/include/JSystem/JUtility/JUTXfb.h @@ -16,7 +16,7 @@ class JUTXfb { void clearIndex(); void common_init(int); - JUTXfb(_GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber); + JUTXfb(GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber); ~JUTXfb(); void delXfb(int); static JUTXfb* createManager(const _GXRenderModeObj*, JKRHeap*, JUTXfb::EXfbNumber); diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 661388563..9245d5e32 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -163,7 +163,7 @@ class dDemo_light_c : public JStage::TLight { ~dDemo_light_c() {} void JSGSetLightType(JStage::TELight); void JSGSetPosition(const Vec&); - void JSGSetColor(_GXColor); + void JSGSetColor(GXColor); void JSGSetDistanceAttenuation(f32, f32, GXDistAttnFn); void JSGSetAngleAttenuation(f32, GXSpotFn); void JSGSetDirection(const Vec&); @@ -185,10 +185,10 @@ class dDemo_fog_c : public JStage::TFog { public: dDemo_fog_c() { mFlags = 0; } ~dDemo_fog_c() {} - void JSGSetFogFunction(_GXFogType); + void JSGSetFogFunction(GXFogType); void JSGSetStartZ(f32); void JSGSetEndZ(f32); - void JSGSetColor(_GXColor); + void JSGSetColor(GXColor); private: /* 0x04 */ u8 mFlags; diff --git a/include/d/d_ovlp_fade4.h b/include/d/d_ovlp_fade4.h index ca482e887..b22a09ff7 100644 --- a/include/d/d_ovlp_fade4.h +++ b/include/d/d_ovlp_fade4.h @@ -51,7 +51,7 @@ class dDlst_2Dt_Sp_c : public dDlst_base_c { class dDlst_2DtEff1_c : public dDlst_base_c { public: ~dDlst_2DtEff1_c() {} - void init(_GXColor); + void init(GXColor); void draw(); /* 0x004 */ f32 timer; diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp index 274d4ce42..134f71940 100644 --- a/src/JSystem/J3DGraphBase/J3DShape.cpp +++ b/src/JSystem/J3DGraphBase/J3DShape.cpp @@ -12,7 +12,7 @@ #include "dolphin/os/OS.h" #include "dolphin/types.h" -extern void J3DGDSetVtxAttrFmtv(_GXVtxFmt, GXVtxAttrFmtList *, bool); +extern void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList *, bool); extern void J3DFifoLoadPosMtxImm(Mtx, u32); extern void J3DFifoLoadNrmMtxImm(Mtx, u32); @@ -64,7 +64,7 @@ void J3DLoadCPCmd(u8 cmd, u32 param) { } /* 802DD308-802DD344 .text J3DLoadArrayBasePtr__F7_GXAttrPv */ -static void J3DLoadArrayBasePtr(_GXAttr attr, void* data) { +static void J3DLoadArrayBasePtr(GXAttr attr, void* data) { u32 idx = (attr == GX_VA_NBT) ? 1 : (attr - GX_VA_POS); J3DLoadCPCmd(0xA0 + idx, ((u32)data & 0x7FFFFFFF)); } diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp index e6cee0f0d..5957a484c 100644 --- a/src/JSystem/JFramework/JFWDisplay.cpp +++ b/src/JSystem/JFramework/JFWDisplay.cpp @@ -389,7 +389,7 @@ void JFWDisplay::clearEfb_init() { } /* 80255F60-80255FA0 .text clearEfb__10JFWDisplayF8_GXColor */ -void JFWDisplay::clearEfb(_GXColor color) { +void JFWDisplay::clearEfb(GXColor color) { int height = mpRenderMode->efb_height; int width = mpRenderMode->fb_width; diff --git a/src/JSystem/JUtility/JUTPalette.cpp b/src/JSystem/JUtility/JUTPalette.cpp index a85b2149c..c65c613e9 100644 --- a/src/JSystem/JUtility/JUTPalette.cpp +++ b/src/JSystem/JUtility/JUTPalette.cpp @@ -2,7 +2,7 @@ #include "dolphin/gx/GX.h" #include "dolphin/os/OS.h" -void JUTPalette::storeTLUT(_GXTlut param_0, ResTLUT* tlut) { +void JUTPalette::storeTLUT(GXTlut param_0, ResTLUT* tlut) { if (tlut == NULL) { OSPanic("JUTPalette.cpp", 35, "JUTTexture: TLUT is NULL\n"); } @@ -14,7 +14,7 @@ void JUTPalette::storeTLUT(_GXTlut param_0, ResTLUT* tlut) { GXInitTlutObj(&mTlutObj, (void*)mColorTable, (GXTlutFmt)mFormat, mNumColors); } -void JUTPalette::storeTLUT(_GXTlut param_0, _GXTlutFmt param_1, JUTTransparency param_2, +void JUTPalette::storeTLUT(GXTlut param_0, _GXTlutFmt param_1, JUTTransparency param_2, u16 param_3, void* param_4) { mTlutName = param_0; mFormat = param_1; diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/src/JSystem/JUtility/JUTTexture.cpp index 7a8dfe6e1..3c223bfeb 100644 --- a/src/JSystem/JUtility/JUTTexture.cpp +++ b/src/JSystem/JUtility/JUTTexture.cpp @@ -48,13 +48,13 @@ void JUTTexture::storeTIMG(const ResTIMG* pTimg, u8 param_1) { initTexObj(); } else { if (mTexInfo->numColors > 0x100) { - tlut = (_GXTlut)((param_1 % 4) + GX_BIGTLUT0); + tlut = (GXTlut)((param_1 % 4) + GX_BIGTLUT0); } else { - tlut = (_GXTlut)param_1; + tlut = (GXTlut)param_1; } mEmbPalette = new JUTPalette( - tlut, (_GXTlutFmt)mTexInfo->colorFormat, (JUTTransparency)mTexInfo->alphaEnabled, + tlut, (GXTlutFmt)mTexInfo->colorFormat, (JUTTransparency)mTexInfo->alphaEnabled, mTexInfo->numColors, (void*)(&mTexInfo->format + mTexInfo->paletteOffset)); mFlags = mFlags & 1 | 2; @@ -71,7 +71,7 @@ void JUTTexture::attachPalette(JUTPalette* pPalette) { } else { mAttachedPalette = pPalette; } - _GXTlut name = (_GXTlut)mAttachedPalette->getTlutName(); + _GXTlut name = (GXTlut)mAttachedPalette->getTlutName(); initTexObj(name); } } @@ -94,7 +94,7 @@ void JUTTexture::initTexObj() { } /* 802C1740-802C183C .text initTexObj__10JUTTextureF7_GXTlut */ -void JUTTexture::initTexObj(_GXTlut tlut) { +void JUTTexture::initTexObj(GXTlut tlut) { GXBool mipmapEnabled; if (mTexInfo->mipmapEnabled != 0) { mipmapEnabled = 1; @@ -112,7 +112,7 @@ void JUTTexture::initTexObj(_GXTlut tlut) { } /* 802C183C-802C188C .text load__10JUTTextureF11_GXTexMapID */ -void JUTTexture::load(_GXTexMapID id) { +void JUTTexture::load(GXTexMapID id) { if (mAttachedPalette) { mAttachedPalette->load(); } diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 9c84bb001..5a4d47d64 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -933,7 +933,7 @@ bool mDoGph_screenCapture() { setUpRectangle(); GXSetTexCopySrc(centerX - sizeW, centerY - sizeH, sizeW2, sizeH2); - GXSetTexCopyDst(sizeW, sizeH, (_GXTexFmt)mCaptureCaptureFormat, GX_TRUE); + GXSetTexCopyDst(sizeW, sizeH, (GXTexFmt)mCaptureCaptureFormat, GX_TRUE); DCInvalidateRange(mCaptureCaptureBuffer, mCaptureCaptureSize); GXCopyTex(mCaptureCaptureBuffer, GX_FALSE); GXPixModeSync();