Refactor

Author: dbeef

src/game-loop/CMakeLists.txt

@@ -334,6 +334,10 @@ add_library(GameLoop STATIC
 
         src/other/ParticleGenerator.cpp
         src/other/Inventory.cpp
+        src/prefabs/ui/CheatConsole.cpp
+        src/populator/ItemFactory.cpp
+        src/populator/LootFactory.cpp
+        src/populator/NpcFactory.cpp
         interface/other/PhysicsComponentType.hpp
         interface/other/Inventory.hpp
         interface/other/InventoryEvent.hpp
@@ -343,8 +347,10 @@ add_library(GameLoop STATIC
         include/other/ParticleGenerator.hpp
         include/components/generic/ImguiComponent.hpp
         include/prefabs/ui/CheatConsole.hpp
-        src/prefabs/ui/CheatConsole.cpp
-)
+        include/populator/ItemFactory.hpp
+        include/populator/NpcFactory.hpp
+        include/populator/LootFactory.hpp
+        src/other/NpcType.cpp src/other/ItemType.cpp include/other/CheatConsoleInterpreter.h src/other/CheatConsoleInterpreter.cpp interface/game-loop/GameLoopState.hpp src/game-loop/GameLoopState.cpp)
 
 target_include_directories(GameLoop
         PRIVATE include interface

src/game-loop/include/other/CheatConsoleInterpreter.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <vector>
+#include <string>
+#include <functional>
+#include <map>
+
+#include "other/ItemType.hpp"
+#include "other/NpcType.hpp"
+#include "game-loop/GameLoopState.hpp"
+#include "LootType.hpp"
+
+class CheatConsoleInterpreter
+{
+public:
+    using Command = std::vector<std::string>;
+    using CommandHandlerResult = std::pair<bool, std::string>;
+    using CommandHandler = std::function<CommandHandlerResult(const Command&)>;
+    CheatConsoleInterpreter();
+
+    const CommandHandler& get_spawn_command_handler() const;
+    const CommandHandler& get_enter_command_handler() const;
+private:
+    std::map<std::string, ItemType> _string_to_item_type_map;
+    std::map<std::string, NpcType> _string_to_npc_type_map;
+    std::map<std::string, LootType> _string_to_loot_type_map;
+    std::map<std::string, GameLoopState> _string_to_game_loop_state_map;
+
+    CommandHandler _spawn_command_handler;
+    CommandHandler _enter_command_handler;
+};

src/game-loop/include/other/NpcType.hpp

@@ -1,8 +1,13 @@
 #pragma once
 
-enum class NpcType
+#include <cassert>
+#include <cstdint>
+
+using NpcType_t = std::uint16_t;
+
+enum class NpcType : NpcType_t
 {
-    NONE,
+    NONE = 0,
     SNAKE,
     BAT,
     CAVEMAN,
@@ -11,5 +16,8 @@ enum class NpcType
     SHOPKEEPER,
     DAMSEL,
     BLUE_FROG,
-    RED_FROG
+    RED_FROG,
+    _SIZE
 };
+
+const char* to_string(NpcType npc_type);

src/game-loop/include/populator/ItemFactory.hpp

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "other/ItemType.hpp"
+#include <entt/entt.hpp>
+
+class ItemFactory {
+public:
+    static entt::entity make(ItemType);
+    static entt::entity make(ItemType, float pos_x, float pos_y);
+};

src/game-loop/include/populator/LootFactory.hpp

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <entt/entt.hpp>
+#include "LootType.hpp"
+
+class LootFactory {
+public:
+    static entt::entity make(LootType);
+    static entt::entity make(LootType, float pos_x, float pos_y);
+};

src/game-loop/include/populator/NpcFactory.hpp

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "other/NpcType.hpp"
+#include <entt/entt.hpp>
+
+class NpcFactory {
+public:
+    static entt::entity make(NpcType);
+    static entt::entity make(NpcType, float pos_x, float pos_y);
+};

src/game-loop/include/prefabs/ui/CheatConsole.hpp

@@ -4,17 +4,20 @@
 #include "viewport/Viewport.hpp"
 #include "game-loop/GameLoop.hpp"
 
+#include <vector>
+#include <functional>
+
 namespace prefabs
 {
     class CheatConsoleComponent
     {
     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;}
+        void request_state_change(GameLoopState requested_state) { _requested_state = requested_state; _state_change_requested = true; }
+        GameLoopState get_requested_state() const { return _requested_state;}
     private:
         bool _state_change_requested = false;
-        GameLoop::State _requested_state{GameLoop::State::CURRENT};
+        GameLoopState _requested_state{GameLoopState::CURRENT};
     };
 
     struct CheatConsole

src/game-loop/interface/game-loop/GameLoop.hpp

@@ -14,6 +14,7 @@
 #include "game-loop/GameLoopStartedState.hpp"
 #include "game-loop/GameLoopScoresState.hpp"
 #include "game-loop/GameLoopSandboxState.hpp"
+#include "game-loop/GameLoopState.hpp"
 
 #include <entt/entt.hpp>
 
@@ -35,20 +36,9 @@ class ShoppingSystem;
 class GameLoop
 {
 public:
-    enum class State
-    {
-        MAIN_MENU = 0,
-        PLAYING,
-        STARTED,
-        LEVEL_SUMMARY,
-        SCORES,
-        SANDBOX,
-        CURRENT
-    };
-
     GameLoop(const std::shared_ptr<Viewport>&);
     std::function<bool(uint32_t delta_time_ms)>& get();
-    GameLoopBaseState* get_game_loop_state_ptr(State);
+    GameLoopBaseState* get_game_loop_state_ptr(GameLoopState);
 
 private:
 

src/game-loop/interface/game-loop/GameLoopBaseState.hpp

@@ -4,6 +4,7 @@
 
 class GameLoop;
 
+// TODO: Rename to IGameLoopState to not confuse with GameLoopState enum
 class GameLoopBaseState
 {
 public:

src/game-loop/interface/game-loop/GameLoopState.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <cstdint>
+
+using GameLoopState_t = std::uint16_t;
+enum class GameLoopState : GameLoopState_t
+{
+    MAIN_MENU = 0,
+    PLAYING,
+    STARTED,
+    LEVEL_SUMMARY,
+    SCORES,
+    SANDBOX,
+    CURRENT,
+    _SIZE
+};
+
+const char* to_string(GameLoopState);