diff --git a/include/hpp/manipulation/fwd.hh b/include/hpp/manipulation/fwd.hh index 80f7ee5d47a5b5a06fefc1e113ba888f7ace5101..fd821d8e0992d358ad4539cd9b531d56c84f2509 100644 --- a/include/hpp/manipulation/fwd.hh +++ b/include/hpp/manipulation/fwd.hh @@ -75,7 +75,8 @@ namespace hpp { typedef constraints::RelativeOrientationPtr_t RelativeOrientationPtr_t; typedef constraints::RelativePositionPtr_t RelativePositionPtr_t; typedef constraints::RelativeTransformation RelativeTransformation; - typedef constraints::RelativeTransformationSE3 RelativeTransformationSE3; + typedef constraints::RelativeTransformationR3xSO3 + RelativeTransformationR3xSO3; typedef constraints::RelativeTransformationPtr_t RelativeTransformationPtr_t; typedef core::value_type value_type; diff --git a/src/handle.cc b/src/handle.cc index c55987548833e41e34e3e7699f87c01923bb0cff..36c896e475601f7f4aecfbe615a3b8e9532b19d6 100644 --- a/src/handle.cc +++ b/src/handle.cc @@ -132,7 +132,7 @@ namespace hpp { gripper->objectPositionInJoint (), localPosition(), 6 * constraints::EqualToZero); } - return Implicit::create (RelativeTransformationSE3::create + return Implicit::create (RelativeTransformationR3xSO3::create (n, robot (), gripper->joint (), joint (), gripper->objectPositionInJoint (), localPosition()), 6 * constraints::EqualToZero, mask_); @@ -153,7 +153,7 @@ namespace hpp { r->configSize(), r->numberDof (), n)), ComparisonTypes_t()); } else { std::vector<bool> Cmask = complementMask(mask_); - return Implicit::create (RelativeTransformationSE3::create + return Implicit::create (RelativeTransformationR3xSO3::create (n, r, gripper->joint (), joint (), gripper->objectPositionInJoint (), localPosition()), 6 * constraints::Equality, Cmask); @@ -182,7 +182,7 @@ namespace hpp { (n, robot (), gripper->joint (), joint (), gripper->objectPositionInJoint (), localPosition(), comp); } - return Implicit::create (RelativeTransformationSE3::create + return Implicit::create (RelativeTransformationR3xSO3::create (n, robot (), gripper->joint (), joint (), gripper->objectPositionInJoint (), localPosition()), comp, std::vector <bool> (6, true)); @@ -197,7 +197,7 @@ namespace hpp { n = "Pregrasp_ " + maskToStr(mask_) + "_" + name () + "_" + gripper->name (); ImplicitPtr_t result (Implicit::create - (RelativeTransformationSE3::create + (RelativeTransformationR3xSO3::create (n, robot(), gripper->joint (), joint (), M, localPosition()), 6 * constraints::EqualToZero, mask_));