refactor(collisions): move potentiallyCollidingWith component to be p…

…rivate
GameDevTecnico · Feb 11, 2024 · e3151e8 · e3151e8
1 parent f2e4f61
commit e3151e8
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/engine/include/cubos/engine/collisions/narrow_phase/colliding_with.hpp b/engine/include/cubos/engine/collisions/narrow_phase/colliding_with.hpp
@@ -2,8 +2,6 @@
 /// @brief Component @ref cubos::engine::CollidingWith.
 /// @ingroup collisions-plugin
 
-// FIXME: This should be private, but it's used in the sample.
-
 #pragma once
 
 #include <glm/vec3.hpp>

diff --git a/engine/samples/collisions/main.cpp b/engine/samples/collisions/main.cpp
@@ -4,7 +4,6 @@
 #include <cubos/core/gl/debug.hpp>
 #include <cubos/core/log.hpp>
 
-#include <cubos/engine/collisions/broad_phase/potentially_colliding_with.hpp>
 #include <cubos/engine/collisions/collider.hpp>
 #include <cubos/engine/collisions/narrow_phase/colliding_with.hpp>
 #include <cubos/engine/collisions/plugin.hpp>

diff --git a/engine/src/collisions/broad_phase/plugin.hpp b/engine/src/collisions/broad_phase/plugin.hpp
@@ -7,9 +7,10 @@
 
 #pragma once
 
-#include <cubos/engine/collisions/broad_phase/potentially_colliding_with.hpp>
 #include <cubos/engine/prelude.hpp>
 
+#include "potentially_colliding_with.hpp"
+
 namespace cubos::engine
 {
     /// @defgroup broad-phase-collisions-plugin Broad-phase Collisions

diff --git a/engine/src/collisions/broad_phase/potentially_colliding_with.cpp b/engine/src/collisions/broad_phase/potentially_colliding_with.cpp
@@ -1,8 +1,8 @@
+#include "potentially_colliding_with.hpp"
+
 #include <cubos/core/ecs/reflection.hpp>
 #include <cubos/core/reflection/type.hpp>
 
-#include <cubos/engine/collisions/broad_phase/potentially_colliding_with.hpp>
-
 CUBOS_REFLECT_IMPL(cubos::engine::PotentiallyCollidingWith)
 {
     return core::ecs::TypeBuilder<PotentiallyCollidingWith>("cubos::engine::PotentiallyCollidingWith")

diff --git a/...road_phase/potentially_colliding_with.hpp → ...road_phase/potentially_colliding_with.hpp b/...road_phase/potentially_colliding_with.hpp → ...road_phase/potentially_colliding_with.hpp
@@ -2,8 +2,6 @@
 /// @brief Component @ref cubos::engine::PotentiallyCollidingWith.
 /// @ingroup collisions-plugin
 
-// FIXME: This should be private, but it's used in the sample.
-
 #pragma once
 
 #include <cubos/core/reflection/reflect.hpp>

diff --git a/engine/src/collisions/narrow_phase/plugin.cpp b/engine/src/collisions/narrow_phase/plugin.cpp
@@ -6,6 +6,8 @@
 #include <cubos/engine/collisions/shapes/box.hpp>
 #include <cubos/engine/transform/local_to_world.hpp>
 
+#include "../broad_phase/potentially_colliding_with.hpp"
+
 void cubos::engine::narrowPhaseCollisionsPlugin(Cubos& cubos)
 {
     cubos.addRelation<CollidingWith>();

diff --git a/engine/src/collisions/narrow_phase/plugin.hpp b/engine/src/collisions/narrow_phase/plugin.hpp
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <cubos/engine/collisions/broad_phase/potentially_colliding_with.hpp>
 #include <cubos/engine/collisions/narrow_phase/colliding_with.hpp>
 #include <cubos/engine/prelude.hpp>