mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-18 06:15:20 -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/J3DGraphBase/J3DGD.h
+3 -3
View File
@@ -81,8 +81,8 @@ void J3DGDSetTexLookupMode(GXTexMapID, GXTexWrapMode, GXTexWrapMode, GXTexFilter
void J3DGDSetTexImgAttr(GXTexMapID, u16, u16, GXTexFmt);
void J3DGDSetTexImgPtr(GXTexMapID, void*);
void J3DGDSetTexImgPtrRaw(GXTexMapID, u32);
void J3DGDSetTexTlut(GXTexMapID, u32, _GXTlutFmt);
void J3DGDLoadTlut(void*, u32, _GXTlutSize);
void J3DGDSetTexTlut(GXTexMapID, u32, GXTlutFmt);
void J3DGDLoadTlut(void*, u32, GXTlutSize);
void J3DGDSetIndTexMtx(GXIndTexMtxID, f32 (*)[3], s8);
void J3DGDSetIndTexCoordScale(GXIndTexStageID, GXIndTexScale, GXIndTexScale, GXIndTexScale,
GXIndTexScale);
@@ -93,7 +93,7 @@ void J3DGDSetTevOrder(GXTevStageID, GXTexCoordID, GXTexMapID, GXChannelID, GXTex
void J3DGDSetTevKColor(GXTevKColorID, GXColor);
void J3DGDSetTevColorS10(GXTevRegID, GXColorS10);
void J3DGDSetFog(GXFogType, f32, f32, f32, f32, GXColor);
void J3DGDSetFogRangeAdj(u8, u16, _GXFogAdjTable*);
void J3DGDSetFogRangeAdj(GXBool, u16, _GXFogAdjTable*);
inline void J3DGDSetNumChans(u8 numChans) {
J3DGDWriteXFCmd(0x1009, numChans);
include/JSystem/J3DGraphBase/J3DShape.h
+2 -2
View File
@@ -125,8 +125,8 @@ public:
static const int kVcdVatDLSize = 0xC0;
void initialize();
void addTexMtxIndexInDL(_GXAttr, u32);
void addTexMtxIndexInVcd(_GXAttr);
void addTexMtxIndexInDL(GXAttr, u32);
void addTexMtxIndexInVcd(GXAttr);
void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
u16 countBumpMtxNum() const;
void loadVtxArray() const;
include/JSystem/J3DGraphBase/J3DSys.h
+2 -2
View File
@@ -145,13 +145,13 @@ struct J3DSys {
void setModelDrawMtx(Mtx* pMtxArr) {
J3D_ASSERT_NULLPTR(230, pMtxArr);
mModelDrawMtx = pMtxArr;
GXSetArray(GX_POS_MTX_ARRAY, mModelDrawMtx, sizeof(*mModelDrawMtx));
GXSETARRAY(GX_POS_MTX_ARRAY, mModelDrawMtx, sizeof(*mModelDrawMtx), sizeof(*mModelDrawMtx));
}
void setModelNrmMtx(Mtx33* pMtxArr) {
J3D_ASSERT_NULLPTR(241, pMtxArr);
mModelNrmMtx = pMtxArr;
GXSetArray(GX_NRM_MTX_ARRAY, mModelNrmMtx, sizeof(*mModelNrmMtx));
GXSETARRAY(GX_POS_MTX_ARRAY, mModelNrmMtx, sizeof(*mModelNrmMtx), sizeof(*mModelNrmMtx));
}
void* getVtxPos() { return mVtxPos; }
include/JSystem/J3DGraphBase/J3DVertex.h
-1
View File
@@ -5,7 +5,6 @@
#include <dolphin/mtx.h>
#include "dusk/endian_gx.hpp"
typedef struct _GXColor GXColor;
class J3DModel;
class J3DAnmVtxColor;
class J3DVertexBuffer;