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
1f9889ec
Commit
1f9889ec
authored
8 years ago
by
Nicolas Mansard
Committed by
Nicolas Mansard
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[C++] Geom: remove computeAllDistance and computeAllCollisions from GeomData.
Issue 281.8.
parent
70f4b363
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/multibody/geometry.hpp
+3
-17
3 additions, 17 deletions
src/multibody/geometry.hpp
src/multibody/geometry.hxx
+0
-20
0 additions, 20 deletions
src/multibody/geometry.hxx
with
3 additions
and
37 deletions
src/multibody/geometry.hpp
+
3
−
17
View file @
1f9889ec
...
...
@@ -289,13 +289,6 @@ namespace se3
///
bool
computeCollision
(
const
Index
&
pairId
);
///
/// \brief Compute the collision result of all the collision pairs according to
/// the current placements of the geometires stored in GeometryData::oMg.
/// The results are stored in the vector GeometryData::collision_results.
///
void
computeAllCollisions
();
///
/// \brief Check if at least one of the collision pairs has its two collision objects in collision.
/// The results are stored in the vector GeometryData::collision_results.
...
...
@@ -314,16 +307,9 @@ namespace se3
///
fcl
::
DistanceResult
&
computeDistance
(
const
Index
&
pairId
);
///
/// \brief Compute the distance result for all collision pairs according to
/// the current placements of the geometries stored in GeometryData::oMg.
///
/// The method indeed calls computeDistance for each collision
/// pair. Consequently the results are stored in the vector
/// GeometryData::distance_results.
///
void
computeAllDistances
()
PINOCCHIO_DEPRECATED
;
/// Reset the vector distance_results.
/// TODO: should this be called automatically before calling computeDistance?
/// TODO: should we implement the same for collisions?
void
resetDistances
();
/// Fill both innerObjects and outerObjects maps, from vectors collisionObjects and
...
...
This diff is collapsed.
Click to expand it.
src/multibody/geometry.hxx
+
0
−
20
View file @
1f9889ec
...
...
@@ -245,17 +245,6 @@ namespace se3
return
collisionResult
.
isCollision
();
}
inline
void
GeometryData
::
computeAllCollisions
()
{
assert
(
activeCollisionPairs
.
size
()
==
model_geom
.
collisionPairs
.
size
()
);
assert
(
collision_results
.
size
()
==
model_geom
.
collisionPairs
.
size
()
);
for
(
size_t
i
=
0
;
i
<
model_geom
.
collisionPairs
.
size
();
++
i
)
{
if
(
activeCollisionPairs
[
i
])
computeCollision
(
i
);
}
}
inline
bool
GeometryData
::
isColliding
()
{
Index
&
i
=
collisionPairIndex
;
...
...
@@ -282,15 +271,6 @@ namespace se3
return
distance_results
[
pairId
];
}
inline
void
GeometryData
::
computeAllDistances
()
{
assert
(
activeCollisionPairs
.
size
()
==
model_geom
.
collisionPairs
.
size
()
);
for
(
size_t
i
=
0
;
i
<
activeCollisionPairs
.
size
();
++
i
)
{
if
(
activeCollisionPairs
[
i
])
computeDistance
(
i
);
}
}
inline
void
GeometryData
::
resetDistances
()
{
std
::
fill
(
distance_results
.
begin
(),
distance_results
.
end
(),
fcl
::
DistanceResult
()
);
...
...
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