diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-27 17:03:26 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-27 21:32:04 -0500 |
| commit | 48dcebd9e88e9b592572ed906c505ee71df6f4f2 (patch) | |
| tree | 2153980fcdbf41886c95cd757aee2c612a13d80c /include/JSystem/J3DGraphBase | |
| parent | 47ce38557bea9d6679e696bba5effe3cd98964b1 (diff) | |
Misc cleanup
Diffstat (limited to 'include/JSystem/J3DGraphBase')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMatBlock.h | 13 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DStruct.h | 11 |
2 files changed, 11 insertions, 13 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 10f8b550..a5c1c518 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -625,8 +625,6 @@ struct J3DBlend : public J3DBlendInfo { // void operator==(J3DBlend&) {} }; -extern const J3DFogInfo j3dDefaultFogInfo; - struct J3DFog : public J3DFogInfo { // J3DFog() { *getFogInfo() = j3dDefaultFogInfo; } // Produces the wrong codegen for mDoExt_backupMatBlock_c's constructor J3DFog() { J3DFogInfo::operator=(j3dDefaultFogInfo); } @@ -641,17 +639,6 @@ struct J3DFog : public J3DFogInfo { void setType(u8 type) { mType = type; } }; -struct J3DAlphaCompInfo { - /* 0x0 */ u8 mComp0; - /* 0x1 */ u8 mRef0; - /* 0x2 */ u8 mOp; - /* 0x3 */ u8 mComp1; - /* 0x4 */ u8 mRef1; - /* 0x5 */ u8 field_0x5; - /* 0x6 */ u8 field_0x6; - /* 0x7 */ u8 field_0x7; -}; - inline u16 calcAlphaCmpID(u8 comp0, u8 op, u8 comp1) { return (comp0 << 5) + (op << 3) + (comp1); } diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index 25868ce9..cfbda1b4 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -240,4 +240,15 @@ struct J3DZModeInfo { /* 0x03 */ u8 pad; }; +struct J3DAlphaCompInfo { + /* 0x0 */ u8 mComp0; + /* 0x1 */ u8 mRef0; + /* 0x2 */ u8 mOp; + /* 0x3 */ u8 mComp1; + /* 0x4 */ u8 mRef1; + /* 0x5 */ u8 field_0x5; + /* 0x6 */ u8 field_0x6; + /* 0x7 */ u8 field_0x7; +}; + #endif /* J3DSTRUCT_H */ |