mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

This commit is contained in:
Бранимир Караџић 2019-02-09 21:48:11 -08:00
parent 567c7c097f
commit aee7e381e0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/common/bounds.cpp
View File

@ -1516,8 +1516,15 @@ bool overlap(const Cylinder& _cylinder, const Obb& _obb)
bool overlap(const Disk& _disk, const Vec3& _pos)
{
BX_UNUSED(_disk, _pos);
return false;
Plane plane;
calcPlane(plane, _disk.normal, _disk.center);
if (!nearZero(distance(plane, _pos) ) )
{
return false;
}
return distanceSq(_disk.center, _pos) <= square(_disk.radius);
}
bool overlap(const Disk& _disk, const Sphere& _sphere)
@ -1851,9 +1858,9 @@ bool overlap(const Triangle& _triangle, const Capsule& _capsule)
};
Hit hit;
if (!intersect(line, plane, &hit) )
if (intersect(line, plane, &hit) )
{
return false;
return true;
}
const Vec3 pos = closestPoint(plane, hit.pos);