diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-28 00:34:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-27 21:34:18 -0800 |
| commit | 4fb3af91b8aff0b9042affa4d430aa3375199973 (patch) | |
| tree | 2b93dea8856e149b5145a2dcc9965df38081e5f7 /include/JSystem/J3DGraphAnimator | |
| parent | a089a1d21c641cab569facace79ec646132a6d34 (diff) | |
Various small matches (#2879)
* Misc debug matches
* Fix JASBasicWaveBank weak func order
* Remove more dol2asm stuff, fix missing includes
* Some data fixes
* Update comments
* d_file_sel_warning is already OK
* Fix Z2 splits
* Fix movebox namespace
* Fix inlining issue in m_Do_ext
* Fix Z2 splits for P and J
Diffstat (limited to 'include/JSystem/J3DGraphAnimator')
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DAnimation.h | 4 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DJoint.h | 32 |
2 files changed, 27 insertions, 9 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 37851892d5..b614e06b11 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -929,6 +929,7 @@ public: J3DFrameCtrl() { this->init(0); } void init(s16); + void init(int endFrame) { init((s16)endFrame); } BOOL checkPass(f32); void update(); virtual ~J3DFrameCtrl() {} @@ -987,8 +988,7 @@ struct J3DMtxCalcAnimationAdaptorDefault : public J3DMtxCalcAnimationAdaptorBase J3DTransformInfo transform; J3DTransformInfo* transform_p; if (pMtxCalc->getAnmTransform() != NULL) { - u16 jnt_no = J3DMtxCalc::getJoint()->getJntNo(); - pMtxCalc->getAnmTransform()->getTransform(jnt_no, &transform); + pMtxCalc->getAnmTransform()->getTransform(J3DMtxCalc::getJoint()->getJntNo(), &transform); transform_p = &transform; } else { transform_p = &J3DMtxCalc::getJoint()->getTransformInfo(); diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h index 9510ceb415..2ddff2945b 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJoint.h +++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h @@ -19,12 +19,27 @@ public: /* 80325D1C */ static void setMtxBuffer(J3DMtxBuffer*); /* 8000D948 */ virtual ~J3DMtxCalc() {} - /* 80014E90 */ virtual void setAnmTransform(J3DAnmTransform*) {} - /* 80014E9C */ virtual J3DAnmTransform* getAnmTransform() { return NULL; } - /* 80014E8C */ virtual void setAnmTransform(u8, J3DAnmTransform*) {} - /* 80014E94 */ virtual J3DAnmTransform* getAnmTransform(u8) { return NULL; } - /* 80014EA4 */ virtual void setWeight(u8, f32) {} - /* 80014EA8 */ virtual f32 getWeight(u8) const { return 0.0f; } + /* 80014E90 */ virtual void setAnmTransform(J3DAnmTransform*) { + JUT_ASSERT_MSG(127, FALSE, "You cannot use this method"); + } + /* 80014E9C */ virtual J3DAnmTransform* getAnmTransform() { + JUT_ASSERT_MSG(131, FALSE, "You cannot use this method"); + return NULL; + } + /* 80014E8C */ virtual void setAnmTransform(u8, J3DAnmTransform*) { + JUT_ASSERT_MSG(137, FALSE, "You cannot use this method"); + } + /* 80014E94 */ virtual J3DAnmTransform* getAnmTransform(u8) { + JUT_ASSERT_MSG(141, FALSE, "You cannot use this method"); + return NULL; + } + /* 80014EA4 */ virtual void setWeight(u8, f32) { + JUT_ASSERT_MSG(147, FALSE, "You cannot use this method"); + } + /* 80014EA8 */ virtual f32 getWeight(u8) const { + JUT_ASSERT_MSG(152, FALSE, "You cannot use this method"); + return 0.0f; + } virtual void init(const Vec& param_0, const Mtx&) = 0; virtual void calc() = 0; @@ -125,7 +140,10 @@ public: J3DMtxCalcNoAnm() {} virtual ~J3DMtxCalcNoAnm() {} virtual void init(const Vec& param_0, const Mtx& param_1) { B::init(param_0, param_1); } - virtual void calc() { A::calcTransform(mJoint->getTransformInfo()); } + virtual void calc() { + J3DTransformInfo& transInfo = getJoint()->getTransformInfo(); + A::calcTransform(transInfo); + } }; /** |