Skip to content

Commit 0aea0dd

Browse files
BriceRenaudeauManos-G
authored andcommitted
Update footprint iif changed (ros-navigation#4193)
Signed-off-by: Brice <brice.renaudeau@gmail.com>
1 parent 11d4a7b commit 0aea0dd

File tree

5 files changed

+11
-2
lines changed

5 files changed

+11
-2
lines changed

nav2_smac_planner/include/nav2_smac_planner/analytic_expansion.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class AnalyticExpansion
7373
* @brief Sets the collision checker and costmap to use in expansion validation
7474
* @param collision_checker Collision checker to use
7575
*/
76-
void setCollisionChecker(GridCollisionChecker * & collision_checker);
76+
void setCollisionChecker(GridCollisionChecker * collision_checker);
7777

7878
/**
7979
* @brief Attempt an analytic path completion

nav2_smac_planner/src/analytic_expansion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ AnalyticExpansion<NodeT>::AnalyticExpansion(
4141

4242
template<typename NodeT>
4343
void AnalyticExpansion<NodeT>::setCollisionChecker(
44-
GridCollisionChecker * & collision_checker)
44+
GridCollisionChecker * collision_checker)
4545
{
4646
_collision_checker = collision_checker;
4747
}

nav2_smac_planner/src/collision_checker.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ void GridCollisionChecker::setFootprint(
6666
return;
6767
}
6868

69+
oriented_footprints_.clear();
6970
oriented_footprints_.reserve(angles_.size());
7071
double sin_th, cos_th;
7172
geometry_msgs::msg::Point new_pt;

nav2_smac_planner/src/smac_planner_hybrid.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,10 @@ nav_msgs::msg::Path SmacPlannerHybrid::createPlan(
338338
}
339339

340340
// Set collision checker and costmap information
341+
_collision_checker.setFootprint(
342+
_costmap_ros->getRobotFootprint(),
343+
_costmap_ros->getUseRadius(),
344+
findCircumscribedCost(_costmap_ros));
341345
_a_star->setCollisionChecker(&_collision_checker);
342346

343347
// Set starting point, in A* bin search coordinates

nav2_smac_planner/src/smac_planner_lattice.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,10 @@ nav_msgs::msg::Path SmacPlannerLattice::createPlan(
274274
std::unique_lock<nav2_costmap_2d::Costmap2D::mutex_t> lock(*(_costmap->getMutex()));
275275

276276
// Set collision checker and costmap information
277+
_collision_checker.setFootprint(
278+
_costmap_ros->getRobotFootprint(),
279+
_costmap_ros->getUseRadius(),
280+
findCircumscribedCost(_costmap_ros));
277281
_a_star->setCollisionChecker(&_collision_checker);
278282

279283
// Set starting point, in A* bin search coordinates

0 commit comments

Comments
 (0)