File tree Expand file tree Collapse file tree 2 files changed +0
-30
lines changed
tesseract/tesseract_planning/tesseract_motion_planners
include/tesseract_motion_planners/ompl/impl Expand file tree Collapse file tree 2 files changed +0
-30
lines changed Original file line number Diff line number Diff line change @@ -128,21 +128,7 @@ tesseract_common::StatusCode OMPLFreespacePlanner<PlannerType>::solve(PlannerRes
128128 tesseract_collision::ContactTestType::FIRST,
129129 verbose);
130130
131- // Do a discrete check until continuous collision checking is updated to do dynamic-dynamic checking
132- discrete_contact_manager_->setContactDistanceThreshold (0 );
133- collisions.clear ();
134-
135- found = found || tesseract_environment::checkTrajectory (collisions,
136- *discrete_contact_manager_,
137- *state_solver,
138- kin_->getJointNames (),
139- traj,
140- config_->longest_valid_segment_length ,
141- tesseract_collision::ContactTestType::FIRST,
142- verbose);
143-
144131 // Set the contact distance back to original incase solve was called again.
145- discrete_contact_manager_->setContactDistanceThreshold (config_->collision_safety_margin );
146132 continuous_contact_manager_->setContactDistanceThreshold (config_->collision_safety_margin );
147133
148134 // Send response
Original file line number Diff line number Diff line change @@ -174,22 +174,6 @@ tesseract_common::StatusCode TrajOptMotionPlanner::solve(PlannerResponse& respon
174174 tesseract_collision::ContactTestType::FIRST,
175175 verbose);
176176
177- // Do a discrete check until continuous collision checking is updated to do dynamic-dynamic checking
178- tesseract_collision::DiscreteContactManager::Ptr discrete_manager =
179- config_->prob ->GetEnv ()->getDiscreteContactManager ();
180- discrete_manager->setActiveCollisionObjects (adjacency_map->getActiveLinkNames ());
181- discrete_manager->setContactDistanceThreshold (0 );
182- collisions.clear ();
183-
184- found = found || checkTrajectory (collisions,
185- *discrete_manager,
186- *state_solver,
187- config_->prob ->GetKin ()->getJointNames (),
188- getTraj (opt.x (), config_->prob ->GetVars ()),
189- length,
190- tesseract_collision::ContactTestType::FIRST,
191- verbose);
192-
193177 // Send response
194178 response.joint_trajectory .trajectory = getTraj (opt.x (), config_->prob ->GetVars ());
195179 response.joint_trajectory .joint_names = config_->prob ->GetKin ()->getJointNames ();
You can’t perform that action at this time.
0 commit comments