Skip to content

Commit

Permalink
Merge pull request #123 from sherm1/fix-issue-117
Browse files Browse the repository at this point in the history
continuousCollisionNaive() wasn't resetting the returned result when no collision.
  • Loading branch information
sherm1 committed Apr 10, 2016
2 parents 45809e9 + 3fb8423 commit 90d0124
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/continuous_collision.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ FCL_REAL continuousCollideNaive(const CollisionGeometry* o1, const MotionBase* m
}
}

return 1.0;
result.is_collide = false;
result.time_of_contact = FCL_REAL(1);
return result.time_of_contact;
}

namespace details
Expand Down

0 comments on commit 90d0124

Please sign in to comment.