mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-22 06:20:02 -04:00
Use _GX name typedefs
This commit is contained in:
@@ -53,7 +53,7 @@ inline void J3DGXCmd1f32ptr(f32* value) {
|
||||
GXFIFO.u32 = *(u32*)value;
|
||||
}
|
||||
|
||||
void J3DGDSetGenMode(u8 texGenNum, u8 colorChanNum, u8 tevStageNum, u8 IndTexStageNum, _GXCullMode cullMode);
|
||||
void J3DGDSetGenMode(u8 texGenNum, u8 colorChanNum, u8 tevStageNum, u8 IndTexStageNum, GXCullMode cullMode);
|
||||
void J3DGDSetGenMode_3Param(u8 texGenNum, u8 tevStageNum, u8 indTexStageNum);
|
||||
void J3DGDSetIndTexStageNum(u32);
|
||||
void J3DGDSetLightAttn(GXLightID, f32, f32, f32, f32, f32, f32);
|
||||
|
||||
@@ -37,7 +37,7 @@ public:
|
||||
J3DTexture(u16 num, ResTIMG* res) : mNum(num), mpRes(res) {}
|
||||
virtual ~J3DTexture() {}
|
||||
|
||||
void loadGX(u16, _GXTexMapID) const;
|
||||
void loadGX(u16, GXTexMapID) const;
|
||||
void entryNum(u16);
|
||||
void addResTIMG(u16, ResTIMG const*);
|
||||
|
||||
|
||||
@@ -40,8 +40,8 @@ public:
|
||||
/* 0x1 */ Async = 1,
|
||||
};
|
||||
|
||||
void ctor_subroutine(const _GXRenderModeObj*, bool enableAlpha);
|
||||
JFWDisplay(const _GXRenderModeObj*, JKRHeap*, JUTXfb::EXfbNumber, bool);
|
||||
void ctor_subroutine(const GXRenderModeObj*, bool enableAlpha);
|
||||
JFWDisplay(const GXRenderModeObj*, JKRHeap*, JUTXfb::EXfbNumber, bool);
|
||||
static JFWDisplay* createManager(JKRHeap*, JUTXfb::EXfbNumber, bool);
|
||||
void prepareCopyDisp();
|
||||
void drawendXfb_single();
|
||||
@@ -103,7 +103,7 @@ public:
|
||||
|
||||
private:
|
||||
/* 0x04 */ JUTFader* mpFader;
|
||||
/* 0x08 */ const _GXRenderModeObj* mpRenderMode;
|
||||
/* 0x08 */ const GXRenderModeObj* mpRenderMode;
|
||||
/* 0x0C */ JUtility::TColor mClearColor;
|
||||
/* 0x10 */ u32 mZClear;
|
||||
/* 0x14 */ JUTXfb* mXfbManager;
|
||||
|
||||
@@ -55,7 +55,7 @@ public:
|
||||
void calcChild(JPABaseParticle*);
|
||||
void initParticle(JPABaseParticle*);
|
||||
void initChild(JPABaseParticle*, JPABaseParticle*);
|
||||
bool loadTexture(u8, _GXTexMapID);
|
||||
bool loadTexture(u8, GXTexMapID);
|
||||
void setDrawExecVisitorsBeforeCB(const JPADraw::JPADrawVisitorDefFlags&);
|
||||
void setDrawExecVisitorsAfterCB(const JPADraw::JPADrawVisitorDefFlags&);
|
||||
void setDrawCalcVisitors(const JPADraw::JPADrawVisitorDefFlags&);
|
||||
|
||||
@@ -49,7 +49,7 @@ public:
|
||||
void prepend(TGlyphCacheInfo*);
|
||||
|
||||
virtual ~JUTCacheFont();
|
||||
virtual void loadImage(int, _GXTexMapID);
|
||||
virtual void loadImage(int, GXTexMapID);
|
||||
virtual void setBlock();
|
||||
|
||||
void setPagingType(EPagingType type) { mPagingType = type; }
|
||||
|
||||
@@ -17,7 +17,7 @@ public:
|
||||
JUTExternalFB(GXRenderModeObj*, GXGamma, void*, u32);
|
||||
|
||||
private:
|
||||
/* 0x00 */ _GXRenderModeObj* mRenderMode;
|
||||
/* 0x00 */ GXRenderModeObj* mRenderMode;
|
||||
/* 0x04 */ u32 mSize;
|
||||
/* 0x08 */ u32 field_0x08;
|
||||
/* 0x0C */ u16 field_0x0C;
|
||||
|
||||
@@ -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, GXTlutFmt, JUTTransparency, u16, void*);
|
||||
bool load();
|
||||
|
||||
u8 getTlutName() const { return mTlutName; }
|
||||
@@ -31,7 +31,7 @@ public:
|
||||
ResTLUT* getColorTable() const { return mColorTable; }
|
||||
|
||||
private:
|
||||
/* 0x00 */ _GXTlutObj mTlutObj;
|
||||
/* 0x00 */ GXTlutObj mTlutObj;
|
||||
/* 0x0C */ u8 mTlutName;
|
||||
/* 0x0D */ u8 mFormat;
|
||||
/* 0x10 */ ResTLUT* mColorTable;
|
||||
|
||||
@@ -25,7 +25,7 @@ public:
|
||||
virtual int getCellWidth() const;
|
||||
virtual s32 getCellHeight() const;
|
||||
virtual bool isLeadByte(int) const;
|
||||
virtual void loadImage(int, _GXTexMapID);
|
||||
virtual void loadImage(int, GXTexMapID);
|
||||
virtual void setBlock();
|
||||
|
||||
JUTResFont(ResFONT const*, JKRHeap*);
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
bool initiate(ResFONT const*, JKRHeap*);
|
||||
bool protected_initiate(ResFONT const*, JKRHeap*);
|
||||
void countBlock();
|
||||
void loadFont(int, _GXTexMapID, JUTFont::TWidth*);
|
||||
void loadFont(int, GXTexMapID, JUTFont::TWidth*);
|
||||
int getFontCode(int) const;
|
||||
int convertSjis(int, u16*) const;
|
||||
|
||||
@@ -49,7 +49,7 @@ public:
|
||||
|
||||
/* 0x1C */ int mWidth;
|
||||
/* 0x20 */ int mHeight;
|
||||
/* 0x24 */ _GXTexObj mTexObj;
|
||||
/* 0x24 */ GXTexObj mTexObj;
|
||||
/* 0x44 */ int mTexPageIdx;
|
||||
/* 0x48 */ const ResFONT* mResFont;
|
||||
/* 0x4C */ ResFONT::INF1* mInfoBlock;
|
||||
|
||||
@@ -50,7 +50,7 @@ public:
|
||||
}
|
||||
|
||||
~JUTTexture();
|
||||
void storeTIMG(ResTIMG const*, JUTPalette*, _GXTlut);
|
||||
void storeTIMG(ResTIMG const*, JUTPalette*, GXTlut);
|
||||
void storeTIMG(ResTIMG const*, u8);
|
||||
void storeTIMG(ResTIMG const*, JUTPalette*);
|
||||
void attachPalette(JUTPalette*);
|
||||
|
||||
@@ -51,7 +51,7 @@ private:
|
||||
static OSTick sVideoInterval;
|
||||
|
||||
private:
|
||||
/* 0x04 */ _GXRenderModeObj* mRenderObj;
|
||||
/* 0x04 */ GXRenderModeObj* mRenderObj;
|
||||
/* 0x08 */ u32 field_0x8;
|
||||
/* 0x0C */ u32 mRetraceCount;
|
||||
/* 0x10 */ u32 field_0x10;
|
||||
|
||||
@@ -19,7 +19,7 @@ public:
|
||||
JUTXfb(GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber);
|
||||
~JUTXfb();
|
||||
void delXfb(int);
|
||||
static JUTXfb* createManager(const _GXRenderModeObj*, JKRHeap*, JUTXfb::EXfbNumber);
|
||||
static JUTXfb* createManager(const GXRenderModeObj*, JKRHeap*, JUTXfb::EXfbNumber);
|
||||
static void destroyManager();
|
||||
void initiate(u16, u16, JKRHeap*, JUTXfb::EXfbNumber);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user