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

J3D debug work (#2949)

Browse Source 
* J3D debug work

* Clean up JSystem GXColor ctors, remove a couple fakematches

* Update symbols.txt

* Fix res include syntax

* Remove fakematch that isn't necessary anymore

* Fix some Shield regressions
This commit is contained in:
LagoLunatic
2025-12-13 00:04:03 -05:00
committed by GitHub
parent 7e514502d2
commit 1b8ea3206d
24 changed files with 307 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DMatBlock.h
+6 -1
View File
@@ -20,7 +20,7 @@ struct ResTLUT;
struct J2DGXColorS10 : public GXColorS10 {
J2DGXColorS10() {}
#if PLATFORM_GCN
#if PLATFORM_GCN && __MWERKS__
J2DGXColorS10(J2DGXColorS10& other) {
r = other.r;
g = other.g;
@@ -637,6 +637,11 @@ struct J2DAlphaComp {
mAlphaCmp = J2DCalcAlphaCmp(info.field_0x0, info.mRef0, info.mRef1);
mRef0 = info.field_0x1;
mRef1 = info.field_0x4;
}
void operator=(const J2DAlphaComp& other) {
mAlphaCmp = other.mAlphaCmp;
mRef0 = other.mRef0;
mRef1 = other.mRef1;
}
u8 getComp0() { return mAlphaCmp >> 5 & 7; }
u8 getRef0() { return mRef0; }
include/JSystem/J2DGraph/J2DTevs.h
+13 -10
View File
@@ -562,7 +562,7 @@ inline u8 J2DCalcTevSwapTable(u8 param_0, u8 param_1, u8 param_2, u8 param_3) {
}
extern const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable;
extern const u8 data_804561AC;
extern const u8 j2dDefaultTevSwapTableID;
/**
* @ingroup jsystem-j2d
@@ -571,21 +571,24 @@ extern const u8 data_804561AC;
class J2DTevSwapModeTable {
public:
J2DTevSwapModeTable() { field_0x0 = data_804561AC; }
J2DTevSwapModeTable() { mIdx = j2dDefaultTevSwapTableID; }
J2DTevSwapModeTable(const J2DTevSwapModeTableInfo& info) {
field_0x0 = J2DCalcTevSwapTable(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
mIdx = J2DCalcTevSwapTable(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
}
void operator=(const J2DTevSwapModeTable& other) {
mIdx = other.mIdx;
}
void setTevSwapModeTableInfo(const J2DTevSwapModeTableInfo& info) {
field_0x0 = J2DCalcTevSwapTable(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
mIdx = J2DCalcTevSwapTable(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
}
u8 getR() const { return field_0x0 >> 6 & 3; }
u8 getG() const { return field_0x0 >> 4 & 3; }
u8 getB() const { return field_0x0 >> 2 & 3; }
u8 getA() const { return field_0x0 & 3; }
u8 getR() const { return mIdx >> 6 & 3; }
u8 getG() const { return mIdx >> 4 & 3; }
u8 getB() const { return mIdx >> 2 & 3; }
u8 getA() const { return mIdx & 3; }
private:
/* 0x0 */ u8 field_0x0;
/* 0x0 */ u8 mIdx;
};
/**
@@ -638,7 +641,7 @@ extern const GXColorS10 j2dDefaultTevColor;
extern const GXColor j2dDefaultTevKColor;
extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
extern const u8 j2dDefaultPEBlockDither;
extern const u8 data_804561AC;
extern const u8 j2dDefaultTevSwapTableID;
extern const u16 j2dDefaultAlphaCmp;
#endif /* J2DTEVS_H */