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-05 18:39:00 -08:00
parent 649033599b
commit 0fda843a7c
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
examples/common/bounds.cpp
View File

@ -1429,37 +1429,13 @@ bool overlap(const Capsule& _capsuleA, const Capsule& _capsuleB)
if (0.0f <= ta
&& 1.0f >= ta)
{
Sphere sphereB;
sphereB.radius = _capsuleB.radius;
if (0.0f >= tb)
{
sphereB.center = _capsuleB.pos;
}
else
{
sphereB.center = _capsuleB.end;
}
return overlap(_capsuleA, sphereB);
return overlap(_capsuleA, Sphere{0.0f >= tb ? _capsuleB.pos : _capsuleB.end, _capsuleB.radius});
}
if (0.0f <= tb
&& 1.0f >= tb)
{
Sphere sphereA;
sphereA.radius = _capsuleA.radius;
if (0.0f >= ta)
{
sphereA.center = _capsuleA.pos;
}
else
{
sphereA.center = _capsuleA.end;
}
return overlap(_capsuleB, sphereA);
return overlap(_capsuleB, Sphere{0.0f >= ta ? _capsuleA.pos : _capsuleA.end, _capsuleA.radius});
}
const Vec3 pa = 0.0f > ta ? _capsuleA.pos : _capsuleA.end;