admin/omath
1
0
Fork 0
mirror of https://github.com/orange-cpp/omath.git synced 2026-02-13 07:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

added std::optional

Browse Source
This commit is contained in:
Orange
2025-11-13 21:25:45 +03:00
parent 12f888b8d4
commit 0283935918
2 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/omath/collision/epa_algorithm.hpp
View File

@@ -29,7 +29,6 @@ namespace omath::collision
struct Result final struct Result final
{ {
bool success{false};
Vertex normal{}; // outward normal (from B to A) Vertex normal{}; // outward normal (from B to A)
Vertex penetration_vector; Vertex penetration_vector;
float depth{0.0f}; float depth{0.0f};
@@ -46,8 +45,8 @@ namespace omath::collision
// Precondition: simplex.size()==4 and contains the origin. // Precondition: simplex.size()==4 and contains the origin.
[[nodiscard]] [[nodiscard]]
static Result solve(const ColliderType& a, const ColliderType& b, const Simplex<Vertex>& simplex, static std::optional<Result> solve(const ColliderType& a, const ColliderType& b, const Simplex<Vertex>& simplex,
const Params params = {}) const Params params = {})
{ {
// --- Build initial polytope from simplex (4 points) --- // --- Build initial polytope from simplex (4 points) ---
std::vector<Vertex> vertexes; std::vector<Vertex> vertexes;
@@ -91,7 +90,6 @@ namespace omath::collision
// Converged if we can’t push the face closer than tolerance // Converged if we can’t push the face closer than tolerance
if (p_dist - f.d <= params.tolerance) if (p_dist - f.d <= params.tolerance)
{ {
out.success = true;
out.normal = f.n; out.normal = f.n;
out.depth = f.d; // along unit normal out.depth = f.d; // along unit normal
out.iterations = it + 1; out.iterations = it + 1;
@@ -155,7 +153,6 @@ namespace omath::collision
for (const auto& f : faces) for (const auto& f : faces)
if (f.d < best.d) if (f.d < best.d)
best = f; best = f;
out.success = true;
out.normal = best.n; out.normal = best.n;
out.depth = best.d; out.depth = best.d;
out.num_vertices = static_cast<int>(vertexes.size()); out.num_vertices = static_cast<int>(vertexes.size());
@@ -165,8 +162,10 @@ namespace omath::collision
const auto sign = out.normal.dot(centers) >= 0 ? 1 : -1; 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 * sign;
return out;
} }
return out; return std::nullopt;
} }
private: private:

38
tests/general/unit_test_epa.cpp
View File

@@ -36,22 +36,22 @@ TEST(UnitTestEpa, TestCollisionTrue)
params.max_iterations = 64; params.max_iterations = 64;
params.tolerance = 1e-4f; params.tolerance = 1e-4f;
auto epa = EPA::solve(A, B, gjk.simplex, params); auto epa = EPA::solve(A, B, gjk.simplex, params);
ASSERT_TRUE(epa.success) << "EPA should converge"; ASSERT_TRUE(epa.has_value()) << "EPA should converge";
// Normal is unit // Normal is unit
EXPECT_NEAR(epa.normal.dot(epa.normal), 1.0f, 1e-5f); EXPECT_NEAR(epa->normal.dot(epa->normal), 1.0f, 1e-5f);
// For this setup, depth ≈ 1.5 (2 - 0.5) // For this setup, depth ≈ 1.5 (2 - 0.5)
EXPECT_NEAR(epa.depth, 1.5f, 1e-3f); EXPECT_NEAR(epa->depth, 1.5f, 1e-3f);
// Normal axis sanity: near X axis // Normal axis sanity: near X axis
EXPECT_NEAR(std::abs(epa.normal.x), 1.0f, 1e-3f); EXPECT_NEAR(std::abs(epa->normal.x), 1.0f, 1e-3f);
EXPECT_NEAR(epa.normal.y, 0.0f, 1e-3f); EXPECT_NEAR(epa->normal.y, 0.0f, 1e-3f);
EXPECT_NEAR(epa.normal.z, 0.0f, 1e-3f); EXPECT_NEAR(epa->normal.z, 0.0f, 1e-3f);
// Try both signs with a tiny margin (avoid grazing contacts) // Try both signs with a tiny margin (avoid grazing contacts)
const float margin = 1.0f + 1e-3f; const float margin = 1.0f + 1e-3f;
const auto pen = epa.normal * epa.depth; const auto pen = epa->normal * epa->depth;
Mesh b_plus = b; Mesh b_plus = b;
b_plus.set_origin(b_plus.get_origin() + pen * margin); b_plus.set_origin(b_plus.get_origin() + pen * margin);
@@ -102,25 +102,25 @@ TEST(UnitTestEpa, TestCollisionTrue2)
params.max_iterations = 64; params.max_iterations = 64;
params.tolerance = 1e-4f; params.tolerance = 1e-4f;
auto epa = EPA::solve(A, B, gjk.simplex, params); auto epa = EPA::solve(A, B, gjk.simplex, params);
ASSERT_TRUE(epa.success) << "EPA should converge"; ASSERT_TRUE(epa.has_value()) << "EPA should converge";
// Normal is unit-length // Normal is unit-length
EXPECT_NEAR(epa.normal.dot(epa.normal), 1.0f, 1e-5f); EXPECT_NEAR(epa->normal.dot(epa->normal), 1.0f, 1e-5f);
// For centers at 0 and +0.5 and half-extent 1 -> depth ≈ 1.5 // For centers at 0 and +0.5 and half-extent 1 -> depth ≈ 1.5
EXPECT_NEAR(epa.depth, 1.5f, 1e-3f); EXPECT_NEAR(epa->depth, 1.5f, 1e-3f);
// Axis sanity: mostly X // Axis sanity: mostly X
EXPECT_NEAR(std::abs(epa.normal.x), 1.0f, 1e-3f); EXPECT_NEAR(std::abs(epa->normal.x), 1.0f, 1e-3f);
EXPECT_NEAR(epa.normal.y, 0.0f, 1e-3f); EXPECT_NEAR(epa->normal.y, 0.0f, 1e-3f);
EXPECT_NEAR(epa.normal.z, 0.0f, 1e-3f); EXPECT_NEAR(epa->normal.z, 0.0f, 1e-3f);
// Choose a deterministic sign: orient penetration from A toward B // Choose a deterministic sign: orient penetration from A toward B
const auto centers = b.get_origin() - a.get_origin(); // (0.5, 0, 0) 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; float sign = (epa->normal.dot(centers) >= 0.0f) ? +1.0f : -1.0f;
constexpr float margin = 1.0f + 1e-3f; // tiny slack to avoid grazing 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 * sign;
// Apply once: B + pen must separate; the opposite must still collide // Apply once: B + pen must separate; the opposite must still collide
Mesh b_resolved = b; Mesh b_resolved = b;
@@ -132,8 +132,8 @@ TEST(UnitTestEpa, TestCollisionTrue2)
EXPECT_TRUE(GJK::is_collide(A, Collider(b_wrong))) << "Opposite direction should still intersect"; EXPECT_TRUE(GJK::is_collide(A, Collider(b_wrong))) << "Opposite direction should still intersect";
// Some book-keeping sanity // Some book-keeping sanity
EXPECT_GT(epa.iterations, 0); EXPECT_GT(epa->iterations, 0);
EXPECT_LT(epa.iterations, params.max_iterations); EXPECT_LT(epa->iterations, params.max_iterations);
EXPECT_GE(epa.num_faces, 4); EXPECT_GE(epa->num_faces, 4);
EXPECT_GT(epa.num_vertices, 4); EXPECT_GT(epa->num_vertices, 4);
} }