Added a helper function for getting GameLoopBaseState ptr

dbeef · Dec 17, 2023 · df85e5c · df85e5c
1 parent 6d00f71
commit df85e5c
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 89 deletions.
diff --git a/src/game-loop/include/prefabs/ui/CheatConsole.hpp b/src/game-loop/include/prefabs/ui/CheatConsole.hpp
@@ -6,9 +6,15 @@
 
 namespace prefabs
 {
-    struct CheatConsoleComponent
+    class CheatConsoleComponent
     {
-        GameLoop::State state{GameLoop::State::CURRENT};
+    public:
+        bool is_state_change_requested() const { return _state_change_requested; }
+        void request_state_change(GameLoop::State requested_state) { _requested_state = requested_state; _state_change_requested = true; }
+        GameLoop::State get_requested_state() const { return _requested_state;}
+    private:
+        bool _state_change_requested = false;
+        GameLoop::State _requested_state{GameLoop::State::CURRENT};
     };
 
     struct CheatConsole

diff --git a/src/game-loop/interface/game-loop/GameLoop.hpp b/src/game-loop/interface/game-loop/GameLoop.hpp
@@ -48,6 +48,8 @@ class GameLoop
 
     GameLoop(const std::shared_ptr<Viewport>&);
     std::function<bool(uint32_t delta_time_ms)>& get();
+    GameLoopBaseState* get_game_loop_state_ptr(State);
+
 private:
 
     friend class GameLoopBaseState;

diff --git a/src/game-loop/src/game-loop/GameLoop.cpp b/src/game-loop/src/game-loop/GameLoop.cpp
@@ -57,3 +57,23 @@ GameLoop::GameLoop(const std::shared_ptr<Viewport>& viewport)
         return _exit;
     };
 }
+
+GameLoopBaseState *GameLoop::get_game_loop_state_ptr(GameLoop::State state) {
+    switch (state) {
+        case State::MAIN_MENU:
+            return &_states.main_menu;
+        case State::PLAYING:
+            return &_states.playing;
+        case State::STARTED:
+            return &_states.started;
+        case State::LEVEL_SUMMARY:
+            return &_states.level_summary;
+        case State::SCORES:
+            return &_states.scores;
+        case State::SANDBOX:
+            return &_states.sandbox;
+        case State::CURRENT:
+            return _states.current;
+        default: assert(false);
+    }
+}
diff --git a/src/game-loop/src/game-loop/GameLoopMainMenuState.cpp b/src/game-loop/src/game-loop/GameLoopMainMenuState.cpp
@@ -105,39 +105,17 @@ GameLoopBaseState *GameLoopMainMenuState::update(GameLoop& game_loop, uint32_t d
         }
     }
 
-
-    auto& cheat_console = registry.get<prefabs::CheatConsoleComponent>(_cheat_console);
-    switch (cheat_console.state)
-    {
-        case GameLoop::State::SCORES:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.scores;
-        }
-        case GameLoop::State::MAIN_MENU:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.main_menu;
-        }
-        case GameLoop::State::PLAYING:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.playing;
-        }
-        case GameLoop::State::SANDBOX:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.sandbox;
-        }
-        default: {}
-    }
-
     if (position.y_center <= EXIT_LEVEL_Y)
     {
         log_info("Quitting using rope.");
         game_loop._exit = true;
     }
 
+    auto& cheat_console = registry.get<prefabs::CheatConsoleComponent>(_cheat_console);
+    if (cheat_console.is_state_change_requested()) {
+        return game_loop.get_game_loop_state_ptr(cheat_console.get_requested_state());
+    }
+
     return this;
 }
 

diff --git a/src/game-loop/src/game-loop/GameLoopPlayingState.cpp b/src/game-loop/src/game-loop/GameLoopPlayingState.cpp
@@ -114,24 +114,8 @@ GameLoopBaseState *GameLoopPlayingState::update(GameLoop& game_loop, uint32_t de
     game_loop._level_summary_tracker->update(delta_time_ms);
 
     auto& cheat_console = registry.get<prefabs::CheatConsoleComponent>(_cheat_console);
-    switch (cheat_console.state)
-    {
-        case GameLoop::State::SCORES:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.scores;
-        }
-        case GameLoop::State::MAIN_MENU:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.main_menu;
-        }
-        case GameLoop::State::PLAYING:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.playing;
-        }
-        default: {}
+    if (cheat_console.is_state_change_requested()) {
+        return game_loop.get_game_loop_state_ptr(cheat_console.get_requested_state());
     }
 
     return this;

diff --git a/src/game-loop/src/game-loop/GameLoopSandboxState.cpp b/src/game-loop/src/game-loop/GameLoopSandboxState.cpp
@@ -83,26 +83,9 @@ GameLoopBaseState *GameLoopSandboxState::update(GameLoop& game_loop, uint32_t de
         return &game_loop._states.main_menu;
     }
 
-
     auto& cheat_console = registry.get<prefabs::CheatConsoleComponent>(_cheat_console);
-    switch (cheat_console.state)
-    {
-        case GameLoop::State::SCORES:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.scores;
-        }
-        case GameLoop::State::MAIN_MENU:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.main_menu;
-        }
-        case GameLoop::State::PLAYING:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.playing;
-        }
-        default: {}
+    if (cheat_console.is_state_change_requested()) {
+        return game_loop.get_game_loop_state_ptr(cheat_console.get_requested_state());
     }
 
     return this;

diff --git a/src/game-loop/src/game-loop/GameLoopScoresState.cpp b/src/game-loop/src/game-loop/GameLoopScoresState.cpp
@@ -75,26 +75,9 @@ GameLoopBaseState *GameLoopScoresState::update(GameLoop& game_loop, uint32_t del
         return &game_loop._states.main_menu;
     }
 
-
     auto& cheat_console = registry.get<prefabs::CheatConsoleComponent>(_cheat_console);
-    switch (cheat_console.state)
-    {
-        case GameLoop::State::SCORES:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.scores;
-        }
-        case GameLoop::State::MAIN_MENU:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.main_menu;
-        }
-        case GameLoop::State::PLAYING:
-        {
-            cheat_console.state = GameLoop::State::CURRENT;
-            return &game_loop._states.playing;
-        }
-        default: {}
+    if (cheat_console.is_state_change_requested()) {
+        return game_loop.get_game_loop_state_ptr(cheat_console.get_requested_state());
     }
 
     return this;

diff --git a/src/game-loop/src/prefabs/ui/CheatConsole.cpp b/src/game-loop/src/prefabs/ui/CheatConsole.cpp
@@ -237,22 +237,22 @@ namespace {
                 if (upper_cased == "ENTER SCORES") {
                     auto& registry = EntityRegistry::instance().get_registry();
                     auto& cheat_console_component = registry.get<prefabs::CheatConsoleComponent>(_self);
-                    cheat_console_component.state = GameLoop::State::SCORES;
+                    cheat_console_component.request_state_change(GameLoop::State::SCORES);
                     return std::make_pair(true, "entering scores");
                 } else if (upper_cased == "ENTER MAIN_MENU") {
                     auto& registry = EntityRegistry::instance().get_registry();
                     auto& cheat_console_component = registry.get<prefabs::CheatConsoleComponent>(_self);
-                    cheat_console_component.state = GameLoop::State::MAIN_MENU;
+                    cheat_console_component.request_state_change(GameLoop::State::MAIN_MENU);
                     return std::make_pair(true, "entering main_menu");
                 } else if (upper_cased == "ENTER SANDBOX") {
                     auto& registry = EntityRegistry::instance().get_registry();
                     auto& cheat_console_component = registry.get<prefabs::CheatConsoleComponent>(_self);
-                    cheat_console_component.state = GameLoop::State::SANDBOX;
+                    cheat_console_component.request_state_change(GameLoop::State::SANDBOX);
                     return std::make_pair(true, "entering sanbox");
                 } else if (upper_cased == "ENTER PLAYING") {
                     auto& registry = EntityRegistry::instance().get_registry();
                     auto& cheat_console_component = registry.get<prefabs::CheatConsoleComponent>(_self);
-                    cheat_console_component.state = GameLoop::State::PLAYING;
+                    cheat_console_component.request_state_change(GameLoop::State::PLAYING);
                     return std::make_pair(true, "entering playing");
                 } else {
                     return std::make_pair(false, "");