Skip to content

Commit 16ee110

Browse files
Fix Code Style On debug-drawer-expansion (#2527)
automated style fixes Co-authored-by: shourikb <shourikb@users.noreply.github.com>
1 parent a9b492b commit 16ee110

4 files changed

Lines changed: 20 additions & 18 deletions

File tree

src/rj_strategy/include/rj_strategy/agent/position/defense.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Defense : public Position {
7373
State current_state_ = JOINING_WALL;
7474
std::optional<RobotIntent> state_to_task(RobotIntent intent);
7575

76-
static constexpr std::string_view state_to_name(State s) {
76+
static constexpr std::string_view state_to_name(State s) {
7777
switch (s) {
7878
case IDLING:
7979
return "IDLING";

src/rj_strategy/src/agent/position/defense.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
namespace strategy {
44

5-
Defense::Defense(int r_id) : Position(r_id, "Defense") {
6-
debug_draw_enabled_ = true;
7-
}
5+
Defense::Defense(int r_id) : Position(r_id, "Defense") { debug_draw_enabled_ = true; }
86

9-
Defense::Defense(Position&& other) : Position{std::move(other)} {
10-
position_name_ = "Defense";
7+
Defense::Defense(Position&& other) : Position{std::move(other)} {
8+
position_name_ = "Defense";
119
debug_draw_enabled_ = true;
1210
}
1311

@@ -16,10 +14,12 @@ std::optional<RobotIntent> Defense::derived_get_task(RobotIntent intent) {
1614

1715
if (debug_draw_enabled_ && debug_drawer_) {
1816
auto robot_pos = last_world_state_->get_robot(true, robot_id_).pose.position();
19-
double angle = (robot_id_ * label_angle_constant) / kRobotsPerTeam;
20-
rj_geometry::Point label_offset = {kLabelRadius * std::cos(angle), kLabelRadius * std::sin(angle)};
17+
double angle = (robot_id_ * label_angle_constant) / kRobotsPerTeam;
18+
rj_geometry::Point label_offset = {kLabelRadius * std::cos(angle),
19+
kLabelRadius * std::sin(angle)};
2120

22-
debug_drawer_->draw_text(position_name_ + "/" + std::string(state_to_name(current_state_)), robot_pos + label_offset, Qt::white);
21+
debug_drawer_->draw_text(position_name_ + "/" + std::string(state_to_name(current_state_)),
22+
robot_pos + label_offset, Qt::white);
2323
}
2424

2525
return state_to_task(intent);

src/rj_strategy/src/agent/position/goalie.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
namespace strategy {
44

5-
Goalie::Goalie(int r_id) : Position(r_id, "Goalie") {
6-
debug_draw_enabled_ = true;
7-
}
5+
Goalie::Goalie(int r_id) : Position(r_id, "Goalie") { debug_draw_enabled_ = true; }
86

97
Goalie::Goalie(Position&& other) : Position{std::move(other)} {
108
position_name_ = "Goalie";
@@ -16,10 +14,12 @@ std::optional<RobotIntent> Goalie::derived_get_task(RobotIntent intent) {
1614

1715
if (debug_draw_enabled_ && debug_drawer_) {
1816
auto robot_pos = last_world_state_->get_robot(true, robot_id_).pose.position();
19-
double angle = (robot_id_ * label_angle_constant) / kRobotsPerTeam;
20-
rj_geometry::Point label_offset = {kLabelRadius * std::cos(angle), kLabelRadius * std::sin(angle)};
17+
double angle = (robot_id_ * label_angle_constant) / kRobotsPerTeam;
18+
rj_geometry::Point label_offset = {kLabelRadius * std::cos(angle),
19+
kLabelRadius * std::sin(angle)};
2120

22-
debug_drawer_->draw_text(position_name_ + "/" + std::string(state_to_name(latest_state_)), robot_pos + label_offset, Qt::white);
21+
debug_drawer_->draw_text(position_name_ + "/" + std::string(state_to_name(latest_state_)),
22+
robot_pos + label_offset, Qt::white);
2323
}
2424

2525
return state_to_task(intent);

src/rj_strategy/src/agent/position/offense.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ std::optional<RobotIntent> Offense::derived_get_task(RobotIntent intent) {
2929
// Example of how to draw text on the debug drawer for position/strategy debugging
3030
if (debug_draw_enabled_ && debug_drawer_) {
3131
auto robot_pos = last_world_state_->get_robot(true, robot_id_).pose.position();
32-
double angle = (robot_id_ * label_angle_constant) / kRobotsPerTeam;
33-
rj_geometry::Point label_offset = {kLabelRadius * std::cos(angle), kLabelRadius * std::sin(angle)};
32+
double angle = (robot_id_ * label_angle_constant) / kRobotsPerTeam;
33+
rj_geometry::Point label_offset = {kLabelRadius * std::cos(angle),
34+
kLabelRadius * std::sin(angle)};
3435

35-
debug_drawer_->draw_text("Offense/" + std::string(state_to_name(current_state_)), robot_pos + label_offset, Qt::white);
36+
debug_drawer_->draw_text("Offense/" + std::string(state_to_name(current_state_)),
37+
robot_pos + label_offset, Qt::white);
3638
}
3739

3840
// Calculate task based on state

0 commit comments

Comments
 (0)