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
b90271a7
Commit
b90271a7
authored
6 years ago
by
Nicolas Mansard
Committed by
Nicolas Mansard
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[parser] Marked the se3::humanoidSimple and se3::humanoid2 as deprecated.
parent
7b13d81b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/parsers/sample-models.cpp
+2
-2
2 additions, 2 deletions
src/parsers/sample-models.cpp
src/parsers/sample-models.hpp
+25
-5
25 additions, 5 deletions
src/parsers/sample-models.hpp
with
27 additions
and
7 deletions
src/parsers/sample-models.cpp
+
2
−
2
View file @
b90271a7
...
...
@@ -84,7 +84,7 @@ namespace se3
}
void
humanoid
Simple
(
Model
&
model
,
bool
usingFF
)
void
humanoid
Random
(
Model
&
model
,
bool
usingFF
)
{
// root
if
(
!
usingFF
)
...
...
@@ -140,7 +140,7 @@ namespace se3
static
void
addManipulator
(
Model
&
model
,
Model
::
JointIndex
rootJoint
=
0
,
const
SE3
&
Mroot
=
SE3
::
Identity
(),
const
std
::
string
pre
=
""
)
const
std
::
string
&
pre
=
""
)
{
typedef
typename
JointModelRX
::
ConfigVector_t
CV
;
typedef
typename
JointModelRX
::
TangentVector_t
TV
;
...
...
This diff is collapsed.
Click to expand it.
src/parsers/sample-models.hpp
+
25
−
5
View file @
b90271a7
...
...
@@ -25,11 +25,7 @@
namespace
se3
{
namespace
buildModels
{
void
humanoid2d
(
Model
&
model
);
void
humanoidSimple
(
Model
&
model
,
bool
usingFF
=
true
);
{
/** \brief Create a 6-DOF kinematic chain shoulder-elbow-wrist.
*
* \param model: model, typically given empty, where the kinematic chain is added.
...
...
@@ -62,7 +58,31 @@ namespace se3
* not using after humanoid(model).
*/
void
humanoidGeometries
(
const
Model
&
model
,
GeometryModel
&
geom
);
/** \brief Create a humanoid kinematic tree with 6D limbs and random joint placement.
*
* This method is only meant to be used in unittest. Due to random placement and masses,
* the resulting model is likely to not correspond to any physically-plausible model.
* You may want to consider se3::humanoid and se3::humanoidGeometries functions that
* rather define a plain and non-random model.
* \param model: model, typically given empty, where the kinematic chain is added.
* \param usingFF: if True, implement the chain with a plain JointModelFreeFloating; if False,
* uses a composite joint. This changes the size of the configuration space (35 vs 34).
*/
void
humanoidRandom
(
Model
&
model
,
bool
usingFF
=
true
);
/** \brief Create a random humanoid tree with 2d limbs.
* \ deprecated This function has been replaced by the non-random se3::humanoid function.
*/
PINOCCHIO_DEPRECATED
void
humanoid2d
(
Model
&
model
);
/** \brief Alias of humanoidRandom, for compatibility reasons.
* \deprecated use se3::humanoid or se3::humanoidRandom instead.
*/
PINOCCHIO_DEPRECATED
inline
void
humanoidSimple
(
Model
&
model
,
bool
usingFF
=
true
)
{
humanoidRandom
(
model
,
usingFF
);
}
}
// namespace buildModels
}
// namespace se3
...
...
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