Get rid of modules completely

nerudaj · May 9, 2024 · 84155e0 · 84155e0
1 parent 2a1a06d
commit 84155e0
Show file tree

Hide file tree

Showing 99 changed files with 423 additions and 414 deletions.
diff --git a/src/bin/src/Main.cpp b/src/bin/src/Main.cpp
@@ -1,15 +1,14 @@
 #include "Gui.hpp"
 #include "Loader.hpp"
 #include "utils/DependencyContainer.hpp"
+#include <Configs/Strings.hpp>
 #include <DGM/dgm.hpp>
+#include <Error.hpp>
+#include <Filesystem.hpp>
+#include <Memory.hpp>
 #include <app/AppStateMainMenu.hpp>
 #include <core/Scene.hpp>
 #include <cxxopts.hpp>
-#include <settings/GameTitle.hpp>
-
-import Memory;
-import Resources;
-import Error;
 
 CmdParameters processCmdParameters(int argc, char* argv[])
 {
@@ -102,7 +101,7 @@ int main(int argc, char* argv[])
         .resolution = sf::Vector2u(
             settings->display.resolution.width,
             settings->display.resolution.height),
-        .title = GAME_TITLE,
+        .title = Strings::CAPTITLE,
         .useFullscreen = settings->display.isFullscreen
     };
 

diff --git a/src/client-test/Main.cpp b/src/client-test/Main.cpp
@@ -1,10 +1,9 @@
 #include "Client.hpp"
+#include <Memory.hpp>
 #include <SFML/Network.hpp>
 #include <format>
 #include <iostream>
 
