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
e4530499
Verified
Commit
e4530499
authored
4 years ago
by
Gabriele Buondonno
Committed by
Justin Carpentier
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[multibody] Change return type of addJointFrame and addBodyFrame to FrameIndex
parent
10205b21
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/model.hpp
+8
-8
8 additions, 8 deletions
src/multibody/model.hpp
src/multibody/model.hxx
+4
-2
4 additions, 2 deletions
src/multibody/model.hxx
with
12 additions
and
10 deletions
src/multibody/model.hpp
+
8
−
8
View file @
e4530499
...
...
@@ -398,10 +398,10 @@ namespace pinocchio
/// \param[in] frameIndex Index of the parent frame. If negative,
/// the parent frame is the frame of the parent joint.
///
/// \return The index of the new frame
or -1 in case of error.
/// \return The index of the new frame
///
int
addJointFrame
(
const
JointIndex
&
joint_index
,
int
previous_frame_index
=
-
1
);
FrameIndex
addJointFrame
(
const
JointIndex
&
joint_index
,
int
previous_frame_index
=
-
1
);
///
/// \brief Append a body to a given joint of the kinematic tree.
...
...
@@ -424,12 +424,12 @@ namespace pinocchio
/// \param[in] previousFrame Index of the parent frame. If negative,
/// the parent frame is the frame of the parent joint.
///
/// \return The index of the new frame
or -1 in case of error.
/// \return The index of the new frame
///
int
addBodyFrame
(
const
std
::
string
&
body_name
,
const
JointIndex
&
parentJoint
,
const
SE3
&
body_placement
=
SE3
::
Identity
(),
int
previousFrame
=
-
1
);
FrameIndex
addBodyFrame
(
const
std
::
string
&
body_name
,
const
JointIndex
&
parentJoint
,
const
SE3
&
body_placement
=
SE3
::
Identity
(),
int
previousFrame
=
-
1
);
///
/// \brief Return the index of a body given by its name.
...
...
This diff is collapsed.
Click to expand it.
src/multibody/model.hxx
+
4
−
2
View file @
e4530499
...
...
@@ -146,7 +146,8 @@ namespace pinocchio
}
template
<
typename
Scalar
,
int
Options
,
template
<
typename
,
int
>
class
JointCollectionTpl
>
inline
int
ModelTpl
<
Scalar
,
Options
,
JointCollectionTpl
>::
inline
typename
ModelTpl
<
Scalar
,
Options
,
JointCollectionTpl
>::
FrameIndex
ModelTpl
<
Scalar
,
Options
,
JointCollectionTpl
>::
addJointFrame
(
const
JointIndex
&
joint_index
,
int
previous_frame_index
)
{
...
...
@@ -176,7 +177,8 @@ namespace pinocchio
}
template
<
typename
Scalar
,
int
Options
,
template
<
typename
,
int
>
class
JointCollectionTpl
>
inline
int
ModelTpl
<
Scalar
,
Options
,
JointCollectionTpl
>::
inline
typename
ModelTpl
<
Scalar
,
Options
,
JointCollectionTpl
>::
FrameIndex
ModelTpl
<
Scalar
,
Options
,
JointCollectionTpl
>::
addBodyFrame
(
const
std
::
string
&
body_name
,
const
JointIndex
&
parentJoint
,
const
SE3
&
body_placement
,
...
...
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