Commit e9412360 authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Merge pull request #10 from mylene-campana/master

In CollisionObject, store and return joint as non const.
parents f5cc1656 3d0221ad
......@@ -51,8 +51,9 @@ namespace hpp {
const std::string& name () const {return name_;}
/// Access to fcl object
fcl::CollisionObjectPtr_t fcl () const {return object_;}
/// Access to the joint
const JointConstPtr_t& joint () const {return joint_;}
/// Get joint
const JointPtr_t& joint () {return joint_;}
/// Set joint
void joint (const JointPtr_t joint);
/// Return the position in the joint frame
......@@ -116,7 +117,7 @@ namespace hpp {
private:
fcl::CollisionObjectPtr_t object_;
fcl::Transform3f positionInJointFrame_;
JointConstPtr_t joint_;
JointPtr_t joint_;
std::string name_;
CollisionObjectWkPtr_t weakPtr_;
}; // class CollisionObject
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment