Catcrafts/Crafter.Math
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ray fix

Browse source
This commit is contained in:
Jorijn van der Graaf 2026-02-11 03:26:59 +01:00
commit 4a254a3a66
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
interfaces/Crafter.Math-Ray.cppm
View file

@ -24,36 +24,32 @@ import std;
namespace Crafter { namespace Crafter {
export template<typename T> export template<typename T>
constexpr T IntersectionTestRayTriangle(Vector<T, 3, 0> vert0, Vector<T, 3, 0> vert1, Vector<T, 3, 0> vert2, Vector<T, 3, 0> rayOrigin, Vector<T, 3, 0> rayDir) { constexpr T IntersectionTestRayTriangle(Vector<T, 3, 0> vert0, Vector<T, 3, 0> vert1, Vector<T, 3, 0> vert2, Vector<T, 3, 0> rayOrigin, Vector<T, 3, 0> rayDir) {
constexpr float EPSILON = 0.0000001; constexpr T EPSILON = 0.0000001;
Vector<T, 3, 0> edge1 = vert1 - vert0; Vector<T, 3, 0> edge1 = vert1 - vert0;
Vector<T, 3, 0> edge2 = vert2 - vert0; Vector<T, 3, 0> edge2 = vert2 - vert0;
Vector<T, 3, 0> h = Vector<T, 3, 0>::Cross(rayDir, edge2); Vector<T, 3, 0> h = Vector<T, 3, 0>::Cross(rayDir, edge2);
float determinant = Vector<T, 3, 0>::Dot(edge1, h); T determinant = Vector<T, 3, 0>::Dot(edge1, h);
if(determinant < 0) { if (determinant <= EPSILON) {
return std::numeric_limits<float>::max(); return std::numeric_limits<T>::max();
} }
if (determinant > -EPSILON && determinant < EPSILON) { T inverse_determinant = T(1) / determinant;
return std::numeric_limits<float>::max();
}
float inverse_determinant = 1.0 / determinant;
Vector<T, 3, 0> origins_diff_vector = rayOrigin - vert0; Vector<T, 3, 0> origins_diff_vector = rayOrigin - vert0;
float u = Vector<T, 3, 0>::Dot(origins_diff_vector, h) * inverse_determinant; T u = Vector<T, 3, 0>::Dot(origins_diff_vector, h) * inverse_determinant;
if (u < 0.0 || u > 1.0) if (u < 0.0 || u > 1.0)
{ {
return false; return std::numeric_limits<T>::max();
} }
Vector<T, 3, 0> q = Vector<T, 3, 0>::Cross(origins_diff_vector, edge1); Vector<T, 3, 0> q = Vector<T, 3, 0>::Cross(origins_diff_vector, edge1);
float v = inverse_determinant * Vector<T, 3, 0>::Dot(rayDir, q); T v = inverse_determinant * Vector<T, 3, 0>::Dot(rayDir, q);
if (v < 0.0 || u + v > 1.0) { if (v < 0.0 || u + v > 1.0) {
return std::numeric_limits<float>::max(); return std::numeric_limits<T>::max();
} }
return inverse_determinant * Vector<T, 3, 0>::Dot(edge2, q); return inverse_determinant * Vector<T, 3, 0>::Dot(edge2, q);