diff options
| author | TakaRikka <takarikka@outlook.com> | 2023-01-03 17:43:38 -0800 |
|---|---|---|
| committer | TakaRikka <takarikka@outlook.com> | 2023-01-03 17:43:38 -0800 |
| commit | 92c2ef1ce34340df23234524f214302bfe3bc60b (patch) | |
| tree | 3550fb797240a214d396cb6677ba4af0213dd708 /include/JSystem/J3DGraphAnimator | |
| parent | e1114ebcf9bcadb3a82355c68c09b308ad3f9606 (diff) | |
d_s_room / d_a_bg first pass
Diffstat (limited to 'include/JSystem/J3DGraphAnimator')
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DAnimation.h | 17 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h | 2 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DModelData.h | 1 |
3 files changed, 17 insertions, 3 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index a3c6b90415..9034496b2c 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -368,6 +368,9 @@ public: calcTransform(getFrame(), param_0, pSRTInfo); } + u16 getUpdateMaterialID(u16 idx) const { return mUpdateMaterialID[idx]; } + u16 getUpdateMaterialNum() const { return field_0x14 / 3; } + private: /* 0x0C */ int field_0xc; /* 0x10 */ int field_0x10; @@ -379,7 +382,7 @@ private: /* 0x20 */ int field_0x20; /* 0x24 */ int field_0x24; /* 0x28 */ u8 mUpdateTexMtxID[4]; - /* 0x2C */ u16 mUpdateMaterialID[2]; + /* 0x2C */ u16* mUpdateMaterialID; /* 0x30 */ JUTNameTab field_0x30; /* 0x40 */ int field_0x40; /* 0x44 */ u16 field_0x44; @@ -427,6 +430,12 @@ public: /* 8032BD9C */ virtual ~J3DAnmTevRegKey(); /* 8032BE24 */ virtual s32 getKind() const; + u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; } + u16 getKRegUpdateMaterialNum() const { return mKRegUpdateMaterialNum; } + + u16 getCRegUpdateMaterialID(u16 idx) const { return mCRegUpdateMaterialID[idx]; } + u16 getKRegUpdateMaterialID(u16 idx) const { return mKRegUpdateMaterialID[idx]; } + private: /* 0x0C */ u16 mCRegUpdateMaterialNum; /* 0x0E */ u16 mKRegUpdateMaterialNum; @@ -438,8 +447,10 @@ private: /* 0x1A */ u16 field_0x1a; /* 0x1C */ u16 field_0x1c; /* 0x1E */ u16 field_0x1e; - /* 0x20 */ u16 mCRegUpdateMaterialID[20]; - /* 0x34 */ u16 mKRegUpdateMaterialID[20]; + /* 0x20 */ u16* mCRegUpdateMaterialID; + /* 0x24 */ u8 field_0x24[0x34 - 0x24]; + /* 0x34 */ u16* mKRegUpdateMaterialID; + /* 0x38 */ u8 field_0x38[0x48 - 0x38]; /* 0x48 */ void* field_0x48; /* 0x4C */ void* field_0x4c; /* 0x50 */ int field_0x50; diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h index 2cbe551312..79ed0e592d 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h @@ -32,6 +32,8 @@ public: J3DTexture* getTexture() const { return mTexture; } JUTNameTab* getTextureName() const { return mTextureName; } + JUTNameTab* getMaterialName() const { return mMaterialName; } + u16 getMaterialNum() const { return mMaterialNum; } bool isLocked() const { return field_0x1c == 1; } diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h index 1bc947fab4..766ae76a76 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModelData.h +++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h @@ -22,6 +22,7 @@ public: /* 8032617C */ virtual ~J3DModelData(); J3DMaterialTable& getMaterialTable() { return mMaterialTable; } + JUTNameTab* getMaterialName() const { return mMaterialTable.getMaterialName(); } J3DVertexData& getVertexData() { return mVertexData; } u16 getShapeNum() const { return mShapeTable.getShapeNum(); } u16 getMaterialNum() const { return mMaterialTable.getMaterialNum(); } |