KickState::CHASE_BALLではボール回避をON / KickState::POSITIVE_REDIRECT (#606)

ibis-ssl · Oct 12, 2024 · dd0e390 · dd0e390
1 parent 6a0a86b
commit dd0e390
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/crane_robot_skills/include/crane_robot_skills/kick.hpp b/crane_robot_skills/include/crane_robot_skills/kick.hpp
@@ -20,6 +20,7 @@ enum class KickState {
   AROUND_BALL,
   KICK,
   REDIRECT_KICK,
+  POSITIVE_REDIRECT_KICK,
 };
 
 class Kick : public SkillBaseWithState<KickState, RobotCommandWrapperPosition>
@@ -58,6 +59,7 @@ class Kick : public SkillBaseWithState<KickState, RobotCommandWrapperPosition>
         visualizer->addPoint(robot()->pose.pos, 0, "", 1., "Kick::ENTRY_POINT");
         return Status::RUNNING;
       });
+
     addTransition(KickState::ENTRY_POINT, KickState::CHASE_BALL, [this]() {
       return world_model()->ball.isMoving(getParameter<double>("moving_speed_threshold"));
     });
@@ -81,20 +83,68 @@ class Kick : public SkillBaseWithState<KickState, RobotCommandWrapperPosition>
           command.setTargetPosition(ball_exit_point).lookAtBallFrom(ball_exit_point);
           state << "ball_exit: " << ball_exit_point.x() << ", " << ball_exit_point.y();
         }
+        command.enableBallAvoidance();
         visualizer->addPoint(robot()->pose.pos, 0, "", 1., state.str());
         return Status::RUNNING;
       });
 
     addTransition(KickState::CHASE_BALL, KickState::AROUND_BALL, [this]() {
       // ボールが止まったら回り込みへ
+      command.disableBallAvoidance();
       return not world_model()->ball.isMoving(getParameter<double>("moving_speed_threshold"));
     });
 
     addTransition(KickState::CHASE_BALL, KickState::REDIRECT_KICK, [this]() {
       // ボールライン上に乗ったらリダイレクトキックへ
+      command.disableBallAvoidance();
+      return world_model()->ball.isMovingTowards(robot()->pose.pos, 10.0) &&
+             getAngleDiff(
+               getAngle(world_model()->ball.vel),
+               getAngle(getParameter<Point>("target") - robot()->pose.pos) < M_PI / 2.0);
+    });
+
+    addTransition(KickState::CHASE_BALL, KickState::POSITIVE_REDIRECT_KICK, [this]() {
+      command.disableBallAvoidance();
       return world_model()->ball.isMovingTowards(robot()->pose.pos, 10.0);
     });
 
+    addStateFunction(
+      KickState::POSITIVE_REDIRECT_KICK,
+      [this](const ConsaiVisualizerWrapper::SharedPtr & visualizer) {
+        visualizer->addPoint(robot()->pose.pos, 0, "", 1., "Kick::POSITIVE_REDIRECT_KICK");
+        // ボールラインに沿って追いかけつつ、角度はtargetへ向ける
+        const auto & ball_pos = world_model()->ball.pos;
+        command.lookAtFrom(getParameter<Point>("target"), ball_pos);
+
+        const auto & ball_vel_normed = world_model()->ball.vel.normalized();
+        Segment ball_line{ball_pos - ball_vel_normed * 10, ball_pos + ball_vel_normed * 10};
+        auto [distance, closest_point] = getClosestPointAndDistance(ball_pos, ball_line);
+        if ((ball_pos - closest_point).dot(ball_vel_normed) > 0) {
+          // 通り過ぎていれば追いかけて蹴る
+          auto target_pos = [&]() -> Point {
+            if (distance < 0.1) {
+              return ball_pos + ball_vel_normed;
+            } else {
+              return closest_point + ball_vel_normed * distance;
+            }
+          }();
+          command.setDribblerTargetPosition(target_pos);
+          command.kickStraight(0.3);
+          command.disableBallAvoidance();
+        } else {
+          // まだだったら避ける
+          command.setTargetPosition(
+            closest_point + (robot()->pose.pos - closest_point).normalized() * 0.3);
+        }
+
+        return Status::RUNNING;
+      });
+
+    addTransition(KickState::POSITIVE_REDIRECT_KICK, KickState::ENTRY_POINT, [this]() {
+      return !world_model()->ball.isMovingAwayFrom(robot()->pose.pos, 10.0) or
+             !world_model()->ball.isMovingTowards(getParameter<Point>("target"), 30.0);
+    });
+
     addStateFunction(
       KickState::REDIRECT_KICK, [this](const ConsaiVisualizerWrapper::SharedPtr & visualizer) {
         visualizer->addPoint(robot()->pose.pos, 0, "", 1., "Kick::REDIRECT_KICK");

diff --git a/crane_robot_skills/src/attacker.cpp b/crane_robot_skills/src/attacker.cpp
@@ -97,7 +97,7 @@ Attacker::Attacker(RobotCommandWrapperBase::SharedPtr & base)
     AttackerState::CUT_THEIR_PASS,
     [this](const ConsaiVisualizerWrapper::SharedPtr & visualizer) -> Status {
       visualizer->addCircle(robot()->pose.pos, 0.25, 1, "blue", "white", 0.5);
-      receive_skill.setParameter("enable_redirect", true);
+      receive_skill.setParameter("enable_redirect", false);
       receive_skill.setParameter("policy", std::string("min_slack"));
       return receive_skill.run(visualizer);
     });