diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2022-12-30 14:09:21 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2022-12-30 16:43:48 -0800 |
| commit | 0ff72d731be2c03d9626289dc679299b2496fa0d (patch) | |
| tree | a4a1f43562c14ede666e9e8d37ea083b89874909 /include | |
| parent | 463348bfc7f2360d9bb0a6205b8aa4602c8c03d0 (diff) | |
J3DJointTree OK
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DJoint.h | 1 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DJointTree.h | 19 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DShape.h | 1 |
3 files changed, 16 insertions, 5 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h index 94ce45c74d..dcb89894ac 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJoint.h +++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h @@ -69,6 +69,7 @@ public: private: friend struct J3DJointFactory; + friend class J3DJointTree; /* 0x00 */ void* mCallBackUserData; /* 0x04 */ J3DJointCallBack mCallBack; diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h index 4937fdae32..80513fb4de 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h +++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h @@ -6,7 +6,11 @@ #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" -struct J3DModelHierarchy {}; +struct J3DModelHierarchy { + /* 0x0 */ u16 mType; + /* 0x2 */ u16 mValue; +}; + struct J3DMaterialTable; struct J3DDrawMtxData { @@ -32,6 +36,11 @@ public: /* 80325D24 */ virtual ~J3DJointTree(); u16 getWEvlpMtxNum() const { return mWEvlpMtxNum; } + u8 getWEvlpMixMtxNum(u16 idx) const { return mWEvlpMixMtxNum[idx]; } + u16 * getWEvlpMixIndex() const { return mWEvlpMixIndex; } + f32 * getWEvlpMixWeight() const { return mWEvlpMixWeight; } + u16 * getWEvlpImportantMtxIndex() const { return mWEvlpImportantMtxIdx; } + u16 getDrawFullWgtMtxNum() const { return mDrawMtxData.mDrawFullWgtMtxNum; } u16 getJointNum() const { return mJointNum; } u16 getDrawMtxNum() const { return mDrawMtxData.mEntryNum; } JUTNameTab* getJointName() const { return mJointName; } @@ -49,11 +58,11 @@ private: /* 0x18 */ J3DJoint** mJointNodePointer; /* 0x1C */ u16 mJointNum; /* 0x1E */ u16 mWEvlpMtxNum; - /* 0x20 */ u32 mWEvlpMixMtxNum; - /* 0x24 */ s32 mWEvlpMixIndex; - /* 0x28 */ s32 mWEvlpMixWeight; + /* 0x20 */ u8* mWEvlpMixMtxNum; + /* 0x24 */ u16* mWEvlpMixIndex; + /* 0x28 */ f32* mWEvlpMixWeight; /* 0x2C */ Mtx* mInvJointMtx; - /* 0x30 */ s32 mWEvlpImportantMtxIdx; + /* 0x30 */ u16* mWEvlpImportantMtxIdx; /* 0x34 */ J3DDrawMtxData mDrawMtxData; /* 0x40 */ u32 field_0x40; /* 0x44 */ JUTNameTab* mJointName; diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h index 85cf0da8e9..372dacc976 100644 --- a/include/JSystem/J3DGraphBase/J3DShape.h +++ b/include/JSystem/J3DGraphBase/J3DShape.h @@ -113,6 +113,7 @@ public: private: friend struct J3DShapeFactory; + friend class J3DJointTree; /* 0x04 */ J3DMaterial* mMaterial; /* 0x08 */ u16 mIndex; |