diff --git a/include/omath/3d_primitives/mesh.hpp b/include/omath/3d_primitives/mesh.hpp index baaa8cd..cc2e5e4 100644 --- a/include/omath/3d_primitives/mesh.hpp +++ b/include/omath/3d_primitives/mesh.hpp @@ -99,10 +99,10 @@ namespace omath::primitives } [[nodiscard]] - VectorType vertex_to_world_space(const Vector3& vertex_position) const + VectorType vertex_position_to_world_space(const Vector3& vertex_position) const requires HasPosition { - auto abs_vec = get_to_world_matrix() * mat_column_from_vector(vertex_position); + auto abs_vec = get_to_world_matrix() * mat_column_from_vector(vertex_position); return {abs_vec.at(0, 0), abs_vec.at(1, 0), abs_vec.at(2, 0)}; } @@ -111,9 +111,9 @@ namespace omath::primitives Triangle make_face_in_world_space(const Ebo::const_iterator vao_iterator) const requires HasPosition { - return {vertex_to_world_space(m_vertex_buffer.at(vao_iterator->x).position), - vertex_to_world_space(m_vertex_buffer.at(vao_iterator->y).position), - vertex_to_world_space(m_vertex_buffer.at(vao_iterator->z).position)}; + return {vertex_position_to_world_space(m_vertex_buffer.at(vao_iterator->x).position), + vertex_position_to_world_space(m_vertex_buffer.at(vao_iterator->y).position), + vertex_position_to_world_space(m_vertex_buffer.at(vao_iterator->z).position)}; } private: diff --git a/include/omath/collision/collider_interface.hpp b/include/omath/collision/collider_interface.hpp new file mode 100644 index 0000000..b27487b --- /dev/null +++ b/include/omath/collision/collider_interface.hpp @@ -0,0 +1,23 @@ +// +// Created by Vladislav on 06.12.2025. +// +#pragma once + + +namespace omath::collision +{ + template> + class ColliderInterface + { + public: + using VectorType = VecType; + virtual ~ColliderInterface() = default; + + [[nodiscard]] + virtual VectorType find_abs_furthest_vertex_position(const VectorType& direction) const = 0; + + [[nodiscard]] + virtual const VectorType& get_origin() const = 0; + virtual void set_origin(const VectorType& new_origin) = 0; + }; +} \ No newline at end of file diff --git a/include/omath/collision/epa_algorithm.hpp b/include/omath/collision/epa_algorithm.hpp index 6b1d732..6083aad 100644 --- a/include/omath/collision/epa_algorithm.hpp +++ b/include/omath/collision/epa_algorithm.hpp @@ -101,10 +101,7 @@ namespace omath::collision out.num_vertices = static_cast(vertexes.size()); out.num_faces = static_cast(faces.size()); - const auto centers = b.get_origin() - a.get_origin(); - const auto sign = out.normal.dot(centers) >= 0 ? 1 : -1; - - out.penetration_vector = out.normal * out.depth * sign; + out.penetration_vector = out.normal * out.depth; return out; } @@ -163,10 +160,7 @@ namespace omath::collision out.num_vertices = static_cast(vertexes.size()); out.num_faces = static_cast(faces.size()); - const auto centers = b.get_origin() - a.get_origin(); - const auto sign = out.normal.dot(centers) >= 0 ? 1 : -1; - - out.penetration_vector = out.normal * out.depth * sign; + out.penetration_vector = out.normal * out.depth; return out; } @@ -253,7 +247,7 @@ namespace omath::collision [[nodiscard]] static VectorType support_point(const ColliderType& a, const ColliderType& b, const VectorType& dir) { - return a.find_abs_furthest_vertex(dir).position - b.find_abs_furthest_vertex(-dir).position; + return a.find_abs_furthest_vertex_position(dir) - b.find_abs_furthest_vertex_position(-dir); } template diff --git a/include/omath/collision/gjk_algorithm.hpp b/include/omath/collision/gjk_algorithm.hpp index c3db4ea..8cce66d 100644 --- a/include/omath/collision/gjk_algorithm.hpp +++ b/include/omath/collision/gjk_algorithm.hpp @@ -17,14 +17,15 @@ namespace omath::collision template class GjkAlgorithm final { - using VertexType = ColliderType::VertexType; - using VectorType = VertexType::VectorType; + using VectorType = ColliderType::VectorType; + public: [[nodiscard]] static VectorType find_support_vertex(const ColliderType& collider_a, const ColliderType& collider_b, const VectorType& direction) { - return collider_a.find_abs_furthest_vertex(direction).position - collider_b.find_abs_furthest_vertex(-direction).position; + return collider_a.find_abs_furthest_vertex_position(direction) + - collider_b.find_abs_furthest_vertex_position(-direction); } [[nodiscard]] diff --git a/include/omath/collision/mesh_collider.hpp b/include/omath/collision/mesh_collider.hpp index 96b4d7a..53f15d9 100644 --- a/include/omath/collision/mesh_collider.hpp +++ b/include/omath/collision/mesh_collider.hpp @@ -3,13 +3,22 @@ // #pragma once +#include "collider_interface.hpp" #include "omath/linear_algebra/vector3.hpp" +#ifdef OMATH_BUILD_TESTS +// ReSharper disable once CppInconsistentNaming +class UnitTestColider_FindFurthestVertex_Test; +#endif + namespace omath::collision { template - class MeshCollider + class MeshCollider final : public ColliderInterface> { +#ifdef OMATH_BUILD_TESTS + friend UnitTestColider_FindFurthestVertex_Test; +#endif public: using VertexType = MeshType::VertexType; using VectorType = VertexType::VectorType; @@ -17,6 +26,23 @@ namespace omath::collision { } + [[nodiscard]] + VectorType find_abs_furthest_vertex_position(const VectorType& direction) const override + { + return m_mesh.vertex_position_to_world_space(find_furthest_vertex(direction).position); + } + + [[nodiscard]] + const VectorType& get_origin() const override + { + return m_mesh.get_origin(); + } + void set_origin(const VectorType& new_origin) override + { + m_mesh.set_origin(new_origin); + } + + private: [[nodiscard]] const VertexType& find_furthest_vertex(const VectorType& direction) const { @@ -24,23 +50,6 @@ namespace omath::collision m_mesh.m_vertex_buffer, [&direction](const auto& first, const auto& second) { return first.position.dot(direction) < second.position.dot(direction); }); } - - [[nodiscard]] - VertexType find_abs_furthest_vertex(const VectorType& direction) const - { - const auto& vertex = find_furthest_vertex(direction); - auto new_vertex = vertex; - new_vertex.position = m_mesh.vertex_to_world_space(find_furthest_vertex(direction).position); - return new_vertex; - } - - [[nodiscard]] - const VectorType& get_origin() const - { - return m_mesh.get_origin(); - } - - private: MeshType m_mesh; }; } // namespace omath::collision \ No newline at end of file diff --git a/include/omath/collision/triangle_collider.hpp b/include/omath/collision/triangle_collider.hpp new file mode 100644 index 0000000..0482e14 --- /dev/null +++ b/include/omath/collision/triangle_collider.hpp @@ -0,0 +1,52 @@ +// +// Created by Vlad on 11/9/2025. +// + +#pragma once +#include "omath/linear_algebra/vector3.hpp" +#include + +namespace omath::collision +{ + struct TriangleCollider + { + Vector3 position; + }; + class TriangleMeshCollider final : public ColliderInterface> + { + public: + using VectorType = Vector3; + using VertexType = TriangleCollider; + explicit TriangleMeshCollider(const Triangle>& triangle) + : m_mesh({triangle.m_vertex1, triangle.m_vertex2, triangle.m_vertex3}) + { + } + + [[nodiscard]] + VectorType find_abs_furthest_vertex_position(const VectorType& direction) const override + { + return find_furthest_vertex(direction).position; + } + + [[nodiscard]] + const VectorType& get_origin() const override + { + return m_origin; + } + void set_origin(const VectorType&) override + { + + } + private: + [[nodiscard]] + const VertexType& find_furthest_vertex(const VectorType& direction) const + { + return *std::ranges::max_element( + m_mesh, [&direction](const auto& first, const auto& second) + { return first.position.dot(direction) < second.position.dot(direction); }); + } + + Vector3 m_origin{}; + std::array m_mesh; + }; +} // namespace omath::collision \ No newline at end of file diff --git a/include/omath/linear_algebra/mat.hpp b/include/omath/linear_algebra/mat.hpp index 18b7d71..3ec43ea 100644 --- a/include/omath/linear_algebra/mat.hpp +++ b/include/omath/linear_algebra/mat.hpp @@ -46,7 +46,7 @@ namespace omath } [[nodiscard]] - constexpr static MatStoreType get_store_ordering() noexcept + consteval static MatStoreType get_store_ordering() noexcept { return StoreType; } diff --git a/tests/general/unit_test_colider.cpp b/tests/general/unit_test_colider.cpp index 4800ea2..ce3a960 100644 --- a/tests/general/unit_test_colider.cpp +++ b/tests/general/unit_test_colider.cpp @@ -17,7 +17,7 @@ TEST(UnitTestColider, CheckToWorld) mesh.set_origin({0, 2, 0}); const omath::source_engine::MeshCollider collider(mesh); - const auto vertex = collider.find_abs_furthest_vertex({1.f, 0.f, 0.f}).position; + const auto vertex = collider.find_abs_furthest_vertex_position({1.f, 0.f, 0.f}); EXPECT_EQ(vertex, omath::Vector3(1.f, 3.f, 1.f)); } diff --git a/tests/general/unit_test_epa.cpp b/tests/general/unit_test_epa.cpp index 1b9cd5b..3e8d0ad 100644 --- a/tests/general/unit_test_epa.cpp +++ b/tests/general/unit_test_epa.cpp @@ -61,7 +61,7 @@ TEST(UnitTestEpa, TestCollisionTrue) // Try both signs with a tiny margin (avoid grazing contacts) const float margin = 1.0f + 1e-3f; - const auto pen = epa->normal * epa->depth; + const auto pen = epa->penetration_vector; Mesh b_plus = b; b_plus.set_origin(b_plus.get_origin() + pen * margin); @@ -133,12 +133,8 @@ TEST(UnitTestEpa, TestCollisionTrue2) EXPECT_NEAR(epa->normal.y, 0.0f, 1e-3f); EXPECT_NEAR(epa->normal.z, 0.0f, 1e-3f); - // Choose a deterministic sign: orient penetration from A toward B - const auto centers = b.get_origin() - a.get_origin(); // (0.5, 0, 0) - float sign = (epa->normal.dot(centers) >= 0.0f) ? +1.0f : -1.0f; - constexpr float margin = 1.0f + 1e-3f; // tiny slack to avoid grazing - const auto pen = epa->normal * epa->depth * sign; + const auto pen = epa->normal * epa->depth; // Apply once: B + pen must separate; the opposite must still collide Mesh b_resolved = b;