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
80c4389d
Verified
Commit
80c4389d
authored
6 years ago
by
Justin Carpentier
Committed by
Justin Carpentier
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[Model/Geometry] Small indent cleaning
parent
284743ef
No related branches found
Branches containing commit
No related tags found
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
+4
-5
4 additions, 5 deletions
src/multibody/geometry.hpp
src/multibody/geometry.hxx
+13
-13
13 additions, 13 deletions
src/multibody/geometry.hxx
with
17 additions
and
18 deletions
src/multibody/geometry.hpp
+
4
−
5
View file @
80c4389d
...
...
@@ -31,7 +31,6 @@
#include
<utility>
#include
<assert.h>
namespace
se3
{
...
...
@@ -58,9 +57,9 @@ namespace se3
CollisionPairVector
collisionPairs
;
GeometryModel
()
:
ngeoms
(
0
)
,
geometryObjects
()
,
collisionPairs
()
:
ngeoms
(
0
)
,
geometryObjects
()
,
collisionPairs
()
{
const
std
::
size_t
num_max_collision_pairs
=
(
ngeoms
*
(
ngeoms
-
1
))
/
2
;
collisionPairs
.
reserve
(
num_max_collision_pairs
);
...
...
@@ -281,7 +280,7 @@ namespace se3
/// manner.
/// \param[in] pairId the index of the pair in GeomModel::collisionPairs vector.
/// \param[in] flag value of the activation boolean (true by default).
void
activateCollisionPair
(
const
PairIndex
pairId
,
const
bool
flag
=
true
);
void
activateCollisionPair
(
const
PairIndex
pairId
,
const
bool
flag
=
true
);
/// Deactivate a collision pair.
///
...
...
This diff is collapsed.
Click to expand it.
src/multibody/geometry.hxx
+
13
−
13
View file @
80c4389d
...
...
@@ -28,23 +28,23 @@
namespace
se3
{
inline
GeometryData
::
GeometryData
(
const
GeometryModel
&
modelGeom
)
:
oMg
(
modelGeom
.
ngeoms
)
:
oMg
(
modelGeom
.
ngeoms
)
#ifdef WITH_HPP_FCL
,
activeCollisionPairs
(
modelGeom
.
collisionPairs
.
size
(),
true
)
,
distanceRequest
(
true
,
0
,
0
,
fcl
::
GST_INDEP
)
,
distanceResults
(
modelGeom
.
collisionPairs
.
size
())
,
collisionRequest
(
1
,
false
,
false
,
1
,
false
,
true
,
fcl
::
GST_INDEP
)
,
collisionResults
(
modelGeom
.
collisionPairs
.
size
())
,
radius
()
,
collisionPairIndex
(
0
)
,
innerObjects
()
,
outerObjects
()
,
activeCollisionPairs
(
modelGeom
.
collisionPairs
.
size
(),
true
)
,
distanceRequest
(
true
,
0
,
0
,
fcl
::
GST_INDEP
)
,
distanceResults
(
modelGeom
.
collisionPairs
.
size
())
,
collisionRequest
(
1
,
false
,
false
,
1
,
false
,
true
,
fcl
::
GST_INDEP
)
,
collisionResults
(
modelGeom
.
collisionPairs
.
size
())
,
radius
()
,
collisionPairIndex
(
0
)
,
innerObjects
()
,
outerObjects
()
{
collisionObjects
.
reserve
(
modelGeom
.
geometryObjects
.
size
());
BOOST_FOREACH
(
const
GeometryObject
&
geom
,
modelGeom
.
geometryObjects
)
{
collisionObjects
.
push_back
(
fcl
::
CollisionObject
(
geom
.
fcl
));
}
{
collisionObjects
.
push_back
(
fcl
::
CollisionObject
(
geom
.
fcl
));
}
fillInnerOuterObjectMaps
(
modelGeom
);
}
#else
...
...
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