Add ObjectDrivable

vabold · Mar 1, 2025 · a254940 · a254940
1 parent ece0c03
commit a254940
Show file tree

Hide file tree

Showing 20 changed files with 201 additions and 88 deletions.
diff --git a/source/game/field/BoxColManager.cc b/source/game/field/BoxColManager.cc
@@ -1,6 +1,7 @@
 #include "BoxColManager.hh"
 
 #include "game/field/obj/ObjectCollidable.hh"
+#include "game/field/obj/ObjectDrivable.hh"
 
 #include <numeric>
 
@@ -184,8 +185,8 @@ ObjectCollidable *BoxColManager::getNextObject() {
 }
 
 /// @addr{0x80785EC4}
-void *BoxColManager::getNextDrivable() {
-    return getNextImpl(m_nextDrivableID, eBoxColFlag::Drivable);
+ObjectDrivable *BoxColManager::getNextDrivable() {
+    return reinterpret_cast<ObjectDrivable *>(getNextImpl(m_nextDrivableID, eBoxColFlag::Drivable));
 }
 
 /// @addr{0x80785F2C}

diff --git a/source/game/field/BoxColManager.hh b/source/game/field/BoxColManager.hh
@@ -12,6 +12,7 @@ class KartObject;
 namespace Field {
 
 class ObjectCollidable;
+class ObjectDrivable;
 
 /// @brief A bitfield that represents the state and type of a given BoxColUnit.
 /// @details The lower 8 bits represent the type, while the remaining bits represent the state.
@@ -72,7 +73,7 @@ public:
     void calc();
 
     [[nodiscard]] ObjectCollidable *getNextObject();
-    [[nodiscard]] void *getNextDrivable();
+    [[nodiscard]] ObjectDrivable *getNextDrivable();
 
     void resetIterators();
 

diff --git a/source/game/field/CollisionDirector.cc b/source/game/field/CollisionDirector.cc
@@ -10,7 +10,7 @@ void CollisionDirector::checkCourseColNarrScLocal(f32 radius, const EGG::Vector3
 
 /// @addr{0x8078F500}
 bool CollisionDirector::checkSphereFull(f32 radius, const EGG::Vector3f &v0,
-        const EGG::Vector3f &v1, KCLTypeMask flags, CourseColMgr::CollisionInfo *pInfo,
+        const EGG::Vector3f &v1, KCLTypeMask flags, CollisionInfo *pInfo,
         KCLTypeMask *pFlagsOut, u32 /*timeOffset*/) {
     if (pInfo) {
         pInfo->bbox.min = EGG::Vector3f::zero;
@@ -56,7 +56,7 @@ bool CollisionDirector::checkSphereFull(f32 radius, const EGG::Vector3f &v0,
 
 /// @addr{0x8078F784}
 bool CollisionDirector::checkSphereFullPush(f32 radius, const EGG::Vector3f &v0,
-        const EGG::Vector3f &v1, KCLTypeMask flags, CourseColMgr::CollisionInfo *pInfo,
+        const EGG::Vector3f &v1, KCLTypeMask flags, CollisionInfo *pInfo,
         KCLTypeMask *pFlagsOut, u32 /*timeOffset*/) {
     if (pInfo) {
         pInfo->bbox.setZero();
@@ -103,7 +103,7 @@ bool CollisionDirector::checkSphereFullPush(f32 radius, const EGG::Vector3f &v0,
 /// @addr{0x807901F0}
 bool CollisionDirector::checkSphereCachedPartial(f32 radius, const EGG::Vector3f &pos,
         const EGG::Vector3f &prevPos, KCLTypeMask typeMask,
-        CourseColMgr::CollisionInfoPartial *info, KCLTypeMask *typeMaskOut, u32 /*timeOffset*/) {
+        CollisionInfoPartial *info, KCLTypeMask *typeMaskOut, u32 /*timeOffset*/) {
     if (info) {
         info->bbox.setZero();
     }
@@ -140,7 +140,7 @@ bool CollisionDirector::checkSphereCachedPartial(f32 radius, const EGG::Vector3f
 /// @addr{0x807903BC}
 bool CollisionDirector::checkSphereCachedPartialPush(f32 radius, const EGG::Vector3f &pos,
         const EGG::Vector3f &prevPos, KCLTypeMask typeMask,
-        CourseColMgr::CollisionInfoPartial *info, KCLTypeMask *typeMaskOut, u32 /*timeOffset*/) {
+        CollisionInfoPartial *info, KCLTypeMask *typeMaskOut, u32 /*timeOffset*/) {
     if (info) {
         info->bbox.setZero();
     }
@@ -166,7 +166,7 @@ bool CollisionDirector::checkSphereCachedPartialPush(f32 radius, const EGG::Vect
 
 /// @addr{0x807907F8}
 bool CollisionDirector::checkSphereCachedFullPush(f32 radius, const EGG::Vector3f &pos,
-        const EGG::Vector3f &prevPos, KCLTypeMask typeMask, CourseColMgr::CollisionInfo *colInfo,
+        const EGG::Vector3f &prevPos, KCLTypeMask typeMask, CollisionInfo *colInfo,
         KCLTypeMask *typeMaskOut, u32 /*timeOffset*/) {
     if (colInfo) {
         colInfo->bbox.min.setZero();

diff --git a/source/game/field/CollisionDirector.hh b/source/game/field/CollisionDirector.hh
@@ -24,20 +24,20 @@ public:
             u32 timeOffset);
 
     [[nodiscard]] bool checkSphereFull(f32 radius, const EGG::Vector3f &v0, const EGG::Vector3f &v1,
-            KCLTypeMask flags, CourseColMgr::CollisionInfo *pInfo, KCLTypeMask *pFlagsOut,
+            KCLTypeMask flags, CollisionInfo *pInfo, KCLTypeMask *pFlagsOut,
             u32 timeOffset);
     [[nodiscard]] bool checkSphereFullPush(f32 radius, const EGG::Vector3f &v0,
-            const EGG::Vector3f &v1, KCLTypeMask flags, CourseColMgr::CollisionInfo *pInfo,
+            const EGG::Vector3f &v1, KCLTypeMask flags, CollisionInfo *pInfo,
             KCLTypeMask *pFlagsOut, u32 timeOffset);
 
     [[nodiscard]] bool checkSphereCachedPartial(f32 radius, const EGG::Vector3f &pos,
             const EGG::Vector3f &prevPos, KCLTypeMask typeMask,
-            CourseColMgr::CollisionInfoPartial *info, KCLTypeMask *typeMaskOut, u32 timeOffset);
+            CollisionInfoPartial *info, KCLTypeMask *typeMaskOut, u32 timeOffset);
     [[nodiscard]] bool checkSphereCachedPartialPush(f32 radius, const EGG::Vector3f &pos,
             const EGG::Vector3f &prevPos, KCLTypeMask typeMask,
-            CourseColMgr::CollisionInfoPartial *info, KCLTypeMask *typeMaskOut, u32 timeOffset);
+            CollisionInfoPartial *info, KCLTypeMask *typeMaskOut, u32 timeOffset);
     [[nodiscard]] bool checkSphereCachedFullPush(f32 radius, const EGG::Vector3f &pos,
-            const EGG::Vector3f &prevPos, KCLTypeMask typeMask, CourseColMgr::CollisionInfo *info,
+            const EGG::Vector3f &prevPos, KCLTypeMask typeMask, CollisionInfo *info,
             KCLTypeMask *typeMaskOut, u32 timeOffset);
 
     void resetCollisionEntries(KCLTypeMask *ptr);

diff --git a/source/game/field/CourseColMgr.cc b/source/game/field/CourseColMgr.cc
@@ -574,25 +574,6 @@ bool CourseColMgr::doCheckMaskOnlyPush(KColData *data, CollisionCheckFunc collis
     return hasCol;
 }
 
-void CourseColMgr::CollisionInfo::update(f32 now_dist, const EGG::Vector3f &offset,
-        const EGG::Vector3f &fnrm, u32 kclAttributeTypeBit) {
-    bbox.min = bbox.min.minimize(offset);
-    bbox.max = bbox.max.maximize(offset);
-
-    if (kclAttributeTypeBit & KCL_TYPE_FLOOR) {
-        updateFloor(now_dist, fnrm);
-    } else if (kclAttributeTypeBit & KCL_TYPE_WALL) {
-        if (wallDist > -std::numeric_limits<f32>::min()) {
-            f32 dot = 1.0f - wallNrm.ps_dot(fnrm);
-            if (dot > perpendicularity) {
-                perpendicularity = std::min(dot, 1.0f);
-            }
-        }
-
-        updateWall(now_dist, fnrm);
-    }
-}
-
 CourseColMgr *CourseColMgr::s_instance = nullptr; ///< @addr{0x809C3C10}
 
 } // namespace Field
diff --git a/source/game/field/CourseColMgr.hh b/source/game/field/CourseColMgr.hh
@@ -17,40 +17,6 @@ typedef bool (
 /// @nosubgrouping
 class CourseColMgr : EGG::Disposer {
 public:
-    struct CollisionInfoPartial {
-        EGG::BoundBox3f bbox;
-        EGG::Vector3f tangentOff;
-    };
-
-    struct CollisionInfo {
-        EGG::BoundBox3f bbox;
-        EGG::Vector3f tangentOff;
-        EGG::Vector3f floorNrm;
-        EGG::Vector3f wallNrm;
-        EGG::Vector3f _3c;
-        f32 floorDist;
-        f32 wallDist;
-        f32 _50;
-        f32 perpendicularity;
-
-        void updateFloor(f32 dist, const EGG::Vector3f &fnrm) {
-            if (dist > floorDist) {
-                floorDist = dist;
-                floorNrm = fnrm;
-            }
-        }
-
-        void updateWall(f32 dist, const EGG::Vector3f &fnrm) {
-            if (dist > wallDist) {
-                wallDist = dist;
-                wallNrm = fnrm;
-            }
-        }
-
-        void update(f32 now_dist, const EGG::Vector3f &offset, const EGG::Vector3f &fnrm,
-                u32 kclAttributeTypeBit);
-    };
-
     struct NoBounceWallColInfo {
         EGG::BoundBox3f bbox;
         EGG::Vector3f tangentOff;

diff --git a/source/game/field/KColData.cc b/source/game/field/KColData.cc
@@ -682,4 +682,23 @@ KColData::KCollisionPrism::KCollisionPrism(f32 height, u16 posIndex, u16 faceNor
     : height(height), pos_i(posIndex), fnrm_i(faceNormIndex), enrm1_i(edge1NormIndex),
       enrm2_i(edge2NormIndex), enrm3_i(edge3NormIndex), attribute(attribute) {}
 
+void CollisionInfo::update(f32 now_dist, const EGG::Vector3f &offset, const EGG::Vector3f &fnrm,
+        u32 kclAttributeTypeBit) {
+    bbox.min = bbox.min.minimize(offset);
+    bbox.max = bbox.max.maximize(offset);
+
+    if (kclAttributeTypeBit & KCL_TYPE_FLOOR) {
+        updateFloor(now_dist, fnrm);
+    } else if (kclAttributeTypeBit & KCL_TYPE_WALL) {
+        if (wallDist > -std::numeric_limits<f32>::min()) {
+            f32 dot = 1.0f - wallNrm.ps_dot(fnrm);
+            if (dot > perpendicularity) {
+                perpendicularity = std::min(dot, 1.0f);
+            }
+        }
+
+        updateWall(now_dist, fnrm);
+    }
+}
+
 } // namespace Field
diff --git a/source/game/field/KColData.hh b/source/game/field/KColData.hh
@@ -9,6 +9,40 @@
 
 namespace Field {
 
+struct CollisionInfoPartial {
+    EGG::BoundBox3f bbox;
+    EGG::Vector3f tangentOff;
+};
+
+struct CollisionInfo {
+    EGG::BoundBox3f bbox;
+    EGG::Vector3f tangentOff;
+    EGG::Vector3f floorNrm;
+    EGG::Vector3f wallNrm;
+    EGG::Vector3f _3c;
+    f32 floorDist;
+    f32 wallDist;
+    f32 _50;
+    f32 perpendicularity;
+
+    void updateFloor(f32 dist, const EGG::Vector3f &fnrm) {
+        if (dist > floorDist) {
+            floorDist = dist;
+            floorNrm = fnrm;
+        }
+    }
+
+    void updateWall(f32 dist, const EGG::Vector3f &fnrm) {
+        if (dist > wallDist) {
+            wallDist = dist;
+            wallNrm = fnrm;
+        }
+    }
+
+    void update(f32 now_dist, const EGG::Vector3f &offset, const EGG::Vector3f &fnrm,
+            u32 kclAttributeTypeBit);
+};
+
 /// @brief Performs lookups for KCL triangles
 /// @nosubgrouping
 class KColData {

diff --git a/source/game/field/obj/ObjectBase.hh b/source/game/field/obj/ObjectBase.hh
@@ -18,6 +18,7 @@ public:
     virtual void calc() {}
     virtual void calcModel();
     virtual void load() = 0;
+    virtual void createCollision() = 0;
     virtual void calcCollisionTransform() = 0;
 
     /// @addr{0x806BF434}

diff --git a/source/game/field/obj/ObjectCollidable.hh b/source/game/field/obj/ObjectCollidable.hh
@@ -51,7 +51,7 @@ public:
     }
 
 protected:
-    virtual void createCollision();
+    void createCollision() override;
 
     /// @addr{0x806816B8}
     virtual const EGG::Vector3f &collisionCenter() const {

diff --git a/source/game/field/obj/ObjectDokan.cc b/source/game/field/obj/ObjectDokan.cc
@@ -66,7 +66,7 @@ void ObjectDokan::calcFloor() {
     constexpr f32 PIPE_SQRT_RADIUS = 10.0f;
     constexpr f32 ACCELERATION = 0.2f;
 
-    CourseColMgr::CollisionInfo colInfo;
+    CollisionInfo colInfo;
     EGG::Vector3f pos = m_pos;
     pos.y += PIPE_RADIUS;
     KCLTypeMask typeMask;

diff --git a/source/game/field/obj/ObjectDrivable.cc b/source/game/field/obj/ObjectDrivable.cc
@@ -0,0 +1,32 @@
+#include "game/field/obj/ObjectDrivable.hh"
+
+namespace Field {
+
+/// @addr{0x8081A6D0}
+ObjectDrivable::ObjectDrivable(const System::MapdataGeoObj &params) : ObjectBase(params) {}
+
+/// @addr{0x8067EB3C}
+ObjectDrivable::~ObjectDrivable() = default;
+
+/// @addr{0x8081A79C}
+void ObjectDrivable::load() {
+    createCollision();
+    initCollision();
+    loadAABB(getCollisionRadius());
+
+    // ObjectDrivableDirector::Instance()->addObject(this);
+}
+
+/// @addr{0x80682918}
+f32 ObjectDrivable::getCollisionRadius() const {
+    return 5000.0f;
+}
+
+/// @addr{0x8081A85C}
+void ObjectDrivable::loadAABB(f32 radius) {
+    auto *boxColMgr = BoxColManager::Instance();
+    const EGG::Vector3f &pos = getPosition();
+    m_boxColUnit = boxColMgr->insertDrivable(radius, 0.0f, &pos, false, this);
+}
+
+} // namespace Field
diff --git a/source/game/field/obj/ObjectDrivable.hh b/source/game/field/obj/ObjectDrivable.hh
@@ -0,0 +1,77 @@
+#pragma once
+
+#include "game/field/CourseColMgr.hh"
+#include "game/field/KCollisionTypes.hh"
+#include "game/field/ObjectCollisionBase.hh"
+#include "game/field/obj/ObjectBase.hh"
+
+namespace Field {
+
+class ObjectDrivable : public ObjectBase {
+public:
+    ObjectDrivable(const System::MapdataGeoObj &params);
+    ~ObjectDrivable() override;
+
+    void load() override;
+    [[nodiscard]] f32 getCollisionRadius() const override;
+
+    virtual void initCollision() {}
+    virtual void loadAABB(f32 radius);
+
+    [[nodiscard]] virtual bool checkPointPartial(const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask,
+            CollisionInfoPartial *info, KCLTypeMask *maskOut) = 0;
+    [[nodiscard]] virtual bool checkPointPartialPush(const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask flags,
+            CollisionInfoPartial *info, KCLTypeMask *maskOut) = 0;
+    [[nodiscard]] virtual bool checkPointFull(const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask, CollisionInfo *info,
+            KCLTypeMask *maskOut) = 0;
+    [[nodiscard]] virtual bool checkPointFullPush(const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask, CollisionInfo *info,
+            KCLTypeMask *maskOut) = 0;
+
+    [[nodiscard]] virtual bool checkSpherePartial(f32 radius, const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask,
+            CollisionInfoPartial *info, KCLTypeMask *maskOut, u32 timeOffset) = 0;
+    [[nodiscard]] virtual bool checkSpherePartialPush(f32 radius, const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask,
+            CollisionInfoPartial *info, KCLTypeMask *maskOut, u32 timeOffset) = 0;
+    [[nodiscard]] virtual bool checkSphereFull(f32 radius, const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask, CollisionInfo *info,
+            KCLTypeMask *maskOut, u32 timeOffset) = 0;
+    [[nodiscard]] virtual bool checkSphereFullPush(f32 radius, const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask, CollisionInfo *info,
+            KCLTypeMask *maskOut, u32 timeOffset) = 0;
+
+    virtual void narrScLocal(f32 radius, const EGG::Vector3f &pos, KCLTypeMask mask,
+            u32 timeOffset) {}
+
+    [[nodiscard]] virtual bool checkPointCachedPartial(const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask,
+            CollisionInfoPartial *info, KCLTypeMask *maskOut) = 0;
+    [[nodiscard]] virtual bool checkPointCachedPartialPush(const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask,
+            CollisionInfoPartial *info, KCLTypeMask *maskOut) = 0;
+    [[nodiscard]] virtual bool checkPointCachedFull(const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask, CollisionInfo *info,
+            KCLTypeMask *maskOut) = 0;
+    [[nodiscard]] virtual bool checkPointCachedFullPush(const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask, CollisionInfo *info,
+            KCLTypeMask *maskOut) = 0;
+
+    [[nodiscard]] virtual bool checkSphereCachedPartial(f32 radius, const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask,
+            CollisionInfoPartial *info, KCLTypeMask *maskOut, u32 timeOffset) = 0;
+    [[nodiscard]] virtual bool checkSphereCachedPartialPush(f32 radius, const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask,
+            CollisionInfoPartial *info, KCLTypeMask *maskOut, u32 timeOffset) = 0;
+    [[nodiscard]] virtual bool checkSphereCachedFull(f32 radius, const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask, CollisionInfo *info,
+            KCLTypeMask *maskOut, u32 timeOffset) = 0;
+    [[nodiscard]] virtual bool checkSphereCachedFullPush(f32 radius, const EGG::Vector3f &pos,
+            const EGG::Vector3f &prevPos, KCLTypeMask mask, CollisionInfo *info,
+            KCLTypeMask *maskOut, u32 timeOffset) = 0;
+};
+
+} // namespace Field
diff --git a/source/game/field/obj/ObjectNoImpl.hh b/source/game/field/obj/ObjectNoImpl.hh
@@ -10,6 +10,7 @@ public:
     ~ObjectNoImpl() override;
 
     void load() override;
+    void createCollision() override {}
     void calcCollisionTransform() override {}
 };