rename engine.hpp/cpp to Engine.hpp/cpp & move Engine, Time and mainloop classes to 'engine' folder

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()) {
-            while (loader.hasNext()) {
+            loader.loadNext();
-                loader.loadNext();
-            }
-        } catch (const assetload::error& err) {
-            new_assets.reset();
-            throw;
         }
     }
     assets = std::move(new_assets);

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"

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 <chrono>
 

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"

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"

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"

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"

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();

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), 

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;

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"

src/logic/EngineController.cpp

@@ -4,7 +4,7 @@
 #include <filesystem>
 #include <memory>
 
-#include "engine.hpp"
+#include "engine/Engine.hpp"
 #include "coders/commons.hpp"
 #include "debug/Logger.hpp"
 #include "content/ContentReport.hpp"

src/logic/LevelController.cpp

@@ -3,7 +3,7 @@
 #include <algorithm>
 
 #include "debug/Logger.hpp"
-#include "engine.hpp"
+#include "engine/Engine.hpp"
 #include "files/WorldFiles.hpp"
 #include "maths/voxmaths.hpp"
 #include "objects/Entities.hpp"

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";

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"
 

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"

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"

src/logic/scripting/lua/libs/libfile.cpp

@@ -3,7 +3,7 @@
 #include <set>
 
 #include "coders/gzip.hpp"
-#include "engine.hpp"
+#include "engine/Engine.hpp"
 #include "files/engine_paths.hpp"
 #include "files/files.hpp"
 #include "util/stringutil.hpp"

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;

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"

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"

src/logic/scripting/lua/libs/libinput.cpp

@@ -1,6 +1,6 @@
 #include <filesystem>
 
-#include "engine.hpp"
+#include "engine/Engine.hpp"
 #include "files/files.hpp"
 #include "frontend/hud.hpp"
 #include "frontend/screens/Screen.hpp"

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;

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"

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;
 

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;
 

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;

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"

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;

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;

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"

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"

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;

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"

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"

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;