Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
pinocchio
Commits
b08ed9ef
Commit
b08ed9ef
authored
Jan 10, 2018
by
jcarpent
Browse files
[Joint] Return the right type
parent
8ed8a4cb
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/multibody/joint/joint-prismatic.hpp
View file @
b08ed9ef
//
// Copyright (c) 2015-201
7
CNRS
// Copyright (c) 2015-201
8
CNRS
// Copyright (c) 2015-2016 Wandercraft, 86 rue de Paris 91400 Orsay, France.
//
// This file is part of Pinocchio
...
...
@@ -322,7 +322,7 @@ namespace se3
/* [ABA] operator* (Inertia Y,Constraint S) */
template
<
int
axis
>
inline
const
Eigen
::
MatrixBase
<
const
Inertia
::
Matrix6
>
::
ColXpr
inline
const
Inertia
::
Matrix6
::
Const
ColXpr
operator
*
(
const
Inertia
::
Matrix6
&
Y
,
const
ConstraintPrismatic
<
axis
>
&
)
{
return
Y
.
col
(
Inertia
::
LINEAR
+
axis
);
...
...
src/multibody/joint/joint-revolute.hpp
View file @
b08ed9ef
//
// Copyright (c) 2015-201
6
CNRS
// Copyright (c) 2015-201
8
CNRS
// Copyright (c) 2015-2016 Wandercraft, 86 rue de Paris 91400 Orsay, France.
//
// This file is part of Pinocchio
...
...
@@ -362,14 +362,14 @@ namespace se3
/* [ABA] I*S operator (Inertia Y,Constraint S) */
template
<
int
axis
>
inline
const
Eigen
::
MatrixBase
<
const
Inertia
::
Matrix6
>
::
ColXpr
inline
const
Inertia
::
Matrix6
::
Const
ColXpr
operator
*
(
const
Inertia
::
Matrix6
&
Y
,
const
ConstraintRevolute
<
axis
>
&
)
{
return
Y
.
col
(
Inertia
::
ANGULAR
+
axis
);
}
template
<
int
axis
>
inline
Eigen
::
MatrixBase
<
Inertia
::
Matrix6
>
::
ColXpr
inline
Inertia
::
Matrix6
::
ColXpr
operator
*
(
Inertia
::
Matrix6
&
Y
,
const
ConstraintRevolute
<
axis
>
&
)
{
return
Y
.
col
(
Inertia
::
ANGULAR
+
axis
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment