mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-27 14:39: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
src/JSystem/J2DGraph/J2DAnimation.cpp
+4 -4
View File
@@ -264,7 +264,7 @@ void J2DAnmColor::searchUpdateMaterialID(J2DScreen* pScreen) {
}
}
void J2DAnmColorFull::getColor(u16 param_0, _GXColor* pColor) const {
void J2DAnmColorFull::getColor(u16 param_0, GXColor* pColor) const {
J3D_PANIC(432, param_0 < mUpdateMaterialNum, "Error : range over.");
J3D_PANIC(433, pColor, "Error : null pointer.");
J3DAnmColorFullTable* info = &mInfoTable[param_0];
@@ -302,7 +302,7 @@ void J2DAnmColorFull::getColor(u16 param_0, _GXColor* pColor) const {
}
}
void J2DAnmColorKey::getColor(u16 param_0, _GXColor* pColor) const {
void J2DAnmColorKey::getColor(u16 param_0, GXColor* pColor) const {
J3D_PANIC(490, param_0 < mUpdateMaterialNum, "Error : range over.");
J3D_PANIC(491, pColor, "Error : null pointer.");
J3DAnmColorKeyTable* info = &mInfoTable[param_0];
@@ -381,7 +381,7 @@ void J2DAnmColorKey::getColor(u16 param_0, _GXColor* pColor) const {
}
}
void J2DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, _GXColor* pColor) const {
void J2DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, GXColor* pColor) const {
J3D_PANIC(597, pColor, "Error : null pointer.");
J3DAnmColorFullTable* info = &mInfoTable[param_0][param_1];
u16 maxFrame = info->mRMaxFrame;
@@ -418,7 +418,7 @@ void J2DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, _GXColor* pColor) con
}
}
void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, _GXColor* pColor) const {
void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, GXColor* pColor) const {
J3D_PANIC(658, pColor, "Error : null pointer.");
J3DAnmColorKeyTable* info = &mInfoTable[param_0][param_1];
f32 val;
src/JSystem/J2DGraph/J2DPictureEx.cpp
+1 -1
View File
@@ -577,7 +577,7 @@ void J2DPictureEx::drawOut(JGeometry::TBox2<f32> const& param_0,
GXSetVtxDesc(GX_VA_TEX0, GX_NONE);
}
void J2DPictureEx::load(_GXTexMapID param_0, u8 param_1) {
void J2DPictureEx::load(GXTexMapID param_0, u8 param_1) {
if (mMaterial == NULL) {
return;
}
src/JSystem/J2DGraph/J2DWindowEx.cpp
+2 -2
View File
@@ -632,7 +632,7 @@ void J2DWindowEx::setAlpha(u8 param_0) {
}
}
void J2DWindowEx::setCullBack(_GXCullMode param_0) {
void J2DWindowEx::setCullBack(GXCullMode param_0) {
mCullMode = param_0;
for (int i = 0; i < 4; i++) {
@@ -845,7 +845,7 @@ void J2DWindowEx::draw(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
}
void J2DWindowEx::setCullBack(bool param_0) {
_GXCullMode mode;
GXCullMode mode;
if (param_0) {
mode = GX_CULL_BACK;
} else {
src/JSystem/J3DGraphBase/J3DShape.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include "JSystem/J3DGraphBase/J3DPacket.h"
#include "JSystem/J3DGraphBase/J3DVertex.h"
void J3DGDSetVtxAttrFmtv(_GXVtxFmt, GXVtxAttrFmtList const*, bool);
void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList const*, bool);
void J3DFifoLoadPosMtxImm(Mtx, u32);
void J3DFifoLoadNrmMtxImm(Mtx, u32);
src/JSystem/J3DGraphBase/J3DTevs.cpp
+2 -2
View File
@@ -448,7 +448,7 @@ void makeTevSwapTable() {
void J3DTexMtx::loadTexMtx(u32 param_0) const {
GDOverflowCheck(0x35);
J3DGDLoadTexMtxImm((MtxP)mMtx, param_0 * 3 + 30, (_GXTexMtxType)mTexMtxInfo.mProjection);
J3DGDLoadTexMtxImm((MtxP)mMtx, param_0 * 3 + 30, (GXTexMtxType)mTexMtxInfo.mProjection);
}
void J3DTexMtx::loadPostTexMtx(u32 param_0) const {
@@ -456,7 +456,7 @@ void J3DTexMtx::loadPostTexMtx(u32 param_0) const {
J3DGDLoadPostTexMtxImm((MtxP)mMtx, param_0 * 3 + 0x40);
}
static void J3DGDLoadTexMtxImm(f32 (*param_1)[4], u32 param_2, _GXTexMtxType param_3) {
static void J3DGDLoadTexMtxImm(f32 (*param_1)[4], u32 param_2, GXTexMtxType param_3) {
u16 addr = param_2 << 2;
u8 len = param_3 == GX_MTX2x4 ? 8 : 12;
J3DGDWriteXFCmdHdr(addr, len);
src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+1 -1
View File
@@ -281,7 +281,7 @@ void J3DModelLoader::readInformation(J3DModelInfoBlock const* i_block, u32 i_fla
mpModelData->setHierarchy(JSUConvertOffsetToPtr<J3DModelHierarchy>(i_block, i_block->mpHierarchy));
}
static _GXCompType getFmtType(_GXVtxAttrFmtList* i_fmtList, _GXAttr i_attr) {
static GXCompType getFmtType(GXVtxAttrFmtList* i_fmtList, GXAttr i_attr) {
for (; i_fmtList->attr != GX_VA_NULL; i_fmtList++) {
if (i_fmtList->attr == i_attr) {
return i_fmtList->type;
src/JSystem/JFramework/JFWDisplay.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ JFWDisplay::~JFWDisplay() {
JFWDisplay* JFWDisplay::sManager;
JFWDisplay* JFWDisplay::createManager(_GXRenderModeObj const* p_rObj, JKRHeap* p_heap,
JFWDisplay* JFWDisplay::createManager(GXRenderModeObj const* p_rObj, JKRHeap* p_heap,
JUTXfb::EXfbNumber xfb_num, bool enableAlpha) {
JUT_CONFIRM(173, sManager == NULL);
if (p_rObj != NULL) {
src/JSystem/JParticle/JPAResource.cpp
+4 -4
View File
@@ -926,8 +926,8 @@ void JPAResource::setPTev() {
int center_offset = pEsp != NULL ? (pEsp->getScaleCenterX() + 3 * pEsp->getScaleCenterY()) * 0xC : 0x30;
int pos_offset = center_offset + base_plane_type * 0x6C;
int crd_offset = (pBsp->getTilingS() + 2 * pBsp->getTilingT()) * 8;
GXSetArray(GX_VA_POS, jpa_pos + pos_offset, 3);
GXSetArray(GX_VA_TEX0, jpa_crd + crd_offset, 2);
GXSETARRAY(GX_VA_POS, jpa_pos + pos_offset, ARRAY_SIZEU(jpa_pos) - pos_offset, 3);
GXSETARRAY(GX_VA_TEX0, jpa_crd + crd_offset, ARRAY_SIZEU(jpa_crd) - crd_offset, 2);
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);
if (pEts != NULL) {
@@ -969,8 +969,8 @@ void JPAResource::setCTev(JPAEmitterWorkData* work) {
int base_plane_type = (pCsp->getType() == 3 || pCsp->getType() == 7) ?
pCsp->getBasePlaneType() : 0;
int pos_offset = 0x30 + base_plane_type * 0x6C;
GXSetArray(GX_VA_POS, jpa_pos + pos_offset, 3);
GXSetArray(GX_VA_TEX0, jpa_crd, 2);
GXSETARRAY(GX_VA_POS, jpa_pos + pos_offset, ARRAY_SIZEU(jpa_pos) - pos_offset, 3);
GXSETARRAY(GX_VA_TEX0, jpa_crd, ARRAY_SIZEU(jpa_crd), 2);
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP1, GX_COLOR_NULL);
GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x3C);
GXSetTevDirect(GX_TEVSTAGE0);
src/JSystem/JUtility/JUTCacheFont.cpp
+1 -1
View File
@@ -364,7 +364,7 @@ void JUTCacheFont::getGlyphFromAram(JUTCacheFont::TGlyphCacheInfo* param_0,
GX_ANISO_1);
}
void JUTCacheFont::loadImage(int param_0, _GXTexMapID texMapId) {
void JUTCacheFont::loadImage(int param_0, GXTexMapID texMapId) {
TCachePage* cachePage = loadCache_char_subroutine(&param_0, false);
if (cachePage != NULL) {
mWidth = cachePage->field_0xc * (param_0 % (int)cachePage->field_0x16);
src/JSystem/JUtility/JUTException.cpp
+4 -2
View File
@@ -1,3 +1,5 @@
#include <dolphin/vi.h>
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JUtility/JUTException.h"
@@ -766,7 +768,7 @@ void JUTException::waitTime(s32 timeout_ms) {
}
void JUTException::createFB() {
_GXRenderModeObj* renderMode = &GXNtsc480Int;
GXRenderModeObj* renderMode = &GXNtsc480Int;
void* end = (void*)OSGetArenaHi();
u32 size = ((u16)ALIGN_NEXT((u16)renderMode->fbWidth, 16) * renderMode->xfbHeight) * 2;
@@ -994,7 +996,7 @@ void JUTException::createConsole(void* console_buffer, u32 console_buffer_size)
}
}
JUTExternalFB::JUTExternalFB(_GXRenderModeObj* renderMode, GXGamma gamma, void* buffer, u32 size) {
JUTExternalFB::JUTExternalFB(GXRenderModeObj* renderMode, GXGamma gamma, void* buffer, u32 size) {
mRenderMode = renderMode;
mSize = size;
field_0x0C = 1;
src/JSystem/JUtility/JUTPalette.cpp
+4
View File
@@ -29,7 +29,11 @@ void JUTPalette::storeTLUT(GXTlut param_0, GXTlutFmt param_1, JUTTransparency pa
bool JUTPalette::load() {
bool check = mNumColors != 0;
if (check) {
#if TARGET_PC
GXLoadTlut(&mTlutObj, (GXTlut)mTlutName);
#else
GXLoadTlut(&mTlutObj, mTlutName);
#endif
}
return check;
src/JSystem/JUtility/JUTVideo.cpp
+1 -1
View File
@@ -14,7 +14,7 @@ OSTick JUTVideo::sVideoInterval;
static bool data_80451544;
JUTVideo* JUTVideo::createManager(_GXRenderModeObj const* param_0) {
JUTVideo* JUTVideo::createManager(GXRenderModeObj const* param_0) {
if (sManager == NULL) {
sManager = new JUTVideo(param_0);
}
src/d/actor/d_a_e_nz.cpp
+2 -2
View File
@@ -373,8 +373,8 @@ static void e_nz_damage(e_nz_class* i_this) {
}
}
static BOOL getPolyColor(cBgS_PolyInfo& param_1, int param_2, _GXColor* param_3,
_GXColor* param_4, u8* param_5, f32* param_6) {
static BOOL getPolyColor(cBgS_PolyInfo& param_1, int param_2, GXColor* param_3,
GXColor* param_4, u8* param_5, f32* param_6) {
if (!dComIfG_Bgsp().ChkPolySafe(param_1)) {
return FALSE;
}
src/d/actor/d_a_e_rdb.cpp
+4 -4
View File
@@ -252,8 +252,8 @@ static void e_rdb_fight(e_rdb_class* i_this) {
i_this->field_0x6c8 = 1;
}
static int getPolyColor(cBgS_PolyInfo& i_polyInfo, int param_2, _GXColor* p_effPrim,
_GXColor* p_effEnv, u8* p_alpha, f32* p_ratio) {
static int getPolyColor(cBgS_PolyInfo& i_polyInfo, int param_2, GXColor* p_effPrim,
GXColor* p_effEnv, u8* p_alpha, f32* p_ratio) {
if (dComIfG_Bgsp().ChkPolySafe(i_polyInfo) == 0) {
return 0;
}
@@ -301,7 +301,7 @@ static void e_rdb_attack(e_rdb_class* i_this) {
if (frame == 68) {
u8 i_alpha;
f32 i_ratio;
_GXColor i_effPrim, i_effEnv;
GXColor i_effPrim, i_effEnv;
if (getPolyColor(i_this->mAcch.m_gnd, 0, &i_effPrim, &i_effEnv, &i_alpha, &i_ratio) !=
0)
{
@@ -395,7 +395,7 @@ static void e_rdb_spin_attack(e_rdb_class* i_this) {
cLib_addCalc0(&i_this->enemy.speedF, 1.0f, 3.0f);
u8 i_alpha;
f32 i_ratio;
_GXColor i_effPrim, i_effEnv;
GXColor i_effPrim, i_effEnv;
if (iVar1 != 0 &&
getPolyColor(i_this->mAcch.m_gnd, 0, &i_effPrim, &i_effEnv, &i_alpha, &i_ratio) != 0)
{
src/d/actor/d_a_e_sb.cpp
+1 -1
View File
@@ -1048,7 +1048,7 @@ int daE_SB_c::Draw() {
mpMorf->entryDL();
cXyz my_vec;
my_vec.set(current.pos.x, 100.0f + current.pos.y, current.pos.z);
_GXTexObj* tex_obj = dDlst_shadowControl_c::getSimpleTex();
GXTexObj* tex_obj = dDlst_shadowControl_c::getSimpleTex();
mShadowKey = dComIfGd_setShadow(mShadowKey, 1, model, &my_vec, 1000.0f, 300.0f,
current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd,
&tevStr, 0, 1.0f, tex_obj);
src/d/actor/d_a_e_sg.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ static int daE_SG_Draw(e_sg_class* i_this) {
cXyz shadow_pos(i_this->current.pos.x, i_this->current.pos.y + 100.0f,
i_this->current.pos.z);
_GXTexObj* tex_obj = dDlst_shadowControl_c::getSimpleTex();
GXTexObj* tex_obj = dDlst_shadowControl_c::getSimpleTex();
i_this->mShadowKey =
dComIfGd_setShadow(i_this->mShadowKey, 1, i_this->mpModel, &shadow_pos, 400.0f, 0.0f,
src/d/actor/d_a_e_wb.cpp
+1 -1
View File
@@ -352,7 +352,7 @@ static int e_wb_lr_wall_check(e_wb_class* i_this) {
}
static int daE_WB_Draw(e_wb_class* i_this) {
static _GXColor l_color = {
static GXColor l_color = {
0x14,
0x0F,
0x00,
src/d/actor/d_a_mant.cpp
+3 -3
View File
@@ -268,9 +268,9 @@ void daMant_packet_c::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_CLR_RGB, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_F32, 0);
GXSetArray(GX_VA_POS, this->getPos(), 12);
GXSetArray(GX_VA_NRM, this->getNrm(), 12);
GXSetArray(GX_VA_TEX0, &l_texCoord, 8);
GXSETARRAY(GX_VA_POS, this->getPos(), sizeof(mPos[0]), 12);
GXSETARRAY(GX_VA_NRM, this->getNrm(), sizeof(mNrm[0]), 12);
GXSETARRAY(GX_VA_TEX0, &l_texCoord, sizeof(l_texCoord), 8);
GXSetZCompLoc(0);
GXSetZMode(GX_ENABLE, GX_LEQUAL, GX_ENABLE);
src/d/actor/d_a_mg_fish.cpp
+1 -1
View File
@@ -678,7 +678,7 @@ s32 daMg_Fish_Draw(mg_fish_class* i_this) {
&i_this->actor.tevStr, 0, 1.0f, &dDlst_shadowControl_c::mSimpleTexObj);
}
if (i_this->mKind2 == 3) {
_GXColor color;
GXColor color;
color.r = 0x32;
color.g = 0x2d;
color.b = 0x14;
src/d/actor/d_a_npc4.cpp
+1 -1
View File
@@ -614,7 +614,7 @@ BOOL daNpcF_c::execute() {
return true;
}
int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor,
int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, GXColorS10* i_fogColor,
BOOL i_hideDamage) {
f32 damage_ratio, frame;
J3DModel* model = mAnm_p->getModel();
src/d/actor/d_a_npc_chat.cpp
+1 -1
View File
@@ -2809,7 +2809,7 @@ int daNpcChat_c::Draw() {
return 1;
}
int daNpcChat_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) {
int daNpcChat_c::draw(int param_1, int param_2, f32 param_3, GXColorS10* i_color, int param_5) {
J3DModel* model = mAnm_p->getModel();
J3DModelData* a_mdlData_p = model->getModelData();
src/d/actor/d_a_npc_gwolf.cpp
+1 -1
View File
@@ -408,7 +408,7 @@ int daNpc_GWolf_c::Draw() {
);
}
int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) {
int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, GXColorS10* i_color, int param_5) {
J3DModel* model = mAnm_p->getModel();
J3DModelData* mdlData_p = model->getModelData();
src/d/actor/d_a_npc_zrz.cpp
+1 -1
View File
@@ -330,7 +330,7 @@ int daNpc_zrZ_c::Draw() {
}
}
int daNpc_zrZ_c::draw(int i_isTest, int param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor,
int daNpc_zrZ_c::draw(int i_isTest, int param_1, f32 i_shadowDepth, GXColorS10* i_fogColor,
int i_hideDamage) {
f32 damage_ratio, frame;
J3DModel* model = mAnm_p->getModel();
src/d/actor/d_a_obj_flag2.cpp
+4 -4
View File
@@ -274,9 +274,9 @@ void FlagCloth_c::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_CLR_RGB, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_F32, 0);
GXSetArray(GX_VA_POS, getPos(), sizeof(cXyz));
GXSetArray(GX_VA_NRM, getNormal(), sizeof(cXyz));
GXSetArray(GX_VA_TEX0, mpTexCoord, 8);
GXSETARRAY(GX_VA_POS, getPos(), sizeof(mPositions), sizeof(cXyz));
GXSETARRAY(GX_VA_NRM, getNormal(), sizeof(mNormals), sizeof(cXyz));
GXSETARRAY(GX_VA_TEX0, mpTexCoord, sizeof(mpTexCoord), 8);
GXSetZCompLoc(GX_FALSE);
GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
GXLoadTexObj(&mTexObj, GX_TEXMAP0);
@@ -304,7 +304,7 @@ void FlagCloth_c::draw() {
GXSetClipMode(GX_CLIP_ENABLE);
GXSetCullMode(GX_CULL_BACK);
GXCallDisplayList(l_pennant_flagDL, 0x80);
GXSetArray(GX_VA_NRM, getNormalBack(), sizeof(cXyz));
GXSETARRAY(GX_VA_NRM, getNormalBack(), sizeof(mNormalBacks), sizeof(cXyz));
GXSetCullMode(GX_CULL_FRONT);
GXCallDisplayList(l_pennant_flagDL, 0x80);
J3DShape::resetVcdVatCache();
src/d/actor/d_a_obj_flag3.cpp
+4 -4
View File
@@ -233,9 +233,9 @@ inline void FlagCloth2_c::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_CLR_RGB, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_F32, 0);
GXSetArray(GX_VA_POS, getPos(), sizeof(cXyz));
GXSetArray(GX_VA_NRM, getNormal(), sizeof(cXyz));
GXSetArray(GX_VA_TEX0, mTexCoord, 8);
GXSETARRAY(GX_VA_POS, getPos(), sizeof(mPositions), sizeof(cXyz));
GXSETARRAY(GX_VA_NRM, getNormal(), sizeof(mNormals), sizeof(cXyz));
GXSETARRAY(GX_VA_TEX0, mTexCoord, sizeof(mTexCoord), 8);
GXSetZCompLoc(GX_FALSE);
GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
GXLoadTexObj(&mTexObj, GX_TEXMAP0);
@@ -276,7 +276,7 @@ inline void FlagCloth2_c::draw() {
GXEnd();
}
GXSetArray(GX_VA_NRM, getNormalBack(), sizeof(cXyz));
GXSETARRAY(GX_VA_NRM, getNormalBack(), sizeof(mNormalBacks), sizeof(cXyz));
GXSetCullMode(GX_CULL_FRONT);
for (int i = 0; i < 5; i++) {
src/d/actor/d_a_obj_kbacket.cpp
+1 -1
View File
@@ -530,7 +530,7 @@ int daObj_KBacket_c::Draw() {
} else {
cM3dGPla plane;
if (dComIfG_Bgsp().GetTriPla(mGndChk, &plane) != 0) {
_GXTexObj* p_Var4 = dDlst_shadowControl_c::getSimpleTex();
GXTexObj* p_Var4 = dDlst_shadowControl_c::getSimpleTex();
dComIfGd_setSimpleShadow(&current.pos, field_0xa00, 50.0f,
&plane.mNormal, 0, 1.0f, p_Var4);
}
src/d/actor/d_a_obj_laundry_rope.cpp
+1 -1
View File
@@ -230,7 +230,7 @@ static int createSolidHeap(fopAc_ac_c* i_this) {
}
int daObjLndRope_c::draw() {
static _GXColor l_color = {20, 15, 0, 255};
static GXColor l_color = {20, 15, 0, 255};
g_env_light.settingTevStruct(16, &current.pos, &tevStr);
mRopeMat.update(15, l_color, &tevStr);
dComIfGd_set3DlineMat(&mRopeMat);
src/d/actor/d_a_obj_lp.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ static int daObj_Lp_Draw(obj_lp_class* i_this) {
fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
wd_ss* mWdSs = i_this->mWdSs;
int roomNo = fopAcM_GetRoomNo(a_this);
static _GXColor l_color = {
static GXColor l_color = {
0x14,
0x0A,
0x0A,
src/d/actor/d_a_obj_sw.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#include "m_Do/m_Do_ext.h"
static int daObj_Sw_Draw(obj_sw_class* i_this) {
static _GXColor l_color = {
static GXColor l_color = {
0x14,
0x0F,
0x00,
src/d/actor/d_flower.inc
+8 -8
View File
@@ -527,10 +527,10 @@ void dFlower_packet_c::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
GXSetArray(GX_VA_POS, &l_flowerPos, 0xC);
GXSetArray(GX_VA_NRM, &l_flowerNormal, 0xC);
GXSetArray(GX_VA_CLR0, &l_flowerColor, 4);
GXSetArray(GX_VA_TEX0, &l_flowerTexCoord, 8);
GXSETARRAY(GX_VA_POS, &l_flowerPos, sizeof(l_flowerPos), 0xC);
GXSETARRAY(GX_VA_NRM, &l_flowerNormal, sizeof(l_flowerNormal), 0xC);
GXSETARRAY(GX_VA_CLR0, &l_flowerColor, sizeof(l_flowerColor), 4);
GXSETARRAY(GX_VA_TEX0, &l_flowerTexCoord, sizeof(l_flowerTexCoord), 8);
GXColor sp64;
dFlower_room_c* sp5C = m_room;
@@ -622,10 +622,10 @@ void dFlower_packet_c::draw() {
sp5C++;
}
GXSetArray(GX_VA_POS, mp_pos, 0xC);
GXSetArray(GX_VA_NRM, &l_flowerNormal2, 0xC);
GXSetArray(GX_VA_CLR0, mp_colors, 4);
GXSetArray(GX_VA_TEX0, mp_texCoords, 8);
GXSETARRAY(GX_VA_POS, mp_pos, sizeof(l_flowerPos2), 0xC);
GXSETARRAY(GX_VA_NRM, &l_flowerNormal2, sizeof(l_flowerNormal2), 0xC);
GXSETARRAY(GX_VA_CLR0, mp_colors, sizeof(l_flowerColor2), 4);
GXSETARRAY(GX_VA_TEX0, mp_texCoords, sizeof(l_flowerTexCoord2), 8);
sp5C = m_room;
src/d/actor/d_grass.inc
+4 -4
View File
@@ -511,10 +511,10 @@ void dGrass_packet_c::draw() {
GXSetVtxDescv(l_vtxDescList);
GXSetVtxAttrFmtv(GX_VTXFMT0, l_vtxAttrFmtList);
GXSetArray(GX_VA_POS, mp_pos, sizeof(Vec));
GXSetArray(GX_VA_NRM, mp_normal, sizeof(Vec));
GXSetArray(GX_VA_CLR0, mp_colors, sizeof(GXColor));
GXSetArray(GX_VA_TEX0, mp_texCoords, 8);
GXSETARRAY(GX_VA_POS, mp_pos, sizeof(l_pos), sizeof(Vec));
GXSETARRAY(GX_VA_NRM, mp_normal, sizeof(l_normal), sizeof(Vec));
GXSETARRAY(GX_VA_CLR0, mp_colors, sizeof(l_color), sizeof(GXColor));
GXSETARRAY(GX_VA_TEX0, mp_texCoords, sizeof(l_texCoord), 8);
GXColorS10 spA0 = {0, 0, 0, 0};
GXColorS10 sp98 = {0, 0, 0, 0};
src/d/d_com_inf_game.cpp
+1 -1
View File
@@ -2256,7 +2256,7 @@ void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) {
int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4,
f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8,
dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12) {
dKy_tevstr_c* param_9, s16 param_10, f32 param_11, GXTexObj* param_12) {
if (param_7 <= -G_CM3D_F_INF) {
return 0;
} else {
src/d/d_drawlist.cpp
+4 -4
View File
@@ -964,7 +964,7 @@ void dDlst_effectLine_c::draw() {
}
}
void dDlst_effectLine_c::update(cXyz& param_0, _GXColor& i_lineColor, u16 param_2, u16 param_3,
void dDlst_effectLine_c::update(cXyz& param_0, GXColor& i_lineColor, u16 param_2, u16 param_3,
u16 param_4, u16 param_5, f32 param_6, f32 param_7, f32 param_8,
f32 param_9) {
field_0x10 = param_0;
@@ -1339,7 +1339,7 @@ void dDlst_shadowSimple_c::draw() {
}
void dDlst_shadowSimple_c::set(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
s16 param_4, f32 param_5, _GXTexObj* param_6) {
s16 param_4, f32 param_5, GXTexObj* param_6) {
if (param_5 < 0.0f) {
mAlpha = param_5 * -255.0f;
param_5 = 1.0f;
@@ -1500,7 +1500,7 @@ void dDlst_shadowControl_c::draw(Mtx param_0) {
dKy_GxFog_set();
GXSetChanCtrl(GX_ALPHA0, GX_DISABLE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE);
GXSetArray(GX_VA_POS, l_shadowVolPos, 12);
GXSETARRAY(GX_VA_POS, l_shadowVolPos, sizeof(l_shadowVolPos), sizeof(l_shadowVolPos[0]));
GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX0);
GXSetNumTevStages(1);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
@@ -1532,7 +1532,7 @@ void dDlst_shadowControl_c::draw(Mtx param_0) {
GXSetTevSwapModeTable(GX_TEV_SWAP0, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB8, 0);
GXSetArray(GX_VA_POS, l_simpleShadowPos, 12);
GXSETARRAY(GX_VA_POS, l_simpleShadowPos, sizeof(l_simpleShadowPos), sizeof(l_simpleShadowPos[0]));
GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);
GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
src/d/d_map_path.cpp
+3 -2
View File
@@ -37,7 +37,7 @@ void dMpath_n::dTexObjAggregate_c::remove() {
}
}
void dMpath_ColorCnv_n::convertRGB5A3_To_GXColor(_GXColor& color32, const dMpath_RGB5A3_s& color16) {
void dMpath_ColorCnv_n::convertRGB5A3_To_GXColor(GXColor& color32, const dMpath_RGB5A3_s& color16) {
int r, g, b, a;
u16 color = color16.color;
if (color & 0x8000) {
@@ -295,7 +295,8 @@ void dDrawPath_c::rendering(dDrawPath_c::floor_class const* p_floor) {
void dDrawPath_c::rendering(dDrawPath_c::room_class const* room) {
JUT_ASSERT(1043, room != NULL);
if (room != NULL) {
GXSetArray(GX_VA_POS, room->mpFloatData, 8);
// TODO: FILL IN SIZE.
GXSETARRAY(GX_VA_POS, room->mpFloatData, 0, 8);
floor_class* floor = room->mpFloor;
if (floor != NULL) {
src/d/d_map_path_dmap.cpp
+3 -3
View File
@@ -848,7 +848,7 @@ void renderingPlusDoor_c::drawDoorCommon(stage_tgsc_data_class const* i_doorData
GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0);
GXSetArray(GX_VA_TEX0, (void*)l_tex0, 2);
GXSETARRAY(GX_VA_TEX0, (void*)l_tex0, sizeof(l_tex0), 2);
setTevSettingIntensityTextureToCI();
@@ -1007,7 +1007,7 @@ void renderingPlusDoorAndCursor_c::drawTreasure() {
GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0);
GXSetArray(GX_VA_TEX0, (void*)l_iconTex0, 2);
GXSETARRAY(GX_VA_TEX0, (void*)l_iconTex0, sizeof(l_iconTex0), 2);
setTevSettingIntensityTextureToCI();
@@ -1081,7 +1081,7 @@ void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() {
GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0);
GXSetArray(GX_VA_TEX0, (void*)l_iconTex0, 2);
GXSETARRAY(GX_VA_TEX0, (void*)l_iconTex0, sizeof(l_iconTex0), 2);
setTevSettingIntensityTextureToCI();
src/d/d_particle.cpp
+10 -10
View File
@@ -214,7 +214,7 @@ static void dPa_group_id_change(u32* param_0, u8* param_1) {
}
}
static void initiateLighting8(_GXColor& param_0, s16 param_1) {
static void initiateLighting8(GXColor& param_0, s16 param_1) {
GXSetChanCtrl(GX_COLOR0, true, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
GXSetChanCtrl(GX_ALPHA0, false, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
s32 r,g,b;
@@ -246,7 +246,7 @@ static void initiateLighting8(_GXColor& param_0, s16 param_1) {
GXSetChanMatColor(GX_COLOR0A0, g_whiteColor);
}
static void initiate_b_Lighting8(_GXColor& param_0) {
static void initiate_b_Lighting8(GXColor& param_0) {
GXSetChanCtrl(GX_COLOR0, true, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
GXSetChanCtrl(GX_ALPHA0, false, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
GXSetChanAmbColor(GX_COLOR0A0, param_0);
@@ -804,7 +804,7 @@ JPABaseEmitter* dPa_simpleEcallBack::createEmitter(JPAEmitterManager* param_0) {
}
u32 dPa_simpleEcallBack::set(cXyz const* i_pos, dKy_tevstr_c const* param_2, u8 param_3,
_GXColor const& param_4, _GXColor const& param_5, int param_6,
GXColor const& param_4, GXColor const& param_5, int param_6,
f32 param_7) {
f32 fVar1;
f32 dVar7 = param_7;
@@ -1461,7 +1461,7 @@ void dPa_control_c::setWaterRipple(u32* param_0, cBgS_PolyInfo& param_1, cXyz co
JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
dKy_tevstr_c const* param_3, csXyz const* i_rotation,
cXyz const* i_scale, u8 i_alpha, dPa_levelEcallBack* param_7,
s8 param_8, _GXColor const* param_9, _GXColor const* param_10,
s8 param_8, GXColor const* param_9, GXColor const* param_10,
cXyz const* param_11, f32 param_12) {
u8 local_e0 = getRM_ID(param_1);
JPAResourceManager* local_a8 = mEmitterMng->getResourceManager(local_e0);
@@ -1598,8 +1598,8 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
return this_00;
}
s32 dPa_control_c::getPolyColor(cBgS_PolyInfo& param_0, int param_1, _GXColor* param_2,
_GXColor* param_3, u8* param_4, f32* param_5) {
s32 dPa_control_c::getPolyColor(cBgS_PolyInfo& param_0, int param_1, GXColor* param_2,
GXColor* param_3, u8* param_4, f32* param_5) {
if (!dComIfG_Bgsp().ChkPolySafe(param_0)) {
return 0;
}
@@ -1656,7 +1656,7 @@ bool dPa_control_c::newSimple(u16 param_0, u8 param_1, u32* param_2) {
}
u32 dPa_control_c::setSimple(u16 param_0, cXyz const* i_pos, dKy_tevstr_c const* param_2,
u8 param_3, _GXColor const& param_4, _GXColor const& param_5,
u8 param_3, GXColor const& param_4, GXColor const& param_5,
int param_6, f32 param_7) {
dPa_simpleEcallBack* cb = getSimple(param_0);
if (cb == NULL) {
@@ -1681,7 +1681,7 @@ dPa_simpleEcallBack* dPa_control_c::getSimple(u16 param_0) {
static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1,
dKy_tevstr_c const* param_2, u32 param_3, cXyz const* param_4,
_GXColor const* param_5, _GXColor const* param_6) {
GXColor const* param_5, GXColor const* param_6) {
f32 fVar1 = param_0;
if ((param_3 & 0xef0000) >> 0x10 < 100) {
fVar1 = ((param_3 & 0xef0000) >> 0x10) / 99.0f;
@@ -1725,8 +1725,8 @@ static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1,
u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* pos,
dKy_tevstr_c const* param_4, csXyz const* i_rotation, cXyz const* i_scale,
u8 alpha, dPa_levelEcallBack* param_8, s8 param_9, _GXColor const* param_10,
_GXColor const* param_11, cXyz const* param_12, f32 param_13) {
u8 alpha, dPa_levelEcallBack* param_8, s8 param_9, GXColor const* param_10,
GXColor const* param_11, cXyz const* param_12, f32 param_13) {
level_c::emitter_c* this_00 = field_0x210.get(param_0);
u8 uVar7 = getRM_ID(param_2);
JPAResourceManager* this_01 = mEmitterMng->getResourceManager(uVar7);
src/dusk/stubs.cpp
+2 -7
View File
@@ -1,5 +1,5 @@
#include <dolphin/dolphin.h>
#include <dolphin/gx/GXVert.h>
#include <dolphin/gx.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
@@ -1482,11 +1482,6 @@ void GDSetVtxDescv(const GXVtxDescList* attrPtr) {
#pragma mark GX
#include <dolphin/gx.h>
// Dummy FIFO sink for direct GXWGFifo writes in J3D code (e.g. J3DFifo.h).
// On GameCube these write to the GX command processor at 0xCC008000.
// On PC, writes land here harmlessly and are discarded.
volatile PPCWGPipe GXWGFifo;
// GXCmd/GXParam/GXMatrixIndex: low-level command FIFO functions used by J3D.
// Route through Aurora's software FIFO so display list data is actually recorded.
//
@@ -1651,7 +1646,7 @@ f32 GXGetYScaleFactor(u16 efbHeight, u16 xfbHeight) {
return 0.0f;
}
void GXInitTexCacheRegion(GXTexRegion* region, u8 is_32b_mipmap, u32 tmem_even,
void GXInitTexCacheRegion(GXTexRegion* region, GXBool is_32b_mipmap, u32 tmem_even,
GXTexCacheSize size_even, u32 tmem_odd, GXTexCacheSize size_odd) {
STUB_LOG("GXInitTexCacheRegion is a stub");
}
src/m_Do/m_Do_ext.cpp
+10 -10
View File
@@ -2382,8 +2382,8 @@ void mDoExt_3DlineMat0_c::draw() {
int var_r26 = (field_0x14 << 1) & 0xFFFF;
for (int i = 0; i < field_0x10; i++) {
GXSetArray(GX_VA_POS, field_0x18->field_0x8[field_0x16], sizeof(cXyz));
GXSetArray(GX_VA_NRM, field_0x18->field_0x10[field_0x16], 3);
GXSETARRAY(GX_VA_POS, field_0x18->field_0x8[field_0x16], sizeof(cXyz) * var_r26, sizeof(cXyz));
GXSETARRAY(GX_VA_NRM, field_0x18->field_0x10[field_0x16], 3 * var_r26, 3);
GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, var_r26);
for (u16 j = 0; j < (u16)var_r26; j++) {
@@ -2698,9 +2698,9 @@ void mDoExt_3DlineMat1_c::draw() {
mDoExt_3Dline_c* lines = mpLines;
u16 vert_num = field_0x34 << 1;
for (s32 i = 0; i < mNumLines; i++) {
GXSetArray(GX_VA_POS, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x8, 0xC);
GXSetArray(GX_VA_NRM, ((mDoExt_3Dline_c*)((intptr_t) lines + (mIsDrawn << 2)))->field_0x10, 0x3);
GXSetArray(GX_VA_TEX0, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x18, 0x8);
GXSETARRAY(GX_VA_POS, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x8, vert_num * sizeof(cXyz), sizeof(cXyz));
GXSETARRAY(GX_VA_NRM, ((mDoExt_3Dline_c*)((intptr_t) lines + (mIsDrawn << 2)))->field_0x10, vert_num * sizeof(mDoExt_3Dline_field_0x10_c), sizeof(mDoExt_3Dline_field_0x10_c));
GXSETARRAY(GX_VA_TEX0, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x18, vert_num * sizeof(mDoExt_3Dline_field_0x18_c), sizeof(mDoExt_3Dline_field_0x18_c));
GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, vert_num);
u16 j = 0;
@@ -2720,7 +2720,7 @@ void mDoExt_3DlineMat1_c::draw() {
mIsDrawn ^= (u8)1;
}
void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, _GXColor& param_2, u16 param_3,
void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, GXColor& param_2, u16 param_3,
dKy_tevstr_c* param_4) {
mColor = param_2;
this->mpTevStr = param_4;
@@ -2888,7 +2888,7 @@ void mDoExt_3DlineMat2_c::setMaterial() {
GXLoadNrmMtxImm(cMtx_getIdentity(), 0);
}
void mDoExt_3DlineMat1_c::update(int param_0, _GXColor& param_2, dKy_tevstr_c* param_4) {
void mDoExt_3DlineMat1_c::update(int param_0, GXColor& param_2, dKy_tevstr_c* param_4) {
mColor = param_2;
this->mpTevStr = param_4;
if (param_0 < 0) {
@@ -3033,7 +3033,7 @@ mDoExt_cube8pPacket::mDoExt_cube8pPacket(cXyz* i_points, const GXColor& i_color)
}
void drawCube(MtxP mtx, cXyz* pos, const GXColor& color) {
GXSetArray(GX_VA_POS, pos, sizeof(cXyz));
GXSETARRAY(GX_VA_POS, pos, sizeof(*pos), sizeof(*pos));
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX8);
@@ -3112,7 +3112,7 @@ mDoExt_quadPacket::mDoExt_quadPacket(cXyz* i_points, const GXColor& i_color, u8
}
void mDoExt_quadPacket::draw() {
GXSetArray(GX_VA_POS, mPoints, sizeof(cXyz));
GXSETARRAY(GX_VA_POS, mPoints, sizeof(mPoints), sizeof(cXyz));
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX8);
@@ -3164,7 +3164,7 @@ mDoExt_trianglePacket::mDoExt_trianglePacket(cXyz* i_points, const GXColor& i_co
void mDoExt_trianglePacket::draw() {
j3dSys.reinitGX();
GXSetArray(GX_VA_POS, mPoints, sizeof(cXyz));
GXSETARRAY(GX_VA_POS, mPoints, sizeof(mPoints), sizeof(cXyz));
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX8);