m_Do_ext (#1958)

5 files changed, 22 insertions, 16 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index 00bd2b8655..ae8d86f754 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -604,22 +604,23 @@ public:
     void update();
     virtual ~J3DFrameCtrl() {}
 
-    f32 getRate() const { return mRate; }
-    f32 getFrame() const { return mFrame; }
-    s16 getEnd() const { return mEnd; }
-    s16 getStart() const { return mStart; }
     u8 getAttribute() const { return mAttribute; }
-    u8 getState() const { return mState; }
     void setAttribute(u8 attr) { mAttribute = attr; }
-    void setEnd(s16 end) { mEnd = end; }
-    void setRate(f32 rate) { mRate = rate; }
+    u8 getState() const { return mState; }
+    bool checkState(u8 state) const { return mState & state; }
+    s16 getStart() const { return mStart; }
     void setStart(s16 start) {
         mStart = start;
         mFrame = start;
     }
-    void setFrame(f32 frame) { mFrame = frame; }
+    s16 getEnd() const { return mEnd; }
+    void setEnd(s16 end) { mEnd = end; }
+    s32 getLoop() { return mLoop; }
     void setLoop(s16 loop) { mLoop = loop; }
-    bool checkState(u8 state) const { return mState & state; }
+    f32 getRate() const { return mRate; }
+    void setRate(f32 rate) { mRate = rate; }
+    f32 getFrame() const { return mFrame; }
+    void setFrame(f32 frame) { mFrame = frame; }
 
 private:
     /* 0x04 */ u8 mAttribute;
diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h
index 6a67e0a940..42bc45d7cc 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJoint.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h
@@ -14,12 +14,12 @@ public:
 
     /* 8000D948 */ virtual ~J3DMtxCalc();
     /* 80014E90 */ virtual void setAnmTransform(J3DAnmTransform*);
-    /* 80014E9C */ virtual bool getAnmTransform();
+    /* 80014E9C */ virtual J3DAnmTransform* getAnmTransform();
     /* 80014E8C */ virtual void setAnmTransform(u8, J3DAnmTransform*);
-    /* 80014E94 */ virtual bool getAnmTransform(u8);
+    /* 80014E94 */ virtual J3DAnmTransform* getAnmTransform(u8);
     /* 80014EA4 */ virtual void setWeight(u8, f32);
     /* 80014EA8 */ virtual void getWeight(u8) const;
-    virtual void init(Vec const& param_0, Mtx*) = 0;
+    virtual void init(const Vec& param_0, const Mtx&) = 0;
     virtual void calc() = 0;
 
     static J3DMtxBuffer* getMtxBuffer() { return mMtxBuffer; }
@@ -36,11 +36,11 @@ public:
 };
 
 template <class A, class B>
-class J3DMtxCalcNoAnm : public J3DMtxCalcNoAnmBase, public A, public B {
+class J3DMtxCalcNoAnm : public J3DMtxCalcNoAnmBase {
 public:
     J3DMtxCalcNoAnm() {}
     virtual ~J3DMtxCalcNoAnm() {}
-    virtual void init(Vec const& param_0, f32 const (&param_1)[3][4]);
+    virtual void init(const Vec& param_0, const Mtx& param_1);
     virtual void calc();
 };
 
@@ -93,11 +93,11 @@ private:
 };  // Size: 0x5C
 
 struct J3DMtxCalcJ3DSysInitMaya {
-    /* 8032ECAC */ static void init(Vec const&, f32 const (&)[3][4]);
+    /* 8032ECAC */ static void init(const Vec&, const Mtx& param_1);
 };
 
 struct J3DMtxCalcJ3DSysInitBasic {
-    /* 8032EC28 */ static void init(Vec const&, f32 const (&)[3][4]);
+    /* 8032EC28 */ static void init(const Vec&, const Mtx& param_1);
 };
 
 struct J3DMtxCalcCalcTransformSoftimage {
diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index 69ad60894c..a8048a1b2c 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -81,6 +81,7 @@ public:
     J3DMatPacket* getMatPacket(u16 idx) const { return &mMatPacket[idx]; }
     J3DShapePacket* getShapePacket(u16 idx) const { return &mShapePacket[idx]; }
     J3DMtxBuffer* getMtxBuffer() const { return mMtxBuffer; }
+    void setScaleFlag(int idx, u8 flag) { mMtxBuffer->setScaleFlag(idx, flag); }
     Mtx33* getBumpMtxPtr(int idx) const { return mMtxBuffer->getBumpMtxPtr(idx); }
     Mtx33* getNrmMtxPtr() const { return mMtxBuffer->getNrmMtxPtr(); }
     Mtx* getDrawMtxPtr() const { return mMtxBuffer->getDrawMtxPtr(); }
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index 914cc2d610..085e3b74fa 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -99,6 +99,9 @@ struct J3DSys {
     J3DMatPacket* getMatPacket() { return mMatPacket; }
     void setMaterialMode(u32 mode) { mMaterialMode = mode; }
 
+    void setCurrentMtxCalc(J3DMtxCalc * pCalc) { mCurrentMtxCalc = pCalc; }
+    J3DMtxCalc * getCurrentMtxCalc() const { return mCurrentMtxCalc; }
+
     void setTexture(J3DTexture* pTex) { mTexture = pTex; }
     J3DTexture* getTexture() { return mTexture; }
 
diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h
index aa0fbc541e..e305ccc744 100644
--- a/include/JSystem/JMath/JMath.h
+++ b/include/JSystem/JMath/JMath.h
@@ -5,6 +5,7 @@
 
 void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32);
 void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3);
+void JMAQuatLerp(const Quaternion*, const Quaternion*, f32, Quaternion*);
 
 inline f32 JMAFastReciprocal(f32 value) {
     return __fres(value);