mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-30 01:49:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch to Aurora headers for GX/VI

Browse Source 
Replace GXSetArray() with GXSETARRAY() taking in size everywhere

Fix a ton of structs/enums being referred to with underscore name.
This commit is contained in:
PJB3005
2026-03-02 01:21:54 +01:00
parent fe21abb1ec
commit 883ba38bb8
74 changed files with 176 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DAnimation.h
+6 -8
View File
@@ -5,8 +5,6 @@
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "JSystem/JUtility/JUTPalette.h"
typedef struct _GXColor GXColor;
typedef struct _GXColorS10 GXColorS10;
class J2DScreen;
struct ResTIMG;
@@ -66,7 +64,7 @@ public:
}
}
virtual ~J2DAnmVtxColor() {}
virtual void getColor(u8, u16, _GXColor*) const {}
virtual void getColor(u8, u16, GXColor*) const {}
u16 getAnmTableNum(u8 param_0) const {
J3D_PANIC(342, param_0 < 2, "Error : range over.");
return mAnmTableNum[param_0];
@@ -101,7 +99,7 @@ public:
}
}
virtual ~J2DAnmVtxColorKey() {}
virtual void getColor(u8, u16, _GXColor*) const;
virtual void getColor(u8, u16, GXColor*) const;
/* 0x24 */ J3DAnmColorKeyTable* mInfoTable[2];
/* 0x2C */ s16* mRValues;
@@ -122,7 +120,7 @@ public:
}
}
virtual ~J2DAnmVtxColorFull() {}
virtual void getColor(u8, u16, _GXColor*) const;
virtual void getColor(u8, u16, GXColor*) const;
/* 0x24 */ J3DAnmColorFullTable* mInfoTable[2];
/* 0x2C */ u8* mRValues;
@@ -400,7 +398,7 @@ public:
}
virtual ~J2DAnmColor() {}
virtual void searchUpdateMaterialID(J2DScreen*);
virtual void getColor(u16, _GXColor*) const {}
virtual void getColor(u16, GXColor*) const {}
u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
u16 getUpdateMaterialID(u16 i) const {
J3D_PANIC(224, i < mUpdateMaterialNum, "Error : range over.");
@@ -430,7 +428,7 @@ public:
mInfoTable = NULL;
}
virtual ~J2DAnmColorKey() {}
virtual void getColor(u16, _GXColor*) const;
virtual void getColor(u16, GXColor*) const;
/* 0x30 */ s16* mRValues;
/* 0x34 */ s16* mGValues;
@@ -468,7 +466,7 @@ public:
mInfoTable = NULL;
}
virtual ~J2DAnmColorFull() {}
virtual void getColor(u16, _GXColor*) const;
virtual void getColor(u16, GXColor*) const;
/* 0x30 */ u8* mRValues;
/* 0x34 */ u8* mGValues;
include/JSystem/J2DGraph/J2DMatBlock.h
+6 -6
View File
@@ -69,7 +69,7 @@ class J2DTevBlock {
public:
virtual void initialize() {}
virtual void setGX() {}
virtual void loadTexture(_GXTexMapID, u32) {}
virtual void loadTexture(GXTexMapID, u32) {}
virtual u32 getType() = 0;
virtual u8 getMaxStage() = 0;
virtual void setTexNo(u32, u16) {}
@@ -124,7 +124,7 @@ public:
virtual void initialize();
virtual void setGX();
virtual void loadTexture(_GXTexMapID, u32);
virtual void loadTexture(GXTexMapID, u32);
virtual u32 getType() { return 'TVB1'; }
virtual u8 getMaxStage() { return 1; }
virtual void setTexNo(u32 index, u16 texNo) {
@@ -264,7 +264,7 @@ public:
virtual void initialize();
virtual void setGX();
virtual void loadTexture(_GXTexMapID, u32);
virtual void loadTexture(GXTexMapID, u32);
virtual u32 getType() { return 'TVB2'; }
virtual u8 getMaxStage() { return 2; }
virtual void setTexNo(u32 index, u16 texNo) {
@@ -406,7 +406,7 @@ public:
virtual void initialize();
virtual void setGX();
virtual void loadTexture(_GXTexMapID, u32);
virtual void loadTexture(GXTexMapID, u32);
virtual u32 getType() { return 'TVB4'; }
virtual u8 getMaxStage() { return 4; }
virtual void setTexNo(u32 index, u16 texNo) {
@@ -548,7 +548,7 @@ public:
virtual void initialize();
virtual void setGX();
virtual void loadTexture(_GXTexMapID, u32);
virtual void loadTexture(GXTexMapID, u32);
virtual u32 getType() { return 'TVB8'; }
virtual u8 getMaxStage() { return 8; }
virtual void setTexNo(u32 index, u16 texNo) {
@@ -691,7 +691,7 @@ public:
virtual void initialize();
virtual void setGX();
virtual void loadTexture(_GXTexMapID, u32);
virtual void loadTexture(GXTexMapID, u32);
virtual u32 getType() { return 'TV16'; }
virtual u8 getMaxStage() { return 16; }
virtual void setTexNo(u32 index, u16 texNo) {
include/JSystem/J2DGraph/J2DMaterialFactory.h
-2
View File
@@ -40,8 +40,6 @@ struct J2DMaterialBlock {
BE(u32) field_0x64;
};
typedef struct _GXColor GXColor;
typedef struct _GXColorS10 GXColorS10;
struct J2DAlphaCompInfo;
struct J2DBlendInfo;
struct J2DColorChanInfo;
include/JSystem/J2DGraph/J2DPane.h
+1 -1
View File
@@ -96,7 +96,7 @@ public:
setCullBack(mode);
}
/* vt 0x20 */ virtual void setCullBack(_GXCullMode cmode);
/* vt 0x20 */ virtual void setCullBack(GXCullMode cmode);
/* vt 0x24 */ virtual void setAlpha(u8 alpha) {
mAlpha = alpha;
};
include/JSystem/J2DGraph/J2DPicture.h
+2 -2
View File
@@ -130,12 +130,12 @@ public:
JGeometry::TBox2<f32>(param_4, param_5, param_4 + param_6, param_5 + param_7));
}
virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
virtual void load(_GXTexMapID param_0, u8 param_1) {
virtual void load(GXTexMapID param_0, u8 param_1) {
if (param_1 < mTextureNum && param_1 < 2 && mTexture[param_1] != NULL) {
mTexture[param_1]->load(param_0);
}
}
virtual void load(u8 param_0) { load((_GXTexMapID)param_0, param_0); }
virtual void load(u8 param_0) { load((GXTexMapID)param_0, param_0); }
virtual void setBlendRatio(f32 param_0, f32 param_1) {
setBlendColorRatio(param_0, param_1);
setBlendAlphaRatio(param_0, param_1);
include/JSystem/J2DGraph/J2DPictureEx.h
+2 -2
View File
@@ -39,7 +39,7 @@ public:
virtual ~J2DPictureEx();
virtual void setCullBack(bool);
virtual void setCullBack(_GXCullMode);
virtual void setCullBack(GXCullMode);
virtual void setAlpha(u8);
virtual void drawSelf(f32, f32, f32 (*)[3][4]);
virtual bool isUsed(ResTIMG const*);
@@ -80,7 +80,7 @@ public:
virtual void drawOut(f32, f32, f32, f32, f32, f32);
virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32);
virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
virtual void load(_GXTexMapID, u8);
virtual void load(GXTexMapID, u8);
virtual void load(u8);
virtual void setBlendColorRatio(f32, f32);
virtual void setBlendAlphaRatio(f32, f32);
include/JSystem/J2DGraph/J2DTextBoxEx.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
virtual ~J2DTextBoxEx();
virtual void setCullBack(bool);
virtual void setCullBack(_GXCullMode);
virtual void setCullBack(GXCullMode);
virtual void setAlpha(u8);
virtual void drawSelf(f32, f32, f32 (*)[3][4]);
virtual bool isUsed(ResTIMG const*);
include/JSystem/J2DGraph/J2DWindowEx.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
virtual ~J2DWindowEx();
virtual void setCullBack(bool);
virtual void setCullBack(_GXCullMode);
virtual void setCullBack(GXCullMode);
virtual void setAlpha(u8);
virtual void drawSelf(f32, f32, f32 (*)[3][4]);
virtual bool isUsed(ResTIMG const*);