refactor(collisions): farewell simplex

GameDevTecnico · Oct 3, 2023 · 660f908 · 660f908
1 parent c50da74
commit 660f908
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 318 deletions.
diff --git a/core/include/cubos/core/geom/plane.hpp b/core/include/cubos/core/geom/plane.hpp
diff --git a/core/include/cubos/core/geom/simplex.hpp b/core/include/cubos/core/geom/simplex.hpp
diff --git a/core/tests/CMakeLists.txt b/core/tests/CMakeLists.txt
@@ -32,7 +32,6 @@ add_executable(
 
     geom/box.cpp
     geom/capsule.cpp
-    geom/simplex.cpp
 )
 
 target_link_libraries(cubos-core-tests cubos-core doctest::doctest)

diff --git a/core/tests/geom/simplex.cpp b/core/tests/geom/simplex.cpp
diff --git a/engine/include/cubos/engine/collisions/broad_phase_collisions.hpp b/engine/include/cubos/engine/collisions/broad_phase_collisions.hpp
@@ -34,14 +34,7 @@ namespace cubos::engine
         {
             BoxBox = 0,
             BoxCapsule,
-            BoxPlane,
-            BoxSimplex,
             CapsuleCapsule,
-            CapsulePlane,
-            CapsuleSimplex,
-            PlanePlane,
-            PlaneSimplex,
-            SimplexSimplex,
 
             Count ///< Number of collision types.
         };

diff --git a/engine/include/cubos/engine/collisions/colliders/plane.hpp b/engine/include/cubos/engine/collisions/colliders/plane.hpp
diff --git a/engine/include/cubos/engine/collisions/colliders/simplex.hpp b/engine/include/cubos/engine/collisions/colliders/simplex.hpp
diff --git a/engine/include/cubos/engine/collisions/plugin.hpp b/engine/include/cubos/engine/collisions/plugin.hpp
@@ -21,8 +21,6 @@ namespace cubos::engine
     /// ## Components
     /// - @ref BoxCollider - holds the box collider data.
     /// - @ref CapsuleCollider - holds the capsule collider data.
-    /// - @ref PlaneCollider - holds the plane collider data.
-    /// - @ref SimplexCollider - holds the simplex collider data.
     ///
     /// ## Events
     /// - @ref CollisionEvent - (TODO) emitted when a collision occurs.

diff --git a/engine/src/cubos/engine/collisions/broad_phase.cpp b/engine/src/cubos/engine/collisions/broad_phase.cpp
@@ -45,13 +45,6 @@ void updateCapsuleAABBs(Query<Read<LocalToWorld>, Read<CapsuleCollider>, Write<C
     (void)collisions;
 }
 
-void updateSimplexAABBs(Query<Read<LocalToWorld>, Read<SimplexCollider>, Write<ColliderAABB>> query,
-                        Write<BroadPhaseCollisions> collisions)
-{
-    (void)query;
-    (void)collisions;
-}
-
 void updateMarkers(Query<Read<ColliderAABB>> query, Write<BroadPhaseCollisions> collisions)
 {
     // TODO: This is parallelizable.
@@ -98,59 +91,22 @@ void sweep(Write<BroadPhaseCollisions> collisions)
     }
 }
 
-CollisionType getCollisionType(bool box, bool capsule, bool plane, bool simplex)
+CollisionType getCollisionType(bool box, bool capsule)
 {
     if (box && capsule)
     {
         return CollisionType::BoxCapsule;
     }
 
-    if (box && plane)
-    {
-        return CollisionType::BoxPlane;
-    }
-
-    if (box && simplex)
-    {
-        return CollisionType::BoxSimplex;
-    }
-
     if (box)
     {
         return CollisionType::BoxBox;
     }
 
-    if (capsule && plane)
-    {
-        return CollisionType::CapsulePlane;
-    }
-
-    if (capsule && simplex)
-    {
-        return CollisionType::CapsuleSimplex;
-    }
-
-    if (capsule)
-    {
-        return CollisionType::CapsuleCapsule;
-    }
-
-    if (plane && simplex)
-    {
-        return CollisionType::PlaneSimplex;
-    }
-
-    if (plane)
-    {
-        return CollisionType::PlanePlane;
-    }
-
-    return CollisionType::SimplexSimplex;
+    return CollisionType::CapsuleCapsule;
 }
 
-void findPairs(Query<OptRead<BoxCollider>, OptRead<CapsuleCollider>, OptRead<PlaneCollider>, OptRead<SimplexCollider>,
-                     Read<ColliderAABB>>
-                   query,
+void findPairs(Query<OptRead<BoxCollider>, OptRead<CapsuleCollider>, Read<ColliderAABB>> query,
                Write<BroadPhaseCollisions> collisions)
 {
     collisions->clearCandidates();
@@ -159,14 +115,13 @@ void findPairs(Query<OptRead<BoxCollider>, OptRead<CapsuleCollider>, OptRead<Pla
     {
         for (auto& [entity, overlaps] : collisions->sweepOverlapMaps[axis])
         {
-            auto [box, capsule, plane, simplex, aabb] = query[entity].value();
+            auto [box, capsule, aabb] = query[entity].value();
             for (auto& other : overlaps)
             {
-                auto [otherBox, otherCapsule, otherPlane, otherSimplex, otherAabb] = query[other].value();
+                auto [otherBox, otherCapsule, otherAabb] = query[other].value();
 
                 // TODO: Should this be inside the if statement?
-                auto type = getCollisionType(box || otherBox, capsule || otherCapsule, plane || otherPlane,
-                                             simplex || otherSimplex);
+                auto type = getCollisionType(box || otherBox, capsule || otherCapsule);
 
                 switch (axis)
                 {