From 5e76cdfadcd0b237326f7e64a5e4ab88b8dfab8a Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 25 Dec 2024 12:13:03 +0300 Subject: [PATCH] rename engine.hpp/cpp to Engine.hpp/cpp & move Engine, Time and mainloop classes to 'engine' folder --- src/{engine.cpp => engine/Engine.cpp} | 11 +++-------- src/{engine.hpp => engine/Engine.hpp} | 0 src/{ => engine}/Mainloop.cpp | 2 +- src/{ => engine}/Mainloop.hpp | 0 src/{ => engine}/PostRunnables.hpp | 0 src/{ => engine}/ServerMainloop.cpp | 2 +- src/{ => engine}/ServerMainloop.hpp | 0 src/{ => engine}/Time.hpp | 0 src/frontend/debug_panel.cpp | 2 +- src/frontend/hud.cpp | 2 +- src/frontend/menu.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/frontend/screens/MenuScreen.cpp | 2 +- src/frontend/screens/Screen.cpp | 2 +- src/graphics/render/Decorator.cpp | 2 +- src/graphics/render/WorldRenderer.cpp | 2 +- src/logic/EngineController.cpp | 2 +- src/logic/LevelController.cpp | 2 +- src/logic/scripting/lua/libs/libaudio.cpp | 2 +- src/logic/scripting/lua/libs/libconsole.cpp | 2 +- src/logic/scripting/lua/libs/libcore.cpp | 2 +- src/logic/scripting/lua/libs/libentity.cpp | 2 +- src/logic/scripting/lua/libs/libfile.cpp | 2 +- src/logic/scripting/lua/libs/libgeneration.cpp | 2 +- src/logic/scripting/lua/libs/libgui.cpp | 2 +- src/logic/scripting/lua/libs/libhud.cpp | 2 +- src/logic/scripting/lua/libs/libinput.cpp | 2 +- src/logic/scripting/lua/libs/libnetwork.cpp | 2 +- src/logic/scripting/lua/libs/libpack.cpp | 2 +- src/logic/scripting/lua/libs/libparticles.cpp | 2 +- src/logic/scripting/lua/libs/libtext3d.cpp | 2 +- src/logic/scripting/lua/libs/libtime.cpp | 2 +- src/logic/scripting/lua/libs/libworld.cpp | 2 +- src/logic/scripting/lua/lua_engine.cpp | 2 +- .../scripting/lua/usertypes/lua_type_heightmap.cpp | 2 +- src/logic/scripting/scripting.cpp | 2 +- src/logic/scripting/scripting_hud.cpp | 2 +- src/logic/scripting/scripting_world_generation.cpp | 2 +- src/main.cpp | 2 +- src/objects/Entities.cpp | 2 +- src/util/command_line.cpp | 2 +- 41 files changed, 38 insertions(+), 43 deletions(-) rename src/{engine.cpp => engine/Engine.cpp} (95%) rename src/{engine.hpp => engine/Engine.hpp} (100%) rename src/{ => engine}/Mainloop.cpp (98%) rename src/{ => engine}/Mainloop.hpp (100%) rename src/{ => engine}/PostRunnables.hpp (100%) rename src/{ => engine}/ServerMainloop.cpp (99%) rename src/{ => engine}/ServerMainloop.hpp (100%) rename src/{ => engine}/Time.hpp (100%) diff --git a/src/engine.cpp b/src/engine/Engine.cpp similarity index 95% rename from src/engine.cpp rename to src/engine/Engine.cpp index da69e75e..35caf40d 100644 --- a/src/engine.cpp +++ b/src/engine/Engine.cpp @@ -1,4 +1,4 @@ -#include "engine.hpp" +#include "Engine.hpp" #define GLEW_STATIC @@ -285,13 +285,8 @@ void Engine::loadAssets() { auto task = loader.startTask([=](){}); task->waitForEnd(); } else { - try { - while (loader.hasNext()) { - loader.loadNext(); - } - } catch (const assetload::error& err) { - new_assets.reset(); - throw; + while (loader.hasNext()) { + loader.loadNext(); } } assets = std::move(new_assets); diff --git a/src/engine.hpp b/src/engine/Engine.hpp similarity index 100% rename from src/engine.hpp rename to src/engine/Engine.hpp diff --git a/src/Mainloop.cpp b/src/engine/Mainloop.cpp similarity index 98% rename from src/Mainloop.cpp rename to src/engine/Mainloop.cpp index a12434ef..e0e64d10 100644 --- a/src/Mainloop.cpp +++ b/src/engine/Mainloop.cpp @@ -1,7 +1,7 @@ #include "Mainloop.hpp" +#include "Engine.hpp" #include "debug/Logger.hpp" -#include "engine.hpp" #include "frontend/screens/MenuScreen.hpp" #include "frontend/screens/LevelScreen.hpp" #include "window/Window.hpp" diff --git a/src/Mainloop.hpp b/src/engine/Mainloop.hpp similarity index 100% rename from src/Mainloop.hpp rename to src/engine/Mainloop.hpp diff --git a/src/PostRunnables.hpp b/src/engine/PostRunnables.hpp similarity index 100% rename from src/PostRunnables.hpp rename to src/engine/PostRunnables.hpp diff --git a/src/ServerMainloop.cpp b/src/engine/ServerMainloop.cpp similarity index 99% rename from src/ServerMainloop.cpp rename to src/engine/ServerMainloop.cpp index 2c88a06b..422172b4 100644 --- a/src/ServerMainloop.cpp +++ b/src/engine/ServerMainloop.cpp @@ -1,5 +1,6 @@ #include "ServerMainloop.hpp" +#include "Engine.hpp" #include "logic/scripting/scripting.hpp" #include "logic/LevelController.hpp" #include "interfaces/Process.hpp" @@ -7,7 +8,6 @@ #include "world/Level.hpp" #include "world/World.hpp" #include "util/platform.hpp" -#include "engine.hpp" #include diff --git a/src/ServerMainloop.hpp b/src/engine/ServerMainloop.hpp similarity index 100% rename from src/ServerMainloop.hpp rename to src/engine/ServerMainloop.hpp diff --git a/src/Time.hpp b/src/engine/Time.hpp similarity index 100% rename from src/Time.hpp rename to src/engine/Time.hpp diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index a5607803..00f0ee45 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -1,6 +1,6 @@ #include "audio/audio.hpp" #include "delegates.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "settings.hpp" #include "hud.hpp" #include "content/Content.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index f0535e14..a367227e 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -8,7 +8,7 @@ #include "content/Content.hpp" #include "core_defs.hpp" #include "delegates.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "graphics/core/Atlas.hpp" #include "graphics/core/Batch2D.hpp" #include "graphics/core/Batch3D.hpp" diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index 8a71b8ba..64f8affb 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -5,7 +5,7 @@ #include "screens/MenuScreen.hpp" #include "delegates.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "data/dv.hpp" #include "interfaces/Task.hpp" #include "files/engine_paths.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 5fc073b3..bb63e572 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -5,7 +5,7 @@ #include "content/Content.hpp" #include "core_defs.hpp" #include "debug/Logger.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "files/files.hpp" #include "frontend/LevelFrontend.hpp" #include "frontend/hud.hpp" diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp index ec75ac00..f16f73ee 100644 --- a/src/frontend/screens/MenuScreen.cpp +++ b/src/frontend/screens/MenuScreen.cpp @@ -8,7 +8,7 @@ #include "maths/UVRegion.hpp" #include "window/Window.hpp" #include "window/Camera.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" MenuScreen::MenuScreen(Engine& engine) : Screen(engine) { engine.resetContent(); diff --git a/src/frontend/screens/Screen.cpp b/src/frontend/screens/Screen.cpp index 16fde620..3fd64825 100644 --- a/src/frontend/screens/Screen.cpp +++ b/src/frontend/screens/Screen.cpp @@ -1,7 +1,7 @@ #include "Screen.hpp" #include "graphics/core/Batch2D.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" Screen::Screen(Engine& engine) : engine(engine), diff --git a/src/graphics/render/Decorator.cpp b/src/graphics/render/Decorator.cpp index c5d66ea8..c785098c 100644 --- a/src/graphics/render/Decorator.cpp +++ b/src/graphics/render/Decorator.cpp @@ -14,7 +14,7 @@ #include "objects/Players.hpp" #include "logic/LevelController.hpp" #include "util/stringutil.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "files/files.hpp" namespace fs = std::filesystem; diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 098cb8e8..e5456d90 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -11,7 +11,7 @@ #include "assets/Assets.hpp" #include "assets/assets_util.hpp" #include "content/Content.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "frontend/LevelFrontend.hpp" #include "frontend/ContentGfxCache.hpp" #include "items/Inventory.hpp" diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index 94a76862..a21325fe 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -4,7 +4,7 @@ #include #include -#include "engine.hpp" +#include "engine/Engine.hpp" #include "coders/commons.hpp" #include "debug/Logger.hpp" #include "content/ContentReport.hpp" diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp index 6e7fcca6..efe7ae0d 100644 --- a/src/logic/LevelController.cpp +++ b/src/logic/LevelController.cpp @@ -3,7 +3,7 @@ #include #include "debug/Logger.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "files/WorldFiles.hpp" #include "maths/voxmaths.hpp" #include "objects/Entities.hpp" diff --git a/src/logic/scripting/lua/libs/libaudio.cpp b/src/logic/scripting/lua/libs/libaudio.cpp index ee311585..aa7b0f8f 100644 --- a/src/logic/scripting/lua/libs/libaudio.cpp +++ b/src/logic/scripting/lua/libs/libaudio.cpp @@ -1,5 +1,5 @@ #include "audio/audio.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "api_lua.hpp" inline const char* DEFAULT_CHANNEL = "regular"; diff --git a/src/logic/scripting/lua/libs/libconsole.cpp b/src/logic/scripting/lua/libs/libconsole.cpp index 1e9168ef..295d264b 100644 --- a/src/logic/scripting/lua/libs/libconsole.cpp +++ b/src/logic/scripting/lua/libs/libconsole.cpp @@ -1,5 +1,5 @@ #include "coders/commons.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "logic/CommandsInterpreter.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libs/libcore.cpp b/src/logic/scripting/lua/libs/libcore.cpp index ac26bd47..af15df21 100644 --- a/src/logic/scripting/lua/libs/libcore.cpp +++ b/src/logic/scripting/lua/libs/libcore.cpp @@ -6,7 +6,7 @@ #include "constants.hpp" #include "content/Content.hpp" #include "debug/Logger.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "files/engine_paths.hpp" #include "files/files.hpp" #include "files/settings_io.hpp" diff --git a/src/logic/scripting/lua/libs/libentity.cpp b/src/logic/scripting/lua/libs/libentity.cpp index ce394fb5..211bf5b1 100644 --- a/src/logic/scripting/lua/libs/libentity.cpp +++ b/src/logic/scripting/lua/libs/libentity.cpp @@ -1,7 +1,7 @@ #include "libentity.hpp" #include "content/Content.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "objects/Entities.hpp" #include "objects/EntityDef.hpp" #include "objects/Player.hpp" diff --git a/src/logic/scripting/lua/libs/libfile.cpp b/src/logic/scripting/lua/libs/libfile.cpp index 6b35b11e..7fc70f46 100644 --- a/src/logic/scripting/lua/libs/libfile.cpp +++ b/src/logic/scripting/lua/libs/libfile.cpp @@ -3,7 +3,7 @@ #include #include "coders/gzip.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "files/engine_paths.hpp" #include "files/files.hpp" #include "util/stringutil.hpp" diff --git a/src/logic/scripting/lua/libs/libgeneration.cpp b/src/logic/scripting/lua/libs/libgeneration.cpp index dddca12e..90b681c3 100644 --- a/src/logic/scripting/lua/libs/libgeneration.cpp +++ b/src/logic/scripting/lua/libs/libgeneration.cpp @@ -6,7 +6,7 @@ #include "world/Level.hpp" #include "world/generator/VoxelFragment.hpp" #include "content/ContentLoader.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "../lua_custom_types.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libs/libgui.cpp b/src/logic/scripting/lua/libs/libgui.cpp index 2a485be7..97b5a8cc 100644 --- a/src/logic/scripting/lua/libs/libgui.cpp +++ b/src/logic/scripting/lua/libs/libgui.cpp @@ -1,5 +1,5 @@ #include "assets/Assets.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "frontend/UiDocument.hpp" #include "frontend/locale.hpp" #include "graphics/ui/elements/Button.hpp" diff --git a/src/logic/scripting/lua/libs/libhud.cpp b/src/logic/scripting/lua/libs/libhud.cpp index 90cb57d4..642121cf 100644 --- a/src/logic/scripting/lua/libs/libhud.cpp +++ b/src/logic/scripting/lua/libs/libhud.cpp @@ -3,7 +3,7 @@ #include "assets/Assets.hpp" #include "content/Content.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "frontend/UiDocument.hpp" #include "frontend/hud.hpp" #include "graphics/ui/elements/InventoryView.hpp" diff --git a/src/logic/scripting/lua/libs/libinput.cpp b/src/logic/scripting/lua/libs/libinput.cpp index 2c79afaa..4aac2976 100644 --- a/src/logic/scripting/lua/libs/libinput.cpp +++ b/src/logic/scripting/lua/libs/libinput.cpp @@ -1,6 +1,6 @@ #include -#include "engine.hpp" +#include "engine/Engine.hpp" #include "files/files.hpp" #include "frontend/hud.hpp" #include "frontend/screens/Screen.hpp" diff --git a/src/logic/scripting/lua/libs/libnetwork.cpp b/src/logic/scripting/lua/libs/libnetwork.cpp index dc752710..0cf7e538 100644 --- a/src/logic/scripting/lua/libs/libnetwork.cpp +++ b/src/logic/scripting/lua/libs/libnetwork.cpp @@ -1,6 +1,6 @@ #include "api_lua.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "network/Network.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libs/libpack.cpp b/src/logic/scripting/lua/libs/libpack.cpp index fdd9ae8a..c436ec4e 100644 --- a/src/logic/scripting/lua/libs/libpack.cpp +++ b/src/logic/scripting/lua/libs/libpack.cpp @@ -5,7 +5,7 @@ #include "assets/AssetsLoader.hpp" #include "content/Content.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "files/WorldFiles.hpp" #include "files/engine_paths.hpp" #include "world/Level.hpp" diff --git a/src/logic/scripting/lua/libs/libparticles.cpp b/src/logic/scripting/lua/libs/libparticles.cpp index ae2ed6d3..d3bccf76 100644 --- a/src/logic/scripting/lua/libs/libparticles.cpp +++ b/src/logic/scripting/lua/libs/libparticles.cpp @@ -5,7 +5,7 @@ #include "graphics/render/ParticlesRenderer.hpp" #include "graphics/render/Emitter.hpp" #include "assets/assets_util.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libs/libtext3d.cpp b/src/logic/scripting/lua/libs/libtext3d.cpp index 433a959e..f334c85f 100644 --- a/src/logic/scripting/lua/libs/libtext3d.cpp +++ b/src/logic/scripting/lua/libs/libtext3d.cpp @@ -4,7 +4,7 @@ #include "graphics/render/WorldRenderer.hpp" #include "graphics/render/TextsRenderer.hpp" #include "graphics/render/TextNote.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libs/libtime.cpp b/src/logic/scripting/lua/libs/libtime.cpp index 78952ede..988e403a 100644 --- a/src/logic/scripting/lua/libs/libtime.cpp +++ b/src/logic/scripting/lua/libs/libtime.cpp @@ -1,4 +1,4 @@ -#include "engine.hpp" +#include "engine/Engine.hpp" #include "api_lua.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libs/libworld.cpp b/src/logic/scripting/lua/libs/libworld.cpp index fbb7763b..1acc1ad7 100644 --- a/src/logic/scripting/lua/libs/libworld.cpp +++ b/src/logic/scripting/lua/libs/libworld.cpp @@ -7,7 +7,7 @@ #include "coders/compression.hpp" #include "coders/gzip.hpp" #include "coders/json.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "files/engine_paths.hpp" #include "files/files.hpp" #include "lighting/Lighting.hpp" diff --git a/src/logic/scripting/lua/lua_engine.cpp b/src/logic/scripting/lua/lua_engine.cpp index dca6ec69..e9b28ff6 100644 --- a/src/logic/scripting/lua/lua_engine.cpp +++ b/src/logic/scripting/lua/lua_engine.cpp @@ -9,7 +9,7 @@ #include "util/stringutil.hpp" #include "libs/api_lua.hpp" #include "lua_custom_types.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" static debug::Logger logger("lua-state"); static lua::State* main_thread = nullptr; diff --git a/src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp b/src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp index 67c32308..0db89634 100644 --- a/src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp +++ b/src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp @@ -12,7 +12,7 @@ #include "files/util.hpp" #include "graphics/core/ImageData.hpp" #include "maths/Heightmap.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "../lua_util.hpp" using namespace lua; diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 96e9f06e..9a6cc115 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -7,7 +7,7 @@ #include "content/Content.hpp" #include "content/ContentPack.hpp" #include "debug/Logger.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "files/engine_paths.hpp" #include "files/files.hpp" #include "frontend/UiDocument.hpp" diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp index 0ab5438d..75c063a4 100644 --- a/src/logic/scripting/scripting_hud.cpp +++ b/src/logic/scripting/scripting_hud.cpp @@ -1,7 +1,7 @@ #include "scripting_hud.hpp" #include "debug/Logger.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "files/files.hpp" #include "frontend/hud.hpp" #include "graphics/render/WorldRenderer.hpp" diff --git a/src/logic/scripting/scripting_world_generation.cpp b/src/logic/scripting/scripting_world_generation.cpp index d24eec66..1169b64f 100644 --- a/src/logic/scripting/scripting_world_generation.cpp +++ b/src/logic/scripting/scripting_world_generation.cpp @@ -14,7 +14,7 @@ #include "world/generator/GeneratorDef.hpp" #include "util/timeutil.hpp" #include "files/files.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "debug/Logger.hpp" using namespace lua; diff --git a/src/main.cpp b/src/main.cpp index b0d03412..c9732ca1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -#include "engine.hpp" +#include "engine/Engine.hpp" #include "util/platform.hpp" #include "util/command_line.hpp" #include "debug/Logger.hpp" diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index e047fdd4..441d340c 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -7,7 +7,7 @@ #include "content/Content.hpp" #include "data/dv_util.hpp" #include "debug/Logger.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" #include "graphics/core/DrawContext.hpp" #include "graphics/core/LineBatch.hpp" #include "graphics/commons/Model.hpp" diff --git a/src/util/command_line.cpp b/src/util/command_line.cpp index 25d7b554..483b0f8b 100644 --- a/src/util/command_line.cpp +++ b/src/util/command_line.cpp @@ -5,7 +5,7 @@ #include "files/engine_paths.hpp" #include "util/ArgsReader.hpp" -#include "engine.hpp" +#include "engine/Engine.hpp" namespace fs = std::filesystem;