GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix picking to properly select closest triangle for meshes

Browse Source
This commit is contained in:
Wojciech Figat
2022-08-18 15:54:02 +02:00
parent 698545006f
commit b17070adf5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Graphics/Models/CollisionProxy.h
View File

@@ -57,6 +57,7 @@ public:
bool Intersects(const Ray& ray, const Matrix& world, Real& distance, Vector3& normal) const bool Intersects(const Ray& ray, const Matrix& world, Real& distance, Vector3& normal) const
{ {
distance = MAX_Real;
for (int32 i = 0; i < Triangles.Count(); i++) for (int32 i = 0; i < Triangles.Count(); i++)
{ {
CollisionTriangle triangle = Triangles[i]; CollisionTriangle triangle = Triangles[i];
@@ -66,18 +67,18 @@ public:
// TODO: use 32-bit precision for intersection // TODO: use 32-bit precision for intersection
Real d; Real d;
if (CollisionsHelper::RayIntersectsTriangle(ray, triangle.V0, triangle.V1, triangle.V2, d)) if (CollisionsHelper::RayIntersectsTriangle(ray, triangle.V0, triangle.V1, triangle.V2, d) && d < distance)
{ {
normal = Vector3::Normalize((triangle.V1 - triangle.V0) ^ (triangle.V2 - triangle.V0)); normal = Vector3::Normalize((triangle.V1 - triangle.V0) ^ (triangle.V2 - triangle.V0));
distance = d; distance = d;
return true;
} }
} }
return false; return distance < MAX_Real;
} }
bool Intersects(const Ray& ray, const Transform& transform, Real& distance, Vector3& normal) const bool Intersects(const Ray& ray, const Transform& transform, Real& distance, Vector3& normal) const
{ {
distance = MAX_Real;
for (int32 i = 0; i < Triangles.Count(); i++) for (int32 i = 0; i < Triangles.Count(); i++)
{ {
CollisionTriangle triangle = Triangles[i]; CollisionTriangle triangle = Triangles[i];
@@ -88,13 +89,12 @@ public:
// TODO: use 32-bit precision for intersection // TODO: use 32-bit precision for intersection
Real d; Real d;
if (CollisionsHelper::RayIntersectsTriangle(ray, v0, v1, v2, d)) if (CollisionsHelper::RayIntersectsTriangle(ray, v0, v1, v2, d) && d < distance)
{ {
normal = Vector3::Normalize((v1 - v0) ^ (v2 - v0)); normal = Vector3::Normalize((v1 - v0) ^ (v2 - v0));
distance = d; distance = d;
return true;
} }
} }
return false; return distance < MAX_Real;
} }
}; };