diff --git a/configure.py b/configure.py index 42c6fb23c..3d7336e50 100644 --- a/configure.py +++ b/configure.py @@ -551,7 +551,7 @@ config.libs = [ "J3DU", [ Object(Matching, "JSystem/J3DU/J3DUClipper.cpp"), - Object(NonMatching, "JSystem/J3DU/J3DUMotion.cpp"), + Object(Matching, "JSystem/J3DU/J3DUMotion.cpp"), Object(Matching, "JSystem/J3DU/J3DUDL.cpp"), ], ), diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h index e0963865d..1d4f47c26 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJoint.h +++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h @@ -48,11 +48,11 @@ private: public: J3DMtxCalcBasic(); - virtual ~J3DMtxCalcBasic() {} - virtual void init(const Vec& vec, const Mtx& mtx); virtual void recursiveCalc(J3DNode*); virtual void calcTransform(u16, const J3DTransformInfo&); virtual void calc(u16); + virtual ~J3DMtxCalcBasic() {} + virtual void init(const Vec& vec, const Mtx& mtx); Mtx& getBackupMtx() { return mBackupMtx; } Vec& getBackupS() { return mBackupS; } @@ -65,9 +65,9 @@ public: class J3DMtxCalcSoftimage : public J3DMtxCalcBasic { public: J3DMtxCalcSoftimage() : J3DMtxCalc() {} + virtual void calcTransform(u16, const J3DTransformInfo&); virtual ~J3DMtxCalcSoftimage(); virtual void init(const Vec& vec, const Mtx& mtx); - virtual void calcTransform(u16, const J3DTransformInfo&); }; class J3DMtxCalcMaya : public J3DMtxCalcBasic {