match and link StringObj

SwareJonge · SwareJonge · commit 65db312da2f6 · 2026-01-07T14:44:51.000+01:00
diff --git a/configure.py b/configure.py
@@ -1308,7 +1308,7 @@ def MatchingFor(*versions):
             Object(Matching, "Sato/ItemKinoko.cpp"),
             Object(NonMatching, "Sato/ItemStar.cpp"),
             Object(NonMatching, "Sato/J3DEffectMgr.cpp"),
-            Object(NonMatching, "Sato/StringObj.cpp"),
+            Object(Matching, "Sato/StringObj.cpp"),
             Object(NonMatching, "Sato/ItemWanWan.cpp"),
             Object(NonMatching, "Sato/ItemBomb.cpp"),
             Object(NonMatching, "Sato/ObjUtility.cpp"),
diff --git a/include/JSystem/JGeometry/Matrix.h b/include/JSystem/JGeometry/Matrix.h
@@ -82,20 +82,27 @@ namespace JGeometry {
         TRotation3() {}
         void identity33();
 
-        void getXDir(TVec3f &rDest) const
-        {
-            rDest.set<f32>(this->mMtx[0][0], this->mMtx[1][0], this->mMtx[2][0]);
-        };
+        // TODO: seems fakematch to me but that's a problem for later i guess
+        inline void getXDir(TVec3f &rDest) const {
+            f32 z = this->mMtx[2][0];
+            f32 y = this->mMtx[1][0];
+            f32 x = this->mMtx[0][0];
+            rDest.set(x, y, z);
+        }
 
-        void getYDir(TVec3f &rDest) const
-        {
-            rDest.set<f32>(this->mMtx[0][1], this->mMtx[1][1], this->mMtx[2][1]);
-        };
+        inline void getYDir(TVec3f &rDest) const {
+            f32 z = this->mMtx[2][1];
+            f32 y = this->mMtx[1][1];
+            f32 x = this->mMtx[0][1];
+            rDest.set(x, y, z);
+        }
 
-        void getZDir(TVec3f &rDest) const
-        {
-            rDest.set<f32>(this->mMtx[0][2], this->mMtx[1][2], this->mMtx[2][2]);
-        };
+        inline void getZDir(TVec3f &rDest) const {
+            f32 z = this->mMtx[2][2];
+            f32 y = this->mMtx[1][2];
+            f32 x = this->mMtx[0][2];
+            rDest.set(x, y, z);
+        }
 
         void getXYZDir(TVec3f &rDestX, TVec3f &rDestY, TVec3f &rDestZ) const;
         void setXDir(const TVec3f &rSrc);
@@ -186,30 +193,6 @@ namespace JGeometry {
         void mult33(TVec3f &) const;
         void mult33(const TVec3f &, TVec3f &) const;
 
-        inline void getXDirInline(TVec3f &rDest) const
-        {
-            f32 z = this->mMtx[2][0];
-            f32 y = this->mMtx[1][0];
-            f32 x = this->mMtx[0][0];
-            rDest.set(x, y, z);
-        }
-
-        inline void getYDirInline(TVec3f &rDest) const
-        {
-            f32 z = this->mMtx[2][1];
-            f32 y = this->mMtx[1][1];
-            f32 x = this->mMtx[0][1];
-            rDest.set(x, y, z);
-        }
-
-        inline void getZDirInline(TVec3f &rDest) const
-        {
-            f32 z = this->mMtx[2][2];
-            f32 y = this->mMtx[1][2];
-            f32 x = this->mMtx[0][2];
-            rDest.set(x, y, z);
-        }
-
 #ifdef NON_MATCHING
         inline void mult33Inline(const TVec3f &rSrc, TVec3f &rDest) const
         {
diff --git a/include/Sato/StringObj.h b/include/Sato/StringObj.h
@@ -7,6 +7,7 @@
 #include "JSystem/JSupport/JSUList.h"
 #include "Kaneshige/DarkAnmMgr.h"
 #include "Kaneshige/ExModel.h"
+#include "Sato/ObjCollision.h"
 
 // Forward declarations
 class ExStringNodeManager;
@@ -23,22 +24,36 @@ class StringObj {
     void setCurrentViewNo(u32);
     void drawSimpleModel(u32, Mtx, J3DUClipper *, Mtx);
 
+    // Inline/Unused
+    void createShadowBrk(J3DAnmTevRegKey *);
+    void viewCalc(u32);
+    void viewCalcClipOn(u32);
+    void viewCalcClipOff(u32);
+
 public:
     // VTBL: 0x0
     StringNodeManager *mStringNodeMgr;          // 0x4
     ExModel *mExModel;                          // 0x8
     u32 _c;
     f32 mScale;                                 // 0x10
-    Mtx *_14;
+    MtxPtr _14;
     u8 _18;
     u8 _19[3];                                  // Padding?
     ItemDarkAnmPlayer **mItemDarkAnmPlayer;     // 0x1c
 };
 
 class StringNode {
 public:
-    StringNode();
-    ~StringNode();
+    StringNode() : _38(this) {
+        mVel.zero();
+        mPos.zero();
+        _18.zero();
+        _24.zero();
+        _30 = true;
+        _31 = false;
+        _34 = 0.0f;
+    }
+    ~StringNode() {}
     void calc();
 
     JGeometry::TVec3f mVel;                     // 0x0
@@ -54,8 +69,10 @@ class StringNode {
 
 class StringNodeManager {
 public:
-    StringNodeManager(u8, f32, bool, bool, u8);
-    virtual ~StringNodeManager();
+    StringNodeManager(u8 count, f32 speed, bool makeSoundMgr, bool makeCrsGround, u8 someFlag);
+    virtual ~StringNodeManager() {
+        delete[] _34;
+    }
     
     void setAllNodePos(const JGeometry::TVec3f &);
     void calc();
@@ -72,6 +89,17 @@ class StringNodeManager {
     void addNodePos(u32, JGeometry::TVec3f);
     void setNodePos(u32, JGeometry::TVec3f);
 
+    // Inline/Unused
+    void calcBetweenNodeVelAll(f32);
+    void calcBetweenNodeVel(StringNode *, StringNode *, f32);
+    void collideSphereAll(f32, ObjColSphere *, const JGeometry::TVec3f &);
+    void collideCylinderAll(f32, ObjColCylinder *, const JGeometry::TVec3f &);
+    void dispose();
+
+    void set_3c(u32 val) {
+        _3c = val;
+    }
+
     // VTBL: 0x0
     JSUList<StringNode> mStrNodeList;           // 0x4
     f32 _10;
@@ -94,12 +122,12 @@ class StringNodeManager {
 
 class ExStringNodeManager : public StringNodeManager {
 public:
-    ExStringNodeManager();
-    ~ExStringNodeManager();
+    ExStringNodeManager(u8 count, f32 speed, bool makeSoundMgr, bool makeCrsGround, u8 someFlag) : StringNodeManager(count, speed, makeSoundMgr, makeCrsGround, someFlag) {
+        setNodeLengthAll(speed);
+    }
+    ~ExStringNodeManager() {}
     virtual void calcBetweenNodePosAll(f32);
     void setNodeLengthAll(f32);
-
-    f32 _50;
 };
 
 #endif // STRINGOBJ_H
diff --git a/src/Sato/StringObj.cpp b/src/Sato/StringObj.cpp
