Skip to content
Snippets Groups Projects
Commit e596e6dc authored by Rohan Budhiraja's avatar Rohan Budhiraja Committed by mnaveau
Browse files

Deal with pinocchio API changes

parent 4120d4b1
No related branches found
No related tags found
No related merge requests found
...@@ -8,8 +8,8 @@ class Joint_shortname : public boost::static_visitor<std::string> ...@@ -8,8 +8,8 @@ class Joint_shortname : public boost::static_visitor<std::string>
{ {
public: public:
template<typename D> template<typename D>
std::string operator()(const se3::JointModelBase<D> & ) const std::string operator()(const se3::JointModelBase<D> & jmodel) const
{ return D::shortname(); } { return jmodel.shortname(); }
static std::string run( const se3::JointModelVariant & jmodel) static std::string run( const se3::JointModelVariant & jmodel)
{ return boost::apply_visitor( Joint_shortname(), jmodel ); } { return boost::apply_visitor( Joint_shortname(), jmodel ); }
...@@ -144,12 +144,12 @@ bool PinocchioRobot::initializeRobotModelAndData(se3::Model * robotModel, ...@@ -144,12 +144,12 @@ bool PinocchioRobot::initializeRobotModelAndData(se3::Model * robotModel,
m_robotModel = robotModel; m_robotModel = robotModel;
// initialize the short cut for the joint ids // initialize the short cut for the joint ids
m_chest = m_robotModel->getBodyId("torso"); m_chest = m_robotModel->getFrameParent("torso");
m_waist = m_robotModel->getBodyId("BODY"); m_waist = m_robotModel->getFrameParent("BODY");
m_leftFoot.associatedAnkle = m_robotModel->getBodyId("l_ankle"); m_leftFoot.associatedAnkle = m_robotModel->getFrameParent("l_ankle");
m_rightFoot.associatedAnkle = m_robotModel->getBodyId("r_ankle"); m_rightFoot.associatedAnkle = m_robotModel->getFrameParent("r_ankle");
m_leftWrist = m_robotModel->getBodyId("l_wrist"); m_leftWrist = m_robotModel->getFrameParent("l_wrist");
m_rightWrist = m_robotModel->getBodyId("r_wrist"); m_rightWrist = m_robotModel->getFrameParent("r_wrist");
DetectAutomaticallyShoulders(); DetectAutomaticallyShoulders();
// intialize the "initial pose" (q=[0]) data // intialize the "initial pose" (q=[0]) data
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment