More

include/m/m3d/m_bmdl.h

@@ -22,7 +22,7 @@ public:
     int getNodeID(const char *name) const;
     bool getNodeWorldMtx(u32 p1, nw4r::math::MTX34 *out) const;
     bool getNodeWorldMtxMultVecZero(u32 p1, nw4r::math::VEC3 &out) const;
-    bool getNodeWorldMtxMultVec(u32, nw4r::math::VEC3 &, nw4r::math::VEC3 &) const;
+    bool getNodeWorldMtxMultVec(u32, const nw4r::math::VEC3 &, nw4r::math::VEC3 &) const;
     nw4r::g3d::ResMdl getResMdl() const;
     nw4r::g3d::ResMat getResMat(u32 index) const;
 
@@ -40,7 +40,7 @@ public:
     bool getBounds(mVec3_c *min, mVec3_c *max) const;
 
 private:
-    banm_c *mpCurrentAnm;
+    /* 0x18 */ banm_c *mpCurrentAnm;
 };
 
 } // namespace m3d

include/m/m3d/m_mdl.h

@@ -43,6 +43,10 @@ public:
             mpBaseCallback = cb;
         }
 
+        nw4r::g3d::ChrAnmResult *getNodeResult(u16 node) {
+            return &mpNodes[node];
+        }
+
     protected:
         /* 0x04 */ calcRatio_c mCalcRatio;
         /* 0x20 */ int mNumNode;
@@ -66,9 +70,9 @@ public:
 
 private:
     /** If we allocated the callback ourselves, this is what we need to free */
-    mdlCallback_c *mpOwnedCallback;
+    /* 0x1C */ mdlCallback_c *mpOwnedCallback;
     /** The actual callback to use */
-    mdlCallback_c *mpCallback;
+    /* 0x20 */ mdlCallback_c *mpCallback;
 };
 
 } // namespace m3d

include/m/m_angle.h

@@ -56,6 +56,10 @@ struct mAng {
         mVal -= other.mVal;
         return *this;
     }
+    mAng &operator*=(const s32 &other) {
+        mVal *= other;
+        return *this;
+    }
 
     s32 step(s16 target, s32 steps, s16 max, s16 min);