Verified Commit 3a574ad3 authored by Justin Carpentier's avatar Justin Carpentier
Browse files

collision: sphere/sphere fix distance lower bound value

parent 018425e9
Pipeline #14896 passed with stage
in 27 minutes and 31 seconds
...@@ -121,7 +121,7 @@ namespace fcl { ...@@ -121,7 +121,7 @@ namespace fcl {
unit = c1c2/dist; unit = c1c2/dist;
// Unlike in distance computation, we consider the security margin. // Unlike in distance computation, we consider the security margin.
FCL_REAL penetrationDepth = r1 + r2 + margin - dist; FCL_REAL penetrationDepth = r1 + r2 + margin - dist;
result.updateDistanceLowerBound (-penetrationDepth); result.updateDistanceLowerBound (-penetrationDepth+margin);
bool collision = (penetrationDepth >= 0); bool collision = (penetrationDepth >= 0);
if (collision) { if (collision) {
// Take contact point at the middle of intersection between each sphere // Take contact point at the middle of intersection between each sphere
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment