Skip to content

Commit

Permalink
Update tesseract collision validator
Browse files Browse the repository at this point in the history
  • Loading branch information
Levi-Armstrong committed Jan 4, 2025
1 parent ad51f03 commit de4fba4
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ createCollisionConstraints(const std::vector<std::shared_ptr<const trajopt_ifopt
auto active_link_names = manip->getActiveLinkNames();
auto static_link_names = manip->getStaticLinkNames();
auto cp = tesseract_collision::getCollisionObjectPairs(
active_link_names, static_link_names, env->getDiscreteContactManager()->getIsContactAllowedFn());
active_link_names, static_link_names, env->getDiscreteContactManager()->getContactAllowedValidator());

constraints.push_back(std::make_shared<trajopt_ifopt::DiscreteCollisionConstraint>(
collision_evaluator,
Expand Down Expand Up @@ -217,7 +217,7 @@ createCollisionConstraints(const std::vector<std::shared_ptr<const trajopt_ifopt
auto active_link_names = manip->getActiveLinkNames();
auto static_link_names = manip->getStaticLinkNames();
auto cp = tesseract_collision::getCollisionObjectPairs(
active_link_names, static_link_names, env->getDiscreteContactManager()->getIsContactAllowedFn());
active_link_names, static_link_names, env->getDiscreteContactManager()->getContactAllowedValidator());

std::array<trajopt_ifopt::JointPosition::ConstPtr, 2> position_vars{ vars[i - 1], vars[i] };
std::array<bool, 2> position_vars_fixed{ time0_fixed, time1_fixed };
Expand Down Expand Up @@ -264,7 +264,7 @@ createCollisionConstraints(const std::vector<std::shared_ptr<const trajopt_ifopt
auto active_link_names = manip->getActiveLinkNames();
auto static_link_names = manip->getStaticLinkNames();
auto cp = tesseract_collision::getCollisionObjectPairs(
active_link_names, static_link_names, env->getDiscreteContactManager()->getIsContactAllowedFn());
active_link_names, static_link_names, env->getDiscreteContactManager()->getContactAllowedValidator());

std::array<trajopt_ifopt::JointPosition::ConstPtr, 2> position_vars{ vars[i - 1], vars[i] };
std::array<bool, 2> position_vars_fixed{ time0_fixed, time1_fixed };
Expand Down

0 comments on commit de4fba4

Please sign in to comment.