mirror of
https://github.com/orange-cpp/omath.git
synced 2026-04-18 19:23:26 +00:00
Compare commits
2 Commits
0b52b2847b
...
33cd3f64e4
| Author | SHA1 | Date | |
|---|---|---|---|
| 33cd3f64e4 | |||
| 67a07eed45 |
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"permissions": {
|
||||
"allow": [
|
||||
"Bash(ls:*)"
|
||||
]
|
||||
}
|
||||
}
|
||||
10
.idea/editor.xml
generated
10
.idea/editor.xml
generated
@@ -17,7 +17,7 @@
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatTooManyArgs/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCStyleCast/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCVQualifierCanNotBeAppliedToReference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassCanBeFinal/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassCanBeFinal/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassIsIncomplete/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeedsConstructorBecauseOfUninitializedMember/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
@@ -103,14 +103,14 @@
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppImplicitDefaultConstructorNotAvailable/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIncompatiblePointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIncompleteSwitchStatement/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInconsistentNaming/@EntryIndexedValue" value="HINT" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInconsistentNaming/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIntegralToPointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInvalidLineContinuation/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppJoinDeclarationAndAssignment/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLambdaCaptureNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableMayBeConst/@EntryIndexedValue" value="HINT" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableMightNotBeInitialized/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableWithNonTrivialDtorIsNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableWithNonTrivialDtorIsNeverUsed/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLongFloat/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberFunctionMayBeConst/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberFunctionMayBeStatic/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||
@@ -202,7 +202,7 @@
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticDataMemberInUnnamedStruct/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticSpecifierOnAnonymousNamespaceMember/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStringLiteralToCharPointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTabsAreDisallowed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTabsAreDisallowed/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateArgumentsCanBeDeduced/@EntryIndexedValue" value="HINT" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateParameterNeverUsed/@EntryIndexedValue" value="HINT" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateParameterShadowing/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
@@ -216,7 +216,7 @@
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnmatchedPragmaEndRegionDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnmatchedPragmaRegionDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnamedNamespaceInHeaderFile/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnecessaryWhitespace/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnecessaryWhitespace/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnsignedZeroComparison/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnusedIncludeDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAlgorithmWithCount/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
//
|
||||
#pragma once
|
||||
|
||||
#include "omath/linear_algebra/aabb.hpp"
|
||||
#include "omath/linear_algebra/triangle.hpp"
|
||||
#include "omath/linear_algebra/vector3.hpp"
|
||||
|
||||
@@ -34,6 +35,7 @@ namespace omath::collision
|
||||
class LineTracer final
|
||||
{
|
||||
using TriangleType = Triangle<typename RayType::VectorType>;
|
||||
using AABBType = AABB<typename RayType::VectorType>;
|
||||
|
||||
public:
|
||||
LineTracer() = delete;
|
||||
@@ -87,6 +89,54 @@ namespace omath::collision
|
||||
return ray.start + ray_dir * t_hit;
|
||||
}
|
||||
|
||||
// Slab method ray-AABB intersection
|
||||
// Returns the hit point on the AABB surface, or ray.end if no intersection
|
||||
[[nodiscard]]
|
||||
constexpr static auto get_ray_hit_point(const RayType& ray, const AABBType& aabb) noexcept
|
||||
{
|
||||
using T = typename RayType::VectorType::ContainedType;
|
||||
const auto dir = ray.direction_vector();
|
||||
|
||||
auto t_min = -std::numeric_limits<T>::infinity();
|
||||
auto t_max = std::numeric_limits<T>::infinity();
|
||||
|
||||
const auto process_axis = [&](const T& d, const T& origin, const T& box_min,
|
||||
const T& box_max) -> bool
|
||||
{
|
||||
constexpr T k_epsilon = std::numeric_limits<T>::epsilon();
|
||||
if (std::abs(d) < k_epsilon)
|
||||
return origin >= box_min && origin <= box_max;
|
||||
|
||||
const T inv = T(1) / d;
|
||||
T t0 = (box_min - origin) * inv;
|
||||
T t1 = (box_max - origin) * inv;
|
||||
if (t0 > t1)
|
||||
std::swap(t0, t1);
|
||||
|
||||
t_min = std::max(t_min, t0);
|
||||
t_max = std::min(t_max, t1);
|
||||
return t_min <= t_max;
|
||||
};
|
||||
|
||||
if (!process_axis(dir.x, ray.start.x, aabb.min.x, aabb.max.x))
|
||||
return ray.end;
|
||||
if (!process_axis(dir.y, ray.start.y, aabb.min.y, aabb.max.y))
|
||||
return ray.end;
|
||||
if (!process_axis(dir.z, ray.start.z, aabb.min.z, aabb.max.z))
|
||||
return ray.end;
|
||||
|
||||
// t_hit: use entry point if in front of origin, otherwise 0 (started inside)
|
||||
const T t_hit = std::max(T(0), t_min);
|
||||
|
||||
if (t_max < T(0))
|
||||
return ray.end; // box entirely behind origin
|
||||
|
||||
if (!ray.infinite_length && t_hit > T(1))
|
||||
return ray.end; // box beyond ray endpoint
|
||||
|
||||
return ray.start + dir * t_hit;
|
||||
}
|
||||
|
||||
template<class MeshType>
|
||||
[[nodiscard]]
|
||||
constexpr static auto get_ray_hit_point(const RayType& ray, const MeshType& mesh) noexcept
|
||||
|
||||
33
include/omath/linear_algebra/aabb.hpp
Normal file
33
include/omath/linear_algebra/aabb.hpp
Normal file
@@ -0,0 +1,33 @@
|
||||
//
|
||||
// Created by Vlad on 3/25/2025.
|
||||
//
|
||||
#pragma once
|
||||
|
||||
#include "omath/linear_algebra/vector3.hpp"
|
||||
|
||||
namespace omath
|
||||
{
|
||||
template<class Vector = Vector3<float>>
|
||||
class AABB final
|
||||
{
|
||||
public:
|
||||
using VectorType = Vector;
|
||||
|
||||
VectorType min;
|
||||
VectorType max;
|
||||
|
||||
constexpr AABB(const VectorType& min, const VectorType& max) noexcept : min(min), max(max) {}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr VectorType center() const noexcept
|
||||
{
|
||||
return (min + max) / static_cast<typename VectorType::ContainedType>(2);
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr VectorType extents() const noexcept
|
||||
{
|
||||
return (max - min) / static_cast<typename VectorType::ContainedType>(2);
|
||||
}
|
||||
};
|
||||
} // namespace omath
|
||||
126
tests/general/unit_test_line_tracer_aabb.cpp
Normal file
126
tests/general/unit_test_line_tracer_aabb.cpp
Normal file
@@ -0,0 +1,126 @@
|
||||
//
|
||||
// Created by Vlad on 3/25/2025.
|
||||
//
|
||||
#include "omath/collision/line_tracer.hpp"
|
||||
#include "omath/linear_algebra/aabb.hpp"
|
||||
#include "omath/linear_algebra/vector3.hpp"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
using Vec3 = omath::Vector3<float>;
|
||||
using Ray = omath::collision::Ray<>;
|
||||
using LineTracer = omath::collision::LineTracer<>;
|
||||
using AABB = omath::AABB<Vec3>;
|
||||
|
||||
static Ray make_ray(Vec3 start, Vec3 end, bool infinite = false)
|
||||
{
|
||||
Ray r;
|
||||
r.start = start;
|
||||
r.end = end;
|
||||
r.infinite_length = infinite;
|
||||
return r;
|
||||
}
|
||||
|
||||
// Ray passing straight through the center along Z axis
|
||||
TEST(LineTracerAABBTests, HitCenterAlongZ)
|
||||
{
|
||||
const AABB box{{-1.f, -1.f, -1.f}, {1.f, 1.f, 1.f}};
|
||||
const auto ray = make_ray({0.f, 0.f, -5.f}, {0.f, 0.f, 5.f});
|
||||
|
||||
const auto hit = LineTracer::get_ray_hit_point(ray, box);
|
||||
EXPECT_NE(hit, ray.end);
|
||||
EXPECT_NEAR(hit.z, -1.f, 1e-4f);
|
||||
EXPECT_NEAR(hit.x, 0.f, 1e-4f);
|
||||
EXPECT_NEAR(hit.y, 0.f, 1e-4f);
|
||||
}
|
||||
|
||||
// Ray passing straight through the center along X axis
|
||||
TEST(LineTracerAABBTests, HitCenterAlongX)
|
||||
{
|
||||
const AABB box{{-1.f, -1.f, -1.f}, {1.f, 1.f, 1.f}};
|
||||
const auto ray = make_ray({-5.f, 0.f, 0.f}, {5.f, 0.f, 0.f});
|
||||
|
||||
const auto hit = LineTracer::get_ray_hit_point(ray, box);
|
||||
EXPECT_NE(hit, ray.end);
|
||||
EXPECT_NEAR(hit.x, -1.f, 1e-4f);
|
||||
}
|
||||
|
||||
// Ray that misses entirely (too far in Y)
|
||||
TEST(LineTracerAABBTests, MissReturnsEnd)
|
||||
{
|
||||
const AABB box{{-1.f, -1.f, -1.f}, {1.f, 1.f, 1.f}};
|
||||
const auto ray = make_ray({0.f, 5.f, -5.f}, {0.f, 5.f, 5.f});
|
||||
|
||||
const auto hit = LineTracer::get_ray_hit_point(ray, box);
|
||||
EXPECT_EQ(hit, ray.end);
|
||||
}
|
||||
|
||||
// Ray that stops short before reaching the box
|
||||
TEST(LineTracerAABBTests, RayTooShortReturnsEnd)
|
||||
{
|
||||
const AABB box{{3.f, -1.f, -1.f}, {5.f, 1.f, 1.f}};
|
||||
const auto ray = make_ray({0.f, 0.f, 0.f}, {2.f, 0.f, 0.f});
|
||||
|
||||
const auto hit = LineTracer::get_ray_hit_point(ray, box);
|
||||
EXPECT_EQ(hit, ray.end);
|
||||
}
|
||||
|
||||
// Infinite ray that starts before the box should hit
|
||||
TEST(LineTracerAABBTests, InfiniteRayHits)
|
||||
{
|
||||
const AABB box{{3.f, -1.f, -1.f}, {5.f, 1.f, 1.f}};
|
||||
const auto ray = make_ray({0.f, 0.f, 0.f}, {2.f, 0.f, 0.f}, true);
|
||||
|
||||
const auto hit = LineTracer::get_ray_hit_point(ray, box);
|
||||
EXPECT_NE(hit, ray.end);
|
||||
EXPECT_NEAR(hit.x, 3.f, 1e-4f);
|
||||
}
|
||||
|
||||
// Ray starting inside the box — t_min=0, so hit point equals ray.start
|
||||
TEST(LineTracerAABBTests, RayStartsInsideBox)
|
||||
{
|
||||
const AABB box{{-1.f, -1.f, -1.f}, {1.f, 1.f, 1.f}};
|
||||
const auto ray = make_ray({0.f, 0.f, 0.f}, {0.f, 0.f, 5.f});
|
||||
|
||||
const auto hit = LineTracer::get_ray_hit_point(ray, box);
|
||||
EXPECT_NE(hit, ray.end);
|
||||
// t_min is clamped to 0, so hit == start
|
||||
EXPECT_NEAR(hit.x, 0.f, 1e-4f);
|
||||
EXPECT_NEAR(hit.y, 0.f, 1e-4f);
|
||||
EXPECT_NEAR(hit.z, 0.f, 1e-4f);
|
||||
}
|
||||
|
||||
// Ray parallel to XY plane, pointing along X, at Z outside the box
|
||||
TEST(LineTracerAABBTests, ParallelRayOutsideSlabMisses)
|
||||
{
|
||||
const AABB box{{-1.f, -1.f, -1.f}, {1.f, 1.f, 1.f}};
|
||||
// Z component of ray is 3.0 — outside box's Z slab
|
||||
const auto ray = make_ray({-5.f, 0.f, 3.f}, {5.f, 0.f, 3.f});
|
||||
|
||||
const auto hit = LineTracer::get_ray_hit_point(ray, box);
|
||||
EXPECT_EQ(hit, ray.end);
|
||||
}
|
||||
|
||||
// Ray parallel to XY plane, pointing along X, at Z inside the box
|
||||
TEST(LineTracerAABBTests, ParallelRayInsideSlabHits)
|
||||
{
|
||||
const AABB box{{-1.f, -1.f, -1.f}, {1.f, 1.f, 1.f}};
|
||||
const auto ray = make_ray({-5.f, 0.f, 0.f}, {5.f, 0.f, 0.f});
|
||||
|
||||
const auto hit = LineTracer::get_ray_hit_point(ray, box);
|
||||
EXPECT_NE(hit, ray.end);
|
||||
EXPECT_NEAR(hit.x, -1.f, 1e-4f);
|
||||
}
|
||||
|
||||
// Diagonal ray hitting a corner region
|
||||
TEST(LineTracerAABBTests, DiagonalRayHits)
|
||||
{
|
||||
const AABB box{{0.f, 0.f, 0.f}, {2.f, 2.f, 2.f}};
|
||||
const auto ray = make_ray({-1.f, -1.f, -1.f}, {3.f, 3.f, 3.f});
|
||||
|
||||
const auto hit = LineTracer::get_ray_hit_point(ray, box);
|
||||
EXPECT_NE(hit, ray.end);
|
||||
// Entry point should be at (0,0,0)
|
||||
EXPECT_NEAR(hit.x, 0.f, 1e-4f);
|
||||
EXPECT_NEAR(hit.y, 0.f, 1e-4f);
|
||||
EXPECT_NEAR(hit.z, 0.f, 1e-4f);
|
||||
}
|
||||
Reference in New Issue
Block a user