mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-21 14:07:29 -04:00
Remove leading underscore from uses of GX enums
This commit is contained in:
@@ -77,8 +77,8 @@ public:
|
||||
};
|
||||
|
||||
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;
|
||||
|
||||
@@ -137,7 +137,7 @@ public:
|
||||
J3DSys();
|
||||
void loadPosMtxIndx(int, u16) const;
|
||||
void loadNrmMtxIndx(int, u16) const;
|
||||
void setTexCacheRegion(_GXTexCacheSize);
|
||||
void setTexCacheRegion(GXTexCacheSize);
|
||||
void drawInit();
|
||||
void reinitGX();
|
||||
void reinitGenMode();
|
||||
|
||||
@@ -14,7 +14,7 @@ class JUTDirectPrint;
|
||||
|
||||
class JUTExternalFB {
|
||||
public:
|
||||
JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32);
|
||||
JUTExternalFB(GXRenderModeObj*, GXGamma, void*, u32);
|
||||
|
||||
private:
|
||||
/* 0x00 */ _GXRenderModeObj* mRenderMode;
|
||||
|
||||
@@ -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; }
|
||||
|
||||
@@ -55,9 +55,9 @@ public:
|
||||
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; }
|
||||
|
||||
@@ -16,7 +16,7 @@ public:
|
||||
|
||||
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);
|
||||
|
||||
+3
-3
@@ -163,7 +163,7 @@ public:
|
||||
~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;
|
||||
|
||||
@@ -51,7 +51,7 @@ public:
|
||||
class dDlst_2DtEff1_c : public dDlst_base_c {
|
||||
public:
|
||||
~dDlst_2DtEff1_c() {}
|
||||
void init(_GXColor);
|
||||
void init(GXColor);
|
||||
void draw();
|
||||
|
||||
/* 0x004 */ f32 timer;
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user