Skip to content

Commit 5b1398a

Browse files
author
beyza
committed
simplify collision check
Signed-off-by: beyza <bnk@leodrive.ai>
1 parent 149dff2 commit 5b1398a

File tree

1 file changed

+10
-17
lines changed
  • planning/behavior_velocity_dynamic_obstacle_stop_module/src

1 file changed

+10
-17
lines changed

planning/behavior_velocity_dynamic_obstacle_stop_module/src/collision.cpp

+10-17
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,21 @@ std::optional<geometry_msgs::msg::Point> find_closest_collision_point(
6666
std::vector<Collision> find_collisions(
6767
const EgoData & ego_data,
6868
const std::vector<autoware_auto_perception_msgs::msg::PredictedObject> & objects,
69-
const tier4_autoware_utils::MultiPolygon2d & object_forward_footprints,
69+
const std::vector<tier4_autoware_utils::MultiPolygon2d> & object_forward_footprints,
7070
const PlannerParam & params)
7171
{
7272
std::vector<Collision> collisions;
7373
std::optional<geometry_msgs::msg::Point> collision;
74-
for (auto object_idx = 0UL; object_idx < objects.size(); ++object_idx) {
75-
const auto & object_pose = objects[object_idx].kinematics.initial_pose_with_covariance.pose;
76-
if (!params.ignore_objects_behind_ego) {
77-
tier4_autoware_utils::MultiPolygon2d object_footprint;
78-
for (const auto & polygon : object_forward_footprints) {
79-
object_footprint.push_back(polygon);
80-
collision = find_closest_collision_point(ego_data, object_pose, polygon, params);
74+
for (const auto & object : objects) {
75+
tier4_autoware_utils::MultiPolygon2d object_footprint;
76+
for (const auto & polygon : object_forward_footprints) {
77+
collision = find_closest_collision_point(ego_data, object, polygon, params);
78+
if (collision) {
79+
Collision c;
80+
c.object_uuid = tier4_autoware_utils::toHexString(object.object_id);
81+
c.point = *collision;
82+
collisions.push_back(c);
8183
}
82-
} else {
83-
const auto & object_footprint = object_forward_footprints[object_idx];
84-
collision = find_closest_collision_point(ego_data, object_pose, object_footprint, params);
85-
}
86-
if (collision) {
87-
Collision c;
88-
c.object_uuid = tier4_autoware_utils::toHexString(objects[object_idx].object_id);
89-
c.point = *collision;
90-
collisions.push_back(c);
9184
}
9285
}
9386
return collisions;

0 commit comments

Comments
 (0)