Skip to content
Snippets Groups Projects
Commit 2915f860 authored by jcarpent's avatar jcarpent
Browse files

[C++] Change the way to find a CollisionPair

parent 8ea45036
Branches
Tags
No related merge requests found
......@@ -39,20 +39,6 @@
namespace se3
{
class IsSameCollisionPair
{
typedef Model::Index Index;
typedef std::pair < Index, Index > CollisionPair_t;
public:
IsSameCollisionPair( CollisionPair_t pair): _pair(pair) {}
bool operator()(CollisionPair_t pair) const
{
return (pair == _pair);
}
private:
CollisionPair_t _pair;
};
// Result of distance computation between two CollisionObject.
struct DistanceResult
......
......@@ -157,9 +157,10 @@ namespace se3
inline bool GeometryData::existCollisionPair (const CollisionPair_t & pair) const
{
return (std::find_if ( collision_pairs.begin(), collision_pairs.end(),
IsSameCollisionPair(pair)) != collision_pairs.end());
return (std::find(collision_pairs.begin(), collision_pairs.end(), pair)
!= collision_pairs.end());
}
inline GeometryData::Index GeometryData::findCollisionPair (const Index co1, const Index co2) const
{
return findCollisionPair(CollisionPair_t(co1,co2));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment