diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-12-19 11:06:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 12:06:32 -0700 |
| commit | ca71275bbecc7db9a4eeca3a6ac4215b66de4318 (patch) | |
| tree | c2851f8cec211216fe0cb6a31a0260a62fc3bf53 /include/JSystem/J3DGraphAnimator | |
| parent | 1114b13da81ab0b52fd4bb56a32f32331a21e581 (diff) | |
big d_a_alink pass (#214)
* d_a_alink pass1 wip
* more d_a_alink work
* remove asm
* more daalink work
* 20% dol code decompiled
* fixed some nonmatchings for building
* a few daalink functions and labeling some HIO data
Diffstat (limited to 'include/JSystem/J3DGraphAnimator')
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DAnimation.h | 14 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DModelData.h | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 4daebd16ec..8fcde1731e 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -278,6 +278,13 @@ STATIC_ASSERT(sizeof(J3DAnmColorFullData) == 0x34); class J3DAnmBase { public: + J3DAnmBase(s16 i_frameMax) { + mAttribute = 0; + field_0x5 = 0; + mFrameMax = i_frameMax; + mFrame = 0.0f; + } + virtual ~J3DAnmBase(); u8 getAttribute() const { return mAttribute; } @@ -287,6 +294,7 @@ public: private: /* 0x4 */ u8 mAttribute; + /* 0x5 */ u8 field_0x5; /* 0x6 */ s16 mFrameMax; /* 0x8 */ f32 mFrame; }; // Size: 0xC @@ -539,7 +547,7 @@ class J3DAnmCluster : public J3DAnmBase { public: /* 8032BCAC */ virtual ~J3DAnmCluster(); /* 8032BF44 */ virtual s32 getKind() const; - /* 8032BF4C */ virtual void getWeight(u16) const; + /* 8032BF4C */ virtual f32 getWeight(u16) const; private: /* 0x0C */ f32* field_0xc; @@ -549,7 +557,7 @@ class J3DAnmClusterFull : public J3DAnmCluster { public: /* 8032BCAC */ virtual ~J3DAnmClusterFull(); /* 8032BF44 */ virtual s32 getKind() const; - /* 8032BF4C */ virtual void getWeight(u16) const; + /* 8032BF4C */ virtual f32 getWeight(u16) const; private: /* 0x10 */ int field_0x10; @@ -559,7 +567,7 @@ class J3DAnmClusterKey : public J3DAnmCluster { public: /* 8032C044 */ virtual ~J3DAnmClusterKey(); /* 8032C0B0 */ virtual s32 getKind() const; - /* 8032A218 */ virtual void getWeight(u16) const; + /* 8032A218 */ virtual f32 getWeight(u16) const; private: /* 0x10 */ int field_0x10; diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h index bc4c2ba9a6..51d8f08e8c 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModelData.h +++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h @@ -47,6 +47,7 @@ public: 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); } int removeTexNoAnimator(J3DAnmTexPattern* anm) { return mMaterialTable.removeTexNoAnimator(anm); } |