OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fix crash if there are no surfaces in the mesh

Browse source
This commit is contained in:
Magnus Norddahl 2023-09-27 00:29:13 +02:00
commit 2d2fb5efaa
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/common/rendering/hwrenderer/data/hw_collision.cpp
View file

@ -55,28 +55,38 @@ TriangleMeshShape::TriangleMeshShape(const FVector3 *vertices, int num_vertices,
float TriangleMeshShape::sweep(TriangleMeshShape *shape1, SphereShape *shape2, const FVector3 &target)
{
if (shape1->root == -1)
return 1.0f;
return sweep(shape1, shape2, shape1->root, target);
}
bool TriangleMeshShape::find_any_hit(TriangleMeshShape *shape1, TriangleMeshShape *shape2)
{
if (shape1->root == -1)
return false;
return find_any_hit(shape1, shape2, shape1->root, shape2->root);
}
bool TriangleMeshShape::find_any_hit(TriangleMeshShape *shape1, SphereShape *shape2)
{
if (shape1->root == -1)
return false;
return find_any_hit(shape1, shape2, shape1->root);
}
std::vector<int> TriangleMeshShape::find_all_hits(TriangleMeshShape* shape1, SphereShape* shape2)
{
std::vector<int> hits;
find_all_hits(shape1, shape2, shape1->root, hits);
if (shape1->root != -1)
find_all_hits(shape1, shape2, shape1->root, hits);
return hits;
}
bool TriangleMeshShape::find_any_hit(TriangleMeshShape *shape, const FVector3 &ray_start, const FVector3 &ray_end)
{
if (shape->root == -1)
return false;
return find_any_hit(shape, RayBBox(ray_start, ray_end), shape->root);
}
@ -84,6 +94,9 @@ TraceHit TriangleMeshShape::find_first_hit(TriangleMeshShape *shape, const FVect
{
TraceHit hit;
if (shape->root == -1)
return hit;
// Perform segmented tracing to keep the ray AABB box smaller
FVector3 ray_dir = ray_end - ray_start;