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
f1d69cd6
Verified
Commit
f1d69cd6
authored
5 years ago
by
Justin Carpentier
Browse files
Options
Downloads
Patches
Plain Diff
geometry: remove deprecated methods
parent
b1bc6cdd
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
+0
-45
0 additions, 45 deletions
src/multibody/geometry.hpp
src/multibody/geometry.hxx
+0
-13
0 additions, 13 deletions
src/multibody/geometry.hxx
with
0 additions
and
58 deletions
src/multibody/geometry.hpp
+
0
−
45
View file @
f1d69cd6
...
...
@@ -54,29 +54,6 @@ namespace pinocchio
}
~
GeometryModel
()
{};
/**
* @brief Add a geometry object to a GeometryModel
* @deprecated This method has been set to deprecated. Please use other signature of addGeometryObject.
*
* @param[in] object Object
* @param[in] model Corresponding model, used to assert the attributes of object.
* @param[in] autofillJointParent if true, set jointParent from frameParent.
*
* @return The index of the new added GeometryObject in geometryObjects
* @note object is a nonconst copy to ease the insertion code.
*/
template
<
typename
S2
,
int
O2
,
template
<
typename
,
int
>
class
_JointCollectionTpl
>
PINOCCHIO_DEPRECATED
GeomIndex
addGeometryObject
(
GeometryObject
object
,
const
ModelTpl
<
S2
,
O2
,
_JointCollectionTpl
>
&
model
,
const
bool
autofillJointParent
)
{
if
(
autofillJointParent
)
return
addGeometryObject
(
object
,
model
);
else
return
addGeometryObject
(
object
);
}
/**
* @brief Add a geometry object to a GeometryModel and set its parent joint.
...
...
@@ -119,16 +96,6 @@ namespace pinocchio
*/
bool
existGeometryName
(
const
std
::
string
&
name
)
const
;
/**
* @brief Get the name of a GeometryObject given by its index.
*
* @param[in] index Index of the GeometryObject
*
* @return Name of the GeometryObject
*/
PINOCCHIO_DEPRECATED
const
std
::
string
&
getGeometryName
(
const
GeomIndex
index
)
const
;
#ifdef PINOCCHIO_WITH_HPP_FCL
///
/// \brief Add a collision pair into the vector of collision_pairs.
...
...
@@ -277,18 +244,6 @@ namespace pinocchio
/// \warning Outer objects are not duplicated (i.e. if a is in outerObjects[b], then
/// b is not in outerObjects[a]).
void
fillInnerOuterObjectMaps
(
const
GeometryModel
&
geomModel
);
/// Activate a collision pair, for which collisions and distances would now be computed.
///
/// A collision (resp distance) between to geometries of GeomModel::geometryObjects
/// is computed *iff* the corresponding pair has been added in GeomModel::collisionPairs *AND*
/// it is active, i.e. the corresponding boolean in GeomData::activePairs is true. The second
/// condition can be used to temporarily remove a pair without touching the model, in a versatile
/// manner.
/// \param[in] pairId the index of the pair in GeomModel::collisionPairs vector.
/// \param[in] flag value of the activation boolean (true by default).
PINOCCHIO_DEPRECATED
void
activateCollisionPair
(
const
PairIndex
pairId
,
const
bool
flag
);
///
/// Activate a collision pair, for which collisions and distances would now be computed.
...
...
This diff is collapsed.
Click to expand it.
src/multibody/geometry.hxx
+
0
−
13
View file @
f1d69cd6
...
...
@@ -80,13 +80,6 @@ namespace pinocchio
}
inline
const
std
::
string
&
GeometryModel
::
getGeometryName
(
const
GeomIndex
index
)
const
{
assert
(
index
<
(
GeomIndex
)
geometryObjects
.
size
()
);
return
geometryObjects
[
index
].
name
;
}
//
// @brief Associate a GeometryObject of type COLLISION to a joint's inner objects list
//
...
...
@@ -214,12 +207,6 @@ namespace pinocchio
return
(
PairIndex
)
std
::
distance
(
collisionPairs
.
begin
(),
it
);
}
inline
void
GeometryData
::
activateCollisionPair
(
const
PairIndex
pairId
,
const
bool
flag
)
{
assert
(
pairId
<
activeCollisionPairs
.
size
()
);
activeCollisionPairs
[
pairId
]
=
flag
;
}
inline
void
GeometryData
::
activateCollisionPair
(
const
PairIndex
pairId
)
{
...
...
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