Move printKeybindings into PacmanWrapper class

KIT-MRT · Nov 15, 2024 · bcc4961 · bcc4961
1 parent 838b797
commit bcc4961
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/demo/include/utils/pacman_wrapper.hpp b/demo/include/utils/pacman_wrapper.hpp
@@ -27,6 +27,8 @@ class PacmanWrapper {
         return game_;
     }
 
+    void printKeybindings();
+
 private:
     void handleUserInput();
     void renderPath(const demo::Positions& path);

diff --git a/demo/include/utils/utils.hpp b/demo/include/utils/utils.hpp
@@ -11,6 +11,4 @@ int dotsInRadius(const Position& center,
                  const demo::EnvironmentModel::ConstPtr& environmentModel,
                  int pathEndNeighborhoodRadius);
 
-void printKeybindings();
-
 } // namespace utils
diff --git a/demo/src/main.cpp b/demo/src/main.cpp
@@ -7,17 +7,16 @@
 #include "demo/pacman_agent.hpp"
 #include "demo/types.hpp"
 #include "utils/pacman_wrapper.hpp"
-#include "utils/utils.hpp"
 
 using namespace demo;
 using namespace utils;
 using namespace arbitration_graphs;
 
 int main() {
     try {
-        printKeybindings();
-
         PacmanWrapper demo;
+        demo.printKeybindings();
+
         PacmanAgent agent(demo.game());
 
         gui::WebServer server(8080, true);

diff --git a/demo/src/pacman_wrapper.cpp b/demo/src/pacman_wrapper.cpp
@@ -1,5 +1,7 @@
 #include "utils/pacman_wrapper.hpp"
 
+#include <iostream>
+
 #include <SDL2/SDL_main.h>
 
 #include <pacman/core/constants.hpp>
@@ -108,6 +110,18 @@ void PacmanWrapper::progressGame(const demo::Command& command,
     FrameCap sync{fps};
 }
 
+void PacmanWrapper::printKeybindings() {
+    std::cout << "\n"
+              << "\033[1;36m=====================================\033[0m\n"
+              << "\033[1;37m               CONTROLS              \033[0m\n"
+              << "\033[1;36m=====================================\033[0m\n"
+              << "  \033[1;32mESC/Q\033[0m - Quit the demo\n"
+              << "  \033[1;32mSpace\033[0m - Pause the demo\n"
+              << "  \033[1;32mP\033[0m     - Toggle path visualization\n"
+              << "\033[1;36m=====================================\033[0m\n"
+              << '\n';
+}
+
 void PacmanWrapper::renderPath(const demo::Positions& path) {
     // Set path color and transparency
     SDL_CHECK(SDL_SetRenderDrawColor(renderer_.get(), 0, 255, 0, 90));

diff --git a/demo/src/utils.cpp b/demo/src/utils.cpp
@@ -1,5 +1,3 @@
-#include <iostream>
-
 #include "utils/utils.hpp"
 
 namespace utils {
@@ -33,16 +31,4 @@ int dotsInRadius(const Position& center,
     return nDots;
 }
 
-void printKeybindings() {
-    std::cout << "\n"
-              << "\033[1;36m=====================================\033[0m\n"
-              << "\033[1;37m               CONTROLS              \033[0m\n"
-              << "\033[1;36m=====================================\033[0m\n"
-              << "  \033[1;32mESC/Q\033[0m - Quit the demo\n"
-              << "  \033[1;32mSpace\033[0m - Pause the demo\n"
-              << "  \033[1;32mP\033[0m     - Toggle path visualization\n"
-              << "\033[1;36m=====================================\033[0m\n"
-              << '\n';
-}
-
 } // namespace utils