From 03ecb3acff80d10153a75815f5956859fcb1f01e Mon Sep 17 00:00:00 2001 From: acki Date: Wed, 28 May 2025 07:11:58 -0400 Subject: [PATCH] remove some pot cause of the banner --- src/modelec_strat/data/deposite_zone.xml | 12 ++++++------ .../src/missions/prepare_concert_mission.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modelec_strat/data/deposite_zone.xml b/src/modelec_strat/data/deposite_zone.xml index 0c1cc75..04f9508 100644 --- a/src/modelec_strat/data/deposite_zone.xml +++ b/src/modelec_strat/data/deposite_zone.xml @@ -7,11 +7,11 @@ - + - - + + @@ -40,11 +40,11 @@ - + - - + + diff --git a/src/modelec_strat/src/missions/prepare_concert_mission.cpp b/src/modelec_strat/src/missions/prepare_concert_mission.cpp index 9a28e9e..cf67d1f 100644 --- a/src/modelec_strat/src/missions/prepare_concert_mission.cpp +++ b/src/modelec_strat/src/missions/prepare_concert_mission.cpp @@ -90,7 +90,7 @@ namespace Modelec case GO_TO_COLUMN: { auto pos = column_->GetOptimizedGetPos(nav_->GetCurrentPos()).GetTakeClosePosition(); - nav_->GoTo(pos, true, Pathfinding::FREE | Pathfinding::WALL); + nav_->GoTo(pos, true, Pathfinding::FREE | Pathfinding::WALL | Pathfinding::OBSTACLE); } step_ = GO_CLOSE_TO_COLUMN; @@ -184,7 +184,7 @@ namespace Modelec case GO_TO_PLATFORM: { auto p = closestDepoZonePoint_.GetTakeClosePosition(); - nav_->GoTo(p.x, p.y, p.theta, true); + nav_->GoTo(p.x, p.y, p.theta, true, Pathfinding::FREE | Pathfinding::WALL | Pathfinding::OBSTACLE); } step_ = GO_CLOSE_TO_PLATFORM;