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
Guilhem Saurel
pinocchio
Commits
9627d147
Commit
9627d147
authored
Sep 20, 2016
by
jcarpent
Browse files
[Joint] Fix alignment issue for the JointComposite
parent
81ce16e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/multibody/constraint.hpp
View file @
9627d147
...
...
@@ -102,6 +102,7 @@ namespace se3
class
ConstraintTpl
:
public
ConstraintBase
<
ConstraintTpl
<
_Dim
,
_Scalar
,
_Options
>
>
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
typedef
ConstraintBase
<
ConstraintTpl
<
_Dim
,
_Scalar
,
_Options
>
>
Base
;
...
...
src/multibody/joint/joint-composite.hpp
View file @
9627d147
...
...
@@ -21,6 +21,8 @@
#include "pinocchio/assert.hpp"
#include "pinocchio/multibody/joint/joint.hpp"
#include <Eigen/StdVector>
EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION
(
se3
::
SE3
)
EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION
(
se3
::
Motion
)
...
...
@@ -56,12 +58,16 @@ namespace se3
typedef
Eigen
::
Matrix
<
double
,
Eigen
::
Dynamic
,
1
>
ConfigVector_t
;
typedef
Eigen
::
Matrix
<
double
,
Eigen
::
Dynamic
,
1
>
TangentVector_t
;
};
template
<
>
struct
traits
<
JointDataComposite
>
{
typedef
JointComposite
JointDerived
;
};
template
<
>
struct
traits
<
JointModelComposite
>
{
typedef
JointComposite
JointDerived
;
};
struct
JointDataComposite
:
public
JointDataBase
<
JointDataComposite
>
{
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
typedef
JointComposite
Joint
;
typedef
std
::
vector
<
JointData
,
Eigen
::
aligned_allocator
<
JointData
>
>
JointDataVector
;
SE3_JOINT_TYPEDEF
;
JointDataVector
joints
;
...
...
@@ -99,9 +105,13 @@ namespace se3
struct
JointModelComposite
:
public
JointModelBase
<
JointModelComposite
>
{
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
typedef
JointComposite
Joint
;
SE3_JOINT_TYPEDEF
;
SE3_JOINT_USE_INDEXES
;
typedef
std
::
vector
<
JointModel
,
Eigen
::
aligned_allocator
<
JointModel
>
>
JointModelVector
;
using
JointModelBase
<
JointModelComposite
>::
id
;
using
JointModelBase
<
JointModelComposite
>::
setIndexes
;
...
...
Write
Preview
Markdown
is supported
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