mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-06 19:01:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

work on J3DMaterialFactory and J3DMaterialFactory_v21 (#2012)

Browse Source
This commit is contained in:
Caroline Madsen
2023-12-27 20:17:39 -05:00
committed by GitHub
parent 83969f6dc1
commit 9780adcc4e
90 changed files with 5594 additions and 7128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DTevs.h
+66 -7
View File
@@ -12,12 +12,27 @@ struct J3DTevStageInfo {
/* 0x5 */ u8 mTevAlphaOp;
/* 0x6 */ u8 mTevAlphaAB;
/* 0x7 */ u8 mTevSwapModeInfo;
/* 0x8 */ u8 field_0x8[0xc];
};
struct J3DTevStage : public J3DTevStageInfo {
extern J3DTevStageInfo const j3dDefaultTevStageInfo;
struct J3DTevStage {
/* 8000E230 */ J3DTevStage();
/* 8000E298 */ void setTevStageInfo(J3DTevStageInfo const&);
/* 8003AACC */ J3DTevStage(J3DTevStageInfo const&);
void setRasSel(u8 ras_sel) { mTevSwapModeInfo = (mTevSwapModeInfo & ~3) | ras_sel; }
void setTexSel(u8 tex_sel) { mTevSwapModeInfo = (mTevSwapModeInfo & ~0xc) | (tex_sel << 2); }
/* 0x0 */ u8 field_0x0;
/* 0x1 */ u8 mTevColorOp;
/* 0x2 */ u8 mTevColorAB;
/* 0x3 */ u8 mTevColorCD;
/* 0x4 */ u8 field_0x4;
/* 0x5 */ u8 mTevAlphaOp;
/* 0x6 */ u8 mTevAlphaAB;
/* 0x7 */ u8 mTevSwapModeInfo;
};
struct J3DIndTevStageInfo {
@@ -30,10 +45,34 @@ struct J3DIndTevStageInfo {
/* 0x6 */ u8 mPrev;
/* 0x7 */ u8 mLod;
/* 0x8 */ u8 mAlphaSel;
/* 0x9 */ u8 pad[3];
};
extern J3DIndTevStageInfo const j3dDefaultIndTevStageInfo;
struct J3DIndTevStage {
/* 8000E14C */ J3DIndTevStage();
/* 8000E14C */ J3DIndTevStage() : mInfo(0) { setIndTevStageInfo(j3dDefaultIndTevStageInfo); }
J3DIndTevStage(J3DIndTevStageInfo const& info) : mInfo(0) { setIndTevStageInfo(info); }
void setIndTevStageInfo(J3DIndTevStageInfo const& info) {
setIndStage(info.mIndStage);
setIndFormat(info.mIndFormat);
setBiasSel(info.mBiasSel);
setMtxSel(info.mMtxSel);
setWrapS(info.mWrapS);
setWrapT(info.mWrapT);
setPrev(info.mPrev);
setLod(info.mLod);
setAlphaSel(info.mAlphaSel);
}
void setIndStage(u8 indStage) { mInfo = (mInfo & ~3) | indStage; }
void setIndFormat(u8 indFormat) { mInfo = (mInfo & ~0xc) | (indFormat << 2); }
void setBiasSel(u8 biasSel) { mInfo = (mInfo & ~0x70) | (biasSel << 4); }
void setMtxSel(u8 mtxSel) { mInfo = (mInfo & ~0x1e00) | (mtxSel << 9); }
void setWrapS(u8 wrapS) { mInfo = (mInfo & ~0xe000) | (wrapS << 13); }
void setWrapT(u8 wrapT) { mInfo = (mInfo & ~0x70000) | (wrapT << 16); }
void setPrev(u8 prev) { mInfo = (mInfo & ~0x100000) | (prev << 20); }
void setLod(u8 lod) { mInfo = (mInfo & ~0x80000) | (lod << 19); }
void setAlphaSel(u8 alphaSel) { mInfo = (mInfo & ~0x180) | (alphaSel << 7); }
/* 0x0 */ u32 mInfo;
};
@@ -49,22 +88,42 @@ struct J3DTevOrderInfo {
/* 0x3 */ u8 field_0x3; // Maybe padding
};
extern J3DTevOrderInfo j3dDefaultTevOrderInfoNull;
struct J3DTevOrder : public J3DTevOrderInfo {
/* 8000E140 */ J3DTevOrder();
J3DTevOrder(const J3DTevOrderInfo& info) {
*(J3DTevOrderInfo*)this = info;
}
/* 8000E140 */ J3DTevOrder() : J3DTevOrderInfo(j3dDefaultTevOrderInfoNull) {}
J3DTevOrder(const J3DTevOrderInfo& info) : J3DTevOrderInfo(info) {}
u8 getTexMap() { return mTexMap; }
};
struct J3DTevSwapModeTableInfo {
/* 0x0 */ u8 field_0x0;
/* 0x1 */ u8 field_0x1;
/* 0x2 */ u8 field_0x2;
/* 0x3 */ u8 field_0x3;
}; // Size: 0x4
extern J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable;
struct J3DTevSwapModeTable {
/* 8000E134 */ J3DTevSwapModeTable();
J3DTevSwapModeTable(J3DTevSwapModeTableInfo const& info) {
field_0x0 = calcTevSwapTableID(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
}
u8 calcTevSwapTableID(u8 param_0, u8 param_1, u8 param_2, u8 param_3) {
return 0x40 * param_0 + 0x10 * param_1 + 4 * param_2 + param_3;
}
/* 0x0 */ u8 field_0x0;
}; // Size: 0x1
struct J3DTevSwapModeInfo {};
struct J3DTevSwapModeInfo {
/* 0x0 */ u8 mRasSel;
/* 0x1 */ u8 mTexSel;
/* 0x2 */ u8 field_0x2;
/* 0x3 */ u8 field_0x3;
}; // Size: 0x4
struct J3DNBTScale;
void loadNBTScale(J3DNBTScale& param_0);