diff options
| author | Huitzi <73550465+marwernerh@users.noreply.github.com> | 2025-01-27 14:55:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-27 11:55:55 -0800 |
| commit | 7c5006e4462cf2a3357bf7804f9ddb5ff2fd448f (patch) | |
| tree | b7d1e55959b933355090efc24bd3db563f0e3542 /include/JSystem | |
| parent | bf4053fefa301a307065a07ffc4c3f9f970f2638 (diff) | |
d_a_obj_waterGate matching + d_a_obj_lv3Water2 equivalent (#2293)
* d_a_obj_waterGate matching + d_a_obj_lv3Water2 equivalent
* Add simpleCalcMaterial implicit inline to J3DModelData (seen in debug)
* Basic documentation for both actors
* WIP debug build implementations (note TODOs)
* Update configure.py and note weak ordering issues for lv3Water2
* Actually add modified J3DModelData.h & explicitly note fake padding
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DModelData.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h index ffbf92311e..629a82e12d 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModelData.h +++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h @@ -22,12 +22,13 @@ public: /* 80325E14 */ s32 newSharedDisplayList(u32); /* 80325EC8 */ void indexToPtr(); /* 80325F94 */ void makeSharedDL(); - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); + /* 8032600C */ void simpleCalcMaterial(u16, Mtx); /* 803260CC */ void syncJ3DSysPointers() const; /* 803260F8 */ void syncJ3DSysFlags() const; /* 8032617C */ virtual ~J3DModelData() {} + void simpleCalcMaterial(Mtx mtx) { simpleCalcMaterial(0, mtx); } J3DMaterialTable& getMaterialTable() { return mMaterialTable; } JUTNameTab* getMaterialName() const { return mMaterialTable.getMaterialName(); } J3DVertexData& getVertexData() { return mVertexData; } |