Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pinocchio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stack Of Tasks
pinocchio
Commits
2915f860
Commit
2915f860
authored
9 years ago
by
jcarpent
Browse files
Options
Downloads
Patches
Plain Diff
[C++] Change the way to find a CollisionPair
parent
8ea45036
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/multibody/geometry.hpp
+0
-14
0 additions, 14 deletions
src/multibody/geometry.hpp
src/multibody/geometry.hxx
+4
-3
4 additions, 3 deletions
src/multibody/geometry.hxx
with
4 additions
and
17 deletions
src/multibody/geometry.hpp
+
0
−
14
View file @
2915f860
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/multibody/geometry.hxx
+
4
−
3
View file @
2915f860
...
...
@@ -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
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment