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
c12e0202
Commit
c12e0202
authored
9 years ago
by
jcarpent
Browse files
Options
Downloads
Patches
Plain Diff
[C++] Add constness + rename isCollisionPair into existCollisionPair
parent
be4e66b1
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
+11
-10
11 additions, 10 deletions
src/multibody/geometry.hpp
src/multibody/geometry.hxx
+10
-10
10 additions, 10 deletions
src/multibody/geometry.hxx
with
21 additions
and
20 deletions
src/multibody/geometry.hpp
+
11
−
10
View file @
c12e0202
//
// Copyright (c) 2015 CNRS
// Copyright (c) 2015
-2016
CNRS
//
// This file is part of Pinocchio
// Pinocchio is free software: you can redistribute it
...
...
@@ -59,8 +59,8 @@ namespace se3
{
typedef
Model
::
Index
Index
;
DistanceResult
(
fcl
::
DistanceResult
dist_fcl
,
Index
o1
,
Index
o2
)
:
fcl_distance_result
(
dist_fcl
),
object1
(
o1
),
object2
(
o2
)
DistanceResult
(
fcl
::
DistanceResult
dist_fcl
,
const
Index
c
o1
,
const
Index
c
o2
)
:
fcl_distance_result
(
dist_fcl
),
object1
(
c
o1
),
object2
(
c
o2
)
{}
// Get distance between objects
...
...
@@ -162,19 +162,20 @@ namespace se3
~
GeometryData
()
{};
void
addCollisionPair
(
Index
co1
,
Index
co2
);
void
addCollisionPair
(
const
CollisionPair_t
&
pair
);
void
removeCollisionPair
(
Index
co1
,
Index
co2
);
void
addCollisionPair
(
const
Index
co1
,
const
Index
co2
);
void
addCollisionPair
(
const
CollisionPair_t
&
pair
);
void
removeCollisionPair
(
const
Index
co1
,
const
Index
co2
);
void
removeCollisionPair
(
const
CollisionPair_t
&
pair
);
bool
isCollisionPair
(
Index
co1
,
Index
co2
)
const
;
bool
isCollisionPair
(
const
CollisionPair_t
&
pair
)
const
;
bool
ex
is
t
CollisionPair
(
const
Index
co1
,
const
Index
co2
)
const
;
bool
ex
is
t
CollisionPair
(
const
CollisionPair_t
&
pair
)
const
;
void
fillAllPairsAsCollisions
();
void
desactivateCollisionPairs
();
void
initializeListOfCollisionPairs
();
bool
collide
(
Index
co1
,
Index
co2
)
const
;
bool
collide
(
const
Index
co1
,
const
Index
co2
)
const
;
fcl
::
DistanceResult
computeDistance
(
Index
co1
,
Index
co2
)
const
;
fcl
::
DistanceResult
computeDistance
(
const
Index
co1
,
const
Index
co2
)
const
;
void
resetDistances
();
std
::
vector
<
DistanceResult
>
distanceResults
();
//TODO : to keep or not depending of public or not for distances
...
...
This diff is collapsed.
Click to expand it.
src/multibody/geometry.hxx
+
10
−
10
View file @
c12e0202
//
// Copyright (c) 2015 CNRS
// Copyright (c) 2015
-2016
CNRS
//
// This file is part of Pinocchio
// Pinocchio is free software: you can redistribute it
...
...
@@ -114,7 +114,7 @@ namespace se3
return
os
;
}
inline
void
GeometryData
::
addCollisionPair
(
Index
co1
,
Index
co2
)
inline
void
GeometryData
::
addCollisionPair
(
const
Index
co1
,
const
Index
co2
)
{
assert
(
co1
<
co2
);
assert
(
co2
<
model_geom
.
ngeom
);
...
...
@@ -131,11 +131,11 @@ namespace se3
nCollisionPairs
++
;
}
inline
void
GeometryData
::
removeCollisionPair
(
Index
co1
,
Index
co2
)
inline
void
GeometryData
::
removeCollisionPair
(
const
Index
co1
,
const
Index
co2
)
{
assert
(
co1
<
co2
);
assert
(
co2
<
model_geom
.
ngeom
);
assert
(
isCollisionPair
(
co1
,
co2
));
assert
(
ex
is
t
CollisionPair
(
co1
,
co2
));
removeCollisionPair
(
CollisionPair_t
(
co1
,
co2
));
}
...
...
@@ -144,18 +144,18 @@ namespace se3
{
assert
(
pair
.
first
<
pair
.
second
);
assert
(
pair
.
second
<
model_geom
.
ngeom
);
assert
(
isCollisionPair
(
pair
));
assert
(
ex
is
t
CollisionPair
(
pair
));
collision_pairs
.
erase
(
std
::
remove
(
collision_pairs
.
begin
(),
collision_pairs
.
end
(),
pair
),
collision_pairs
.
end
());
nCollisionPairs
--
;
}
inline
bool
GeometryData
::
isCollisionPair
(
Index
co1
,
Index
co2
)
const
inline
bool
GeometryData
::
ex
is
t
CollisionPair
(
const
Index
co1
,
const
Index
co2
)
const
{
return
isCollisionPair
(
CollisionPair_t
(
co1
,
co2
));
return
ex
is
t
CollisionPair
(
CollisionPair_t
(
co1
,
co2
));
}
inline
bool
GeometryData
::
isCollisionPair
(
const
CollisionPair_t
&
pair
)
const
inline
bool
GeometryData
::
ex
is
t
CollisionPair
(
const
CollisionPair_t
&
pair
)
const
{
return
(
std
::
find_if
(
collision_pairs
.
begin
(),
collision_pairs
.
end
(),
IsSameCollisionPair
(
pair
))
!=
collision_pairs
.
end
());
...
...
@@ -187,7 +187,7 @@ namespace se3
assert
(
nCollisionPairs
==
collision_pairs
.
size
());
}
inline
bool
GeometryData
::
collide
(
Index
co1
,
Index
co2
)
const
inline
bool
GeometryData
::
collide
(
const
Index
co1
,
const
Index
co2
)
const
{
fcl
::
CollisionRequest
collisionRequest
(
1
,
false
,
false
,
1
,
false
,
true
,
fcl
::
GST_INDEP
);
fcl
::
CollisionResult
collisionResult
;
...
...
@@ -202,7 +202,7 @@ namespace se3
}
inline
fcl
::
DistanceResult
GeometryData
::
computeDistance
(
Index
co1
,
Index
co2
)
const
inline
fcl
::
DistanceResult
GeometryData
::
computeDistance
(
const
Index
co1
,
const
Index
co2
)
const
{
fcl
::
DistanceRequest
distanceRequest
(
true
,
0
,
0
,
fcl
::
GST_INDEP
);
fcl
::
DistanceResult
result
;
...
...
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