-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop' into send_vision_xy
# Conflicts: # .github/workflows/build_test.yaml # crane_bringup/launch/play_switcher.launch.py # crane_bringup/launch/play_switcher_y.launch.py # crane_local_planner/include/crane_local_planner/local_planner.hpp # crane_local_planner/src/crane_local_planner.cpp # session/crane_planner_base/include/crane_planner_base/planner_base.hpp # session/crane_planner_plugins/CMakeLists.txt # session/crane_planner_plugins/include/crane_planner_plugins/attacker_planner.hpp # session/crane_planner_plugins/include/crane_planner_plugins/ball_placement_planner.hpp # session/crane_planner_plugins/include/crane_planner_plugins/defender_planner.hpp # session/crane_planner_plugins/include/crane_planner_plugins/goalie_planner.hpp # session/crane_planner_plugins/include/crane_planner_plugins/kickoff_planner.hpp # session/crane_planner_plugins/include/crane_planner_plugins/template_planner.hpp # session/crane_planner_plugins/include/crane_planner_plugins/waiter_planner.hpp # session/crane_planner_plugins/src/attacker/attacker.cpp # session/crane_planner_plugins/src/ball_placement/ball_placement.cpp # session/crane_planner_plugins/src/ball_placement_with_skill/ball_placement_with_skill_node.cpp # session/crane_planner_plugins/src/goalie/goalie.cpp # session/crane_planner_plugins/src/kickoff/kickoff.cpp # session/crane_planner_plugins/src/receive/receive.cpp # session/crane_planner_plugins/src/template/template.cpp # session/crane_planner_plugins/src/waiter/waiter.cpp # session/crane_session_controller/config/play_situation/OUR_KICKOFF_START.yaml # session/crane_session_controller/include/crane_session_controller/session_module.hpp # session/crane_session_controller/package.xml # session/crane_session_controller/src/crane_session_controller.cpp # utility/crane_geometry/include/crane_geometry/eigen_adapter.hpp # utility/crane_geometry/include/crane_geometry/interval.hpp # utility/crane_msg_wrappers/include/crane_msg_wrappers/world_model_wrapper.hpp
- Loading branch information
Showing
36 changed files
with
927 additions
and
868 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
crane_local_planner/include/crane_local_planner/gridmap_planner.hpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| // Copyright (c) 2023 ibis-ssl | ||
| // | ||
| // Use of this source code is governed by an MIT-style | ||
| // license that can be found in the LICENSE file or at | ||
| // https://opensource.org/licenses/MIT. | ||
|
|
||
| #ifndef CRANE_GRIDMAP_PLANNER_HPP | ||
| #define CRANE_GRIDMAP_PLANNER_HPP | ||
|
|
||
| #include <crane_msg_wrappers/world_model_wrapper.hpp> | ||
| #include <crane_msgs/msg/robot_commands.hpp> | ||
| #include <grid_map_ros/grid_map_ros.hpp> | ||
|
|
||
| namespace crane | ||
| { | ||
| class GridMapPlanner | ||
| { | ||
| public: | ||
| GridMapPlanner(rclcpp::Node & node) : map({"penalty", "ball_placement", "theirs", "ours", "ball"}) | ||
| { | ||
| node.declare_parameter("map_resolution", MAP_RESOLUTION); | ||
| MAP_RESOLUTION = node.get_parameter("map_resolution").as_double(); | ||
|
|
||
| gridmap_publisher = | ||
| node.create_publisher<grid_map_msgs::msg::GridMap>("local_planner/grid_map", 1); | ||
| map.setFrameId("map"); | ||
| map.setGeometry(grid_map::Length(1.2, 2.0), MAP_RESOLUTION, grid_map::Position(0.0, 0.0)); | ||
| } | ||
|
|
||
| crane_msgs::msg::RobotCommands calculateControlTarget( | ||
| const crane_msgs::msg::RobotCommands &, WorldModelWrapper::SharedPtr world_model) | ||
| { | ||
| // update map size | ||
|
|
||
| if ( | ||
| map.getLength().x() != world_model->field_size.x() || | ||
| map.getLength().y() != world_model->field_size.y()) { | ||
| map.clearAll(); | ||
| map.setGeometry( | ||
| grid_map::Length(world_model->field_size.x(), world_model->field_size.y()), MAP_RESOLUTION); | ||
| } | ||
|
|
||
| // DefenseSize更新時にdefense_areaを更新する | ||
| static Vector2 defense_area_size; | ||
| if ( | ||
| defense_area_size.x() != world_model->defense_area_size.x() || | ||
| defense_area_size.y() != world_model->defense_area_size.y()) { | ||
| defense_area_size = world_model->defense_area_size; | ||
| if (not map.exists("defense_area")) { | ||
| map.add("defense_area"); | ||
| } | ||
|
|
||
| for (grid_map::GridMapIterator iterator(map); !iterator.isPastEnd(); ++iterator) { | ||
| grid_map::Position position; | ||
| map.getPosition(*iterator, position); | ||
| map.at("defense_area", *iterator) = world_model->isDefenseArea(position); | ||
| } | ||
| } | ||
|
|
||
| // ボールプレイスメントMap | ||
| if (not map.exists("ball_placement")) { | ||
| map.add("ball_placement"); | ||
| } | ||
| for (grid_map::GridMapIterator iterator(map); !iterator.isPastEnd(); ++iterator) { | ||
| grid_map::Position position; | ||
| map.getPosition(*iterator, position); | ||
| map.at("ball_placement", *iterator) = world_model->isBallPlacementArea(position); | ||
| } | ||
|
|
||
| // 味方ロボットMap | ||
| if (not map.exists("friend_robot")) { | ||
| map.add("friend_robot"); | ||
| } | ||
| map["friend_robot"].setConstant(0.0); | ||
| for (const auto & robot : world_model->ours.getAvailableRobots()) { | ||
| for (grid_map::CircleIterator iterator(map, robot->pose.pos, 0.1); !iterator.isPastEnd(); | ||
| ++iterator) { | ||
| map.at("friend_robot", *iterator) = 1.0; | ||
| } | ||
| } | ||
|
|
||
| // 敵ロボットMap | ||
| if (not map.exists("enemy_robot")) { | ||
| map.add("enemy_robot"); | ||
| } | ||
| map["enemy_robot"].setConstant(0.0); | ||
| for (const auto & robot : world_model->theirs.getAvailableRobots()) { | ||
| for (grid_map::CircleIterator iterator(map, robot->pose.pos, 0.1); !iterator.isPastEnd(); | ||
| ++iterator) { | ||
| map.at("enemy_robot", *iterator) = 1.0; | ||
| } | ||
| } | ||
|
|
||
| // ボールMap | ||
| if (not map.exists("ball")) { | ||
| map.add("ball"); | ||
| } | ||
| map["ball"].setConstant(0.0); | ||
| for (grid_map::CircleIterator iterator(map, world_model->ball.pos, 0.1); !iterator.isPastEnd(); | ||
| ++iterator) { | ||
| map.at("ball", *iterator) = 1.0; | ||
| } | ||
|
|
||
| // ボールMap (時間) | ||
| if (not map.exists("ball_time")) { | ||
| map.add("ball_time"); | ||
| } | ||
| Vector2 ball_vel_unit = world_model->ball.vel.normalized() * MAP_RESOLUTION; | ||
| Point ball_pos = world_model->ball.pos; | ||
| double time = 0.0; | ||
| const double TIME_STEP = MAP_RESOLUTION / world_model->ball.vel.norm(); | ||
| map["ball_time"].setConstant(100.0); | ||
| for (int i = 0; i < 100; ++i) { | ||
| for (grid_map::CircleIterator iterator(map, ball_pos, 0.05); !iterator.isPastEnd(); | ||
| ++iterator) { | ||
| map.at("ball_time", *iterator) = std::min(map.at("ball_time", *iterator), (float)time); | ||
| } | ||
| ball_pos += ball_vel_unit; | ||
| time += TIME_STEP; | ||
| } | ||
| // map.setTimestamp(now().nanoseconds()); | ||
| std::unique_ptr<grid_map_msgs::msg::GridMap> message; | ||
| message = grid_map::GridMapRosConverter::toMessage(map); | ||
|
|
||
| gridmap_publisher->publish(std::move(message)); | ||
| } | ||
|
|
||
| private: | ||
| rclcpp::Publisher<grid_map_msgs::msg::GridMap>::SharedPtr gridmap_publisher; | ||
|
|
||
| grid_map::GridMap map; | ||
|
|
||
| double MAP_RESOLUTION = 0.05; | ||
| }; | ||
| } // namespace crane | ||
| #endif //CRANE_GRIDMAP_PLANNER_HPP |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.