diff options
| author | TakaRikka <takarikka@outlook.com> | 2023-09-23 00:00:37 -0700 |
|---|---|---|
| committer | TakaRikka <takarikka@outlook.com> | 2023-09-23 00:00:37 -0700 |
| commit | ee401fb19ffab997b72672e747a8edd632ee7785 (patch) | |
| tree | 40d8b469c6c1499d57c08583e40336db9973b7a9 /include/JSystem/J3DGraphAnimator | |
| parent | 0b034a877ef561872417d66a2b6874fc26a6c6f7 (diff) | |
work on d_a_agb
Diffstat (limited to 'include/JSystem/J3DGraphAnimator')
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h | 7 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DModelData.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h index 1891eedb..2def459b 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h @@ -35,7 +35,6 @@ public: JUTNameTab* getMaterialName() const { return mMaterialName; } u16 getMaterialNum() const { return mMaterialNum; } - bool isLocked() const { return field_0x1c == 1; } private: /* 0x04 */ u16 mMaterialNum; @@ -43,9 +42,9 @@ private: /* 0x08 */ J3DMaterial** mMaterialNodePointer; /* 0x0C */ JUTNameTab* mMaterialName; /* 0x10 */ u32 field_0x10; - /* 0x14 */ J3DTexture* mTexture; - /* 0x18 */ JUTNameTab* mTextureName; - /* 0x1C */ u16 field_0x1c; + /* 0x14 */ u32 field_0x14; + /* 0x18 */ J3DTexture* mTexture; + /* 0x1C */ JUTNameTab* mTextureName; }; // Size: 0x20 #endif /* J3DMATERIALATTACH_H */ diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h index ce8018b1..cd23e529 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModelData.h +++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h @@ -59,7 +59,6 @@ public: u16 checkBumpFlag() const { return mbHasBumpArray; } void setBumpFlag(u32 flag) { mbHasBumpArray = flag; } bool checkBBoardFlag() const { return mbHasBillboard == 1; } - bool isLocked() { return mMaterialTable.isLocked(); } void entryTexMtxAnimator(J3DAnmTextureSRTKey* anm) { mMaterialTable.entryTexMtxAnimator(anm); } void entryTevRegAnimator(J3DAnmTevRegKey* anm) { mMaterialTable.entryTevRegAnimator(anm); } void entryTexNoAnimator(J3DAnmTexPattern* anm) { mMaterialTable.entryTexNoAnimator(anm); } |