-import Memory;
-
 struct A
 {
     A() : client(mem::Rc<Client>("127.0.0.1", 10666ui16)) {}

diff --git a/src/lib-app/CMakeLists.txt b/src/lib-app/CMakeLists.txt
@@ -2,11 +2,6 @@ cmake_minimum_required ( VERSION 3.19 )
 
 project ( lib-app )
 
-configure_file (
-	"${CMAKE_CURRENT_SOURCE_DIR}/include/settings/GameTitle.hpp.in"
-	"${CMAKE_CURRENT_SOURCE_DIR}/include/settings/GameTitle.hpp"
-)
-
 get_latest_clang_format()
 glob_sources_and_headers( HEADERS SOURCES )
 

diff --git a/src/lib-app/include/app/AppStateEditor.hpp b/src/lib-app/include/app/AppStateEditor.hpp
@@ -16,13 +16,12 @@
 #include "utils/DependencyContainer.hpp"
 #include <DGM/dgm.hpp>
 #include <LevelMetadata.hpp>
+#include <Memory.hpp>
 #include <TGUI/Backend/SFML-Graphics.hpp>
 #include <TGUI/TGUI.hpp>
 #include <optional>
 #include <stack>
 
-import Memory;
-
 class [[nodiscard]] AppStateEditor final : public dgm::AppState
 {
 public:

diff --git a/src/lib-app/include/app/AppStateGameSetup.hpp b/src/lib-app/include/app/AppStateGameSetup.hpp
@@ -5,13 +5,12 @@
 #include "GuiState.hpp"
 #include "utils/DependencyContainer.hpp"
 #include <Dialogs/MapPickerDialog.hpp>
+#include <Memory.hpp>
 #include <TGUI/Backend/SFML-Graphics.hpp>
 #include <TGUI/TGUI.hpp>
 #include <dgm/classes/AppState.hpp>
 #include <dgm/classes/ResourceManager.hpp>
 
-import Memory;
-
 class [[nodiscard]] AppStateGameSetup final
     : public dgm::AppState
     , public GuiState

diff --git a/src/lib-app/include/app/AppStateIngame.hpp b/src/lib-app/include/app/AppStateIngame.hpp
@@ -8,21 +8,20 @@
 #include "engine/GameRulesEngine.hpp"
 #include "engine/PhysicsEngine.hpp"
 #include "engine/RenderingEngine.hpp"
+#include "utils/AppMessage.hpp"
+#include "utils/DemoFileHandler.hpp"
 #include "utils/DependencyContainer.hpp"
+#include <CoreTypes.hpp>
 #include <DGM/dgm.hpp>
 #include <GameLoop.hpp>
 #include <LevelD.hpp>
+#include <Memory.hpp>
 #include <TGUI/Backend/SFML-Graphics.hpp>
 #include <TGUI/TGUI.hpp>
 #include <core/Scene.hpp>
 #include <events/EventQueue.hpp>
-#include <utils/DemoFileHandler.hpp>
 #include <utils/RollbackManager.hpp>
 
-import AppMessage;
-import CoreTypes;
-import Memory;
-
 class [[nodiscard]] AppStateIngame final : public dgm::AppState
 {
 public:

diff --git a/src/lib-app/include/app/AppStateMainMenu.hpp b/src/lib-app/include/app/AppStateMainMenu.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-import Memory;
-
 #include "GuiState.hpp"
 #include "utils/DependencyContainer.hpp"
+#include <Memory.hpp>
 #include <vector>
 
 class [[nodiscard]] AppStateMainMenu final

diff --git a/src/lib-app/include/app/AppStateMapRotationWrapper.hpp b/src/lib-app/include/app/AppStateMapRotationWrapper.hpp
@@ -2,14 +2,13 @@
 
 #include "Client.hpp"
 #include "GameSettings.hpp"
+#include "utils/AppMessage.hpp"
 #include "utils/DependencyContainer.hpp"
+#include <Memory.hpp>
 #include <TGUI/Backend/SFML-Graphics.hpp>
 #include <TGUI/TGUI.hpp>
 #include <dgm/dgm.hpp>
 
-import AppMessage;
-import Memory;
-
 class [[nodiscard]] AppStateMapRotationWrapper final : public dgm::AppState
 {
 public:

diff --git a/src/lib-app/include/app/AppStateScoreTable.hpp b/src/lib-app/include/app/AppStateScoreTable.hpp
@@ -1,12 +1,11 @@
 #pragma once
 
-import Memory;
-
 #include "GameSettings.hpp"
 #include "GuiState.hpp"
 #include "utils/DependencyContainer.hpp"
 #include <DGM/classes/AppState.hpp>
 #include <DGM/classes/Traits.hpp>
+#include <Memory.hpp>
 #include <TGUI/Backend/SFML-Graphics.hpp>
 #include <TGUI/TGUI.hpp>
 

diff --git a/src/lib-app/include/app/AppStateServerWrapper.hpp b/src/lib-app/include/app/AppStateServerWrapper.hpp
@@ -1,13 +1,12 @@
+#include "utils/AppMessage.hpp"
 #include "utils/DependencyContainer.hpp"
 #include <DGM/dgm.hpp>
+#include <Memory.hpp>
 #include <TGUI/Backend/SFML-Graphics.hpp>
 #include <TGUI/TGUI.hpp>
 #include <atomic>
 #include <thread>
 
-import Memory;
-import AppMessage;
-
 enum class [[nodiscard]] ServerWrapperTarget
 {
     GameSetup,

diff --git a/src/lib-app/include/app/AppStateWinnerAnnounced.hpp b/src/lib-app/include/app/AppStateWinnerAnnounced.hpp
@@ -1,12 +1,11 @@
 #pragma once
 
-import Memory;
-
 #include "GameSettings.hpp"
 #include "GuiState.hpp"
 #include "utils/DependencyContainer.hpp"
 #include <DGM/classes/AppState.hpp>
 #include <DGM/classes/Traits.hpp>
+#include <Memory.hpp>
 #include <TGUI/Backend/SFML-Graphics.hpp>
 #include <TGUI/TGUI.hpp>
 
@@ -20,7 +19,6 @@ class [[nodiscard]] AppStateWinnerAnnounced final
         mem::Rc<DependencyContainer> dic,
         const GameOptions& gameSettings,
         dgm::UniversalReference<std::vector<int>> auto&& scores)
-        // TODO: should update underlying state as well
         : dgm::AppState(
             app, dgm::AppStateConfig { .shouldDrawUnderlyingState = true })
         , GuiState(dic)

diff --git a/src/lib-app/include/app/GuiState.hpp b/src/lib-app/include/app/GuiState.hpp
@@ -1,16 +1,15 @@
 #pragma once
 
+#include "utils/AppMessage.hpp"
 #include "utils/DependencyContainer.hpp"
 #include <Configs/Sizers.hpp>
 #include <Configs/Strings.hpp>
+#include <CoreTypes.hpp>
 #include <DGM/dgm.hpp>
+#include <Memory.hpp>
 #include <TGUI/Backend/SFML-Graphics.hpp>
 #include <TGUI/TGUI.hpp>
 
-import Memory;
-import AppMessage;
-import CoreTypes;
-
 class [[nodiscard]] GuiState
 {
 protected:
@@ -25,7 +24,7 @@ class [[nodiscard]] GuiState
 
     void buildLayout()
     {
-        dic->gui->gui.removeAllWidgets();
+        dic->gui->removeAllWidgets();
         buildLayoutImpl();
     }
 

diff --git a/src/lib-app/include/settings/GameTitle.hpp b/src/lib-app/include/settings/GameTitle.hpp
diff --git a/src/lib-app/include/settings/GameTitle.hpp.in b/src/lib-app/include/settings/GameTitle.hpp.in
diff --git a/src/lib-app/include/utils/AppMessage.hpp b/src/lib-app/include/utils/AppMessage.hpp
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <optional>
+#include <string>
+#include <typeinfo>
+#include <variant>
+
+template<class This>
+struct CanDeserializeFrom
+{
+    static [[nodiscard]] constexpr bool
+    canDeserializeFrom(const std::string& str) noexcept
+    {
+        return str == std::string_view(This::serialize());
+    }
+
+    static [[nodiscard]] constexpr const char* serialize() noexcept
+    {
+        return typeid(This).name();
+    }
+};
+
+struct [[nodiscard]] PopIfNotMainMenu final
+    : public CanDeserializeFrom<PopIfNotMainMenu>
+{
+};
+
+struct [[nodiscard]] PopIfPause final : public CanDeserializeFrom<PopIfPause>
+{
+};
+
+struct [[nodiscard]] PopIfNotMapRotationWrapper final
+    : public CanDeserializeFrom<PopIfNotMapRotationWrapper>
+{
+};
+
+using AppMessage =
+    std::variant<PopIfNotMainMenu, PopIfPause, PopIfNotMapRotationWrapper>;
+
+[[nodiscard]] std::optional<AppMessage>
+deserializeAppMessage(const std::string& str);
diff --git a/src/lib-app/include/utils/DependencyContainer.hpp b/src/lib-app/include/utils/DependencyContainer.hpp
@@ -6,8 +6,7 @@
 #include "Jukebox.hpp"
 #include "PhysicalController.hpp"
 #include <DGM/classes/ResourceManager.hpp>
-
-import Memory;
+#include <Memory.hpp>
 
 struct [[nodiscard]] DependencyContainer final
 {

diff --git a/src/lib-app/src/AppMessage.ixx b/src/lib-app/src/AppMessage.ixx
diff --git a/src/lib-app/src/app/AppStateEditor.cpp b/src/lib-app/src/app/AppStateEditor.cpp
@@ -4,13 +4,12 @@
 #include "Editor/Editor.hpp"
 #include "Editor/NullEditor.hpp"
 #include "app/AppStateIngame.hpp"
+#include <Filesystem.hpp>
 #include <LevelMetadata.hpp>
 #include <atomic>
 #include <cmath>
 #include <expected>
 
-import Resources;
-
 AppStateEditor::AppStateEditor(
     dgm::App& app,
     mem::Rc<DependencyContainer> dic,

diff --git a/src/lib-app/src/app/AppStateGameSetup.cpp b/src/lib-app/src/app/AppStateGameSetup.cpp
@@ -1,14 +1,13 @@
 #include "GuiBuilder.hpp"
 #include "LobbySettings.hpp"
 #include <Configs/Strings.hpp>
+#include <Filesystem.hpp>
 #include <LevelD.hpp>
 #include <app/AppStateGameSetup.hpp>
 #include <app/AppStateMapRotationWrapper.hpp>
 #include <atomic>
 #include <expected>
 
-import Resources;
-
 AppStateGameSetup::AppStateGameSetup(
     dgm::App& app, mem::Rc<DependencyContainer> dic) noexcept
     : AppState(app, dgm::AppStateConfig { .clearColor = sf::Color::White })

diff --git a/src/lib-app/src/app/AppStateMainMenu.cpp b/src/lib-app/src/app/AppStateMainMenu.cpp
@@ -4,15 +4,14 @@
 #include "Utilities/TguiHelper.hpp"
 #include "app/AppStateIngame.hpp"
 #include "app/AppStateMenuOptions.hpp"
-#include "settings/GameTitle.hpp"
 #include <app/AppStateServerWrapper.hpp>
 
 void AppStateMainMenu::buildLayoutImpl()
 {
     dic->gui->add(
         LayoutBuilder::withBackgroundImage(
             dic->resmgr->get<sf::Texture>("menu_title.png").value().get())
-            .withTitle("rend", HeadingLevel::H1)
+            .withTitle(Strings::TITLE, HeadingLevel::H1)
             .withContent(ButtonListBuilder()
                              .addButton(
                                  Strings::AppState::MainMenu::PLAY,

diff --git a/src/lib-app/src/app/AppStateMapRotationWrapper.cpp b/src/lib-app/src/app/AppStateMapRotationWrapper.cpp
@@ -1,10 +1,9 @@
 #include "GuiBuilder.hpp"
+#include <Filesystem.hpp>
 #include <LevelD.hpp>
 #include <app/AppStateIngame.hpp>
 #include <app/AppStateMapRotationWrapper.hpp>
 
-import Resources;
-
 AppStateMapRotationWrapper::AppStateMapRotationWrapper(
     dgm::App& app,
     mem::Rc<DependencyContainer> dic,