Revert "Merge branch 'main' into feat/navigation-message-mappers"

This reverts commit 3faed91, reversing changes made to 7f5587f.
robocin · Nov 7, 2024 · a003f89 · a003f89
1 parent 3faed91
commit a003f89
Show file tree

Hide file tree

Showing 81 changed files with 491 additions and 1,928 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
diff --git a/behavior-ms/behavior-bruxo/behavior/parameters/parameters.h b/behavior-ms/behavior-bruxo/behavior/parameters/parameters.h
@@ -1,8 +1,6 @@
 #ifndef BEHAVIOR_PARAMETERS_PARAMETERS_H
 #define BEHAVIOR_PARAMETERS_PARAMETERS_H
 
-#include "behavior/processing/messages/common/robot_id/robot_id.h"
-
 #include <robocin/parameters/parameters.h>
 
 namespace behavior {
@@ -11,12 +9,6 @@ namespace behavior {
 constinit const auto pBehaviorPollerTimeoutMs
     = ::robocin::parameters::View<1>::asInt32(10 /*ms ~= 100Hz*/);
 
-constinit const auto pAllyColor = Color::COLOR_BLUE;
-
-constinit const auto isAttackingToRight = ::robocin::parameters::View<1>::asBool(true);
-
-constinit const auto pBallIsMovingVelocity = ::robocin::parameters::View<1>::asInt32(300);
-constinit const auto pBallIsMovingFastVelocity = ::robocin::parameters::View<1>::asInt32(850);
 // NOLINTEND(*comment*)
 } // namespace behavior
 

diff --git a/behavior-ms/behavior-bruxo/behavior/processing/CMakeLists.txt b/behavior-ms/behavior-bruxo/behavior/processing/CMakeLists.txt
@@ -4,8 +4,5 @@ robocin_cpp_library(
     SRCS behavior_processor.cpp
     DEPS common::output
          messages
-         entities
          state_machine
-         behavior_manager
-         analyzers
 )
diff --git a/behavior-ms/behavior-bruxo/behavior/processing/analyzer/CMakeLists.txt b/behavior-ms/behavior-bruxo/behavior/processing/analyzer/CMakeLists.txt
diff --git a/behavior-ms/behavior-bruxo/behavior/processing/analyzer/ball_analyzer.cpp b/behavior-ms/behavior-bruxo/behavior/processing/analyzer/ball_analyzer.cpp
diff --git a/behavior-ms/behavior-bruxo/behavior/processing/analyzer/ball_analyzer.h b/behavior-ms/behavior-bruxo/behavior/processing/analyzer/ball_analyzer.h
diff --git a/behavior-ms/behavior-bruxo/behavior/processing/analyzer/field_analyzer.cpp b/behavior-ms/behavior-bruxo/behavior/processing/analyzer/field_analyzer.cpp
diff --git a/behavior-ms/behavior-bruxo/behavior/processing/analyzer/field_analyzer.h b/behavior-ms/behavior-bruxo/behavior/processing/analyzer/field_analyzer.h
diff --git a/behavior-ms/behavior-bruxo/behavior/processing/behavior_processor.cpp b/behavior-ms/behavior-bruxo/behavior/processing/behavior_processor.cpp
@@ -91,14 +91,12 @@ std::optional<rc::Behavior> BehaviorProcessor::process(std::span<const Payload>
   const rc::Detection last_detection = detection_messages.back();
 
   BehaviorMessage behavior_message;
+  // TODO: implement the logic to generate the behavior based on the last detection and the last
+  // decision
+  ///////////////////////////////////////////////////////////////////////////////////
+
+  for (const auto& robot : last_detection.robots()) {
 
-  world_.update(last_decision_.value(),
-                {last_detection.robots().begin(), last_detection.robots().end()},
-                {last_detection.balls().begin(), last_detection.balls().end()},
-                last_detection.field(),
-                last_game_status_.value());
-
-  for (const auto& robot : world_.allies) {
     behavior_message.output.emplace_back(
         OutputMessage{RobotIdMessage{}, MotionMessage{}, PlanningMessage{}});
   }