From 5c9bc83bbde05c6012659685613fc29231007675 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 22:26:08 +0300 Subject: [PATCH] items/ + objects/ + util/ --- src/assets/AssetsLoader.cpp | 4 ++-- src/assets/assetload_funcs.cpp | 2 +- src/coders/GLSLExtension.cpp | 2 +- src/coders/commons.cpp | 2 +- src/coders/json.cpp | 2 +- src/coders/toml.cpp | 2 +- src/coders/xml.cpp | 2 +- src/content/Content.cpp | 6 +++--- src/content/ContentBuilder.cpp | 2 +- src/content/ContentBuilder.hpp | 4 ++-- src/content/ContentLUT.cpp | 2 +- src/content/ContentLoader.cpp | 8 ++++---- src/content/PacksManager.cpp | 2 +- src/core_defs.cpp | 2 +- src/data/setting.cpp | 2 +- src/engine.cpp | 6 +++--- src/engine.hpp | 2 +- src/files/WorldConverter.cpp | 4 ++-- src/files/WorldFiles.cpp | 10 +++++----- src/files/WorldRegions.cpp | 4 ++-- src/files/WorldRegions.hpp | 2 +- src/files/engine_paths.cpp | 2 +- src/files/files.cpp | 2 +- src/frontend/LevelFrontend.cpp | 2 +- src/frontend/debug_panel.cpp | 8 ++++---- src/frontend/hud.cpp | 10 +++++----- src/frontend/hud.hpp | 2 +- src/frontend/locale.cpp | 2 +- src/frontend/menu.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/frontend/screens/Screen.hpp | 2 +- src/graphics/render/ChunksRenderer.hpp | 2 +- src/graphics/render/WorldRenderer.cpp | 10 +++++----- src/graphics/ui/elements/InputBindBox.cpp | 2 +- src/graphics/ui/elements/InventoryView.cpp | 12 ++++++------ src/graphics/ui/elements/Label.cpp | 2 +- src/graphics/ui/elements/Plotter.cpp | 2 +- src/graphics/ui/elements/TextBox.cpp | 2 +- src/graphics/ui/gui_util.cpp | 2 +- src/graphics/ui/gui_xml.cpp | 4 ++-- src/items/ItemDef.cpp | 2 +- src/lighting/Lighting.cpp | 2 +- src/lighting/Lightmap.cpp | 2 +- src/logic/BlocksController.cpp | 6 +++--- src/logic/BlocksController.hpp | 2 +- src/logic/ChunksController.cpp | 2 +- src/logic/CommandsInterpreter.cpp | 2 +- src/logic/EngineController.cpp | 2 +- src/logic/LevelController.cpp | 2 +- src/logic/PlayerController.cpp | 10 +++++----- src/logic/PlayerController.hpp | 2 +- src/logic/scripting/lua/lib__rigidbody.cpp | 2 +- src/logic/scripting/lua/lib__skeleton.cpp | 2 +- src/logic/scripting/lua/libentity.cpp | 8 ++++---- src/logic/scripting/lua/libentity.hpp | 2 +- src/logic/scripting/lua/libfile.cpp | 2 +- src/logic/scripting/lua/libgui.cpp | 4 ++-- src/logic/scripting/lua/libhud.cpp | 6 +++--- src/logic/scripting/lua/libinput.cpp | 2 +- src/logic/scripting/lua/libinventory.cpp | 4 ++-- src/logic/scripting/lua/libitem.cpp | 2 +- src/logic/scripting/lua/libplayer.cpp | 6 +++--- src/logic/scripting/lua/lua_engine.cpp | 2 +- src/logic/scripting/lua/lua_util.cpp | 2 +- src/logic/scripting/scripting.cpp | 14 +++++++------- src/logic/scripting/scripting_functional.cpp | 2 +- src/logic/scripting/scripting_hud.cpp | 2 +- src/objects/Entities.cpp | 4 ++-- src/objects/Entities.hpp | 2 +- src/objects/Player.cpp | 6 +++--- src/util/listutil.cpp | 2 +- src/util/platform.cpp | 2 +- src/voxel_engine.cpp | 4 ++-- src/voxels/Block.cpp | 2 +- src/voxels/Chunk.cpp | 2 +- src/voxels/Chunks.cpp | 2 +- src/voxels/ChunksStorage.cpp | 4 ++-- src/window/Events.cpp | 2 +- src/window/Window.cpp | 2 +- src/window/input.hpp | 2 +- src/world/Level.cpp | 8 ++++---- src/world/World.cpp | 6 +++--- src/world/World.hpp | 2 +- 83 files changed, 146 insertions(+), 146 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index 07de43953..e824762b4 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -14,8 +14,8 @@ #include #include #include "../logic/scripting/scripting.hpp" -#include "../objects/rigging.hpp" -#include "../util/ThreadPool.hpp" +#include +#include #include "../voxels/Block.hpp" #include "Assets.hpp" #include "assetload_funcs.hpp" diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp index e1c36e6b7..6f61374c5 100644 --- a/src/assets/assetload_funcs.cpp +++ b/src/assets/assetload_funcs.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "../objects/rigging.hpp" +#include #include "Assets.hpp" #include "AssetsLoader.hpp" diff --git a/src/coders/GLSLExtension.cpp b/src/coders/GLSLExtension.cpp index 96f3ba155..fafd13f99 100644 --- a/src/coders/GLSLExtension.cpp +++ b/src/coders/GLSLExtension.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "../util/stringutil.hpp" +#include namespace fs = std::filesystem; diff --git a/src/coders/commons.cpp b/src/coders/commons.cpp index 36e10db5a..5da5659eb 100644 --- a/src/coders/commons.cpp +++ b/src/coders/commons.cpp @@ -5,7 +5,7 @@ #include #include -#include "../util/stringutil.hpp" +#include inline double power(double base, int64_t power) { double result = 1.0; diff --git a/src/coders/json.cpp b/src/coders/json.cpp index 102840ec0..654de28be 100644 --- a/src/coders/json.cpp +++ b/src/coders/json.cpp @@ -7,7 +7,7 @@ #include #include "../data/dynamic.hpp" -#include "../util/stringutil.hpp" +#include #include "commons.hpp" using namespace json; diff --git a/src/coders/toml.cpp b/src/coders/toml.cpp index a1b8fe107..cebaabd49 100644 --- a/src/coders/toml.cpp +++ b/src/coders/toml.cpp @@ -9,7 +9,7 @@ #include "../data/dynamic.hpp" #include "../data/setting.hpp" #include -#include "../util/stringutil.hpp" +#include #include "commons.hpp" using namespace toml; diff --git a/src/coders/xml.cpp b/src/coders/xml.cpp index 15d1f9b42..647ad4b66 100644 --- a/src/coders/xml.cpp +++ b/src/coders/xml.cpp @@ -5,7 +5,7 @@ #include #include -#include "../util/stringutil.hpp" +#include using namespace xml; diff --git a/src/content/Content.cpp b/src/content/Content.cpp index 0171f27ac..8fb6a0e85 100644 --- a/src/content/Content.cpp +++ b/src/content/Content.cpp @@ -5,10 +5,10 @@ #include #include -#include "../items/ItemDef.hpp" +#include #include "../logic/scripting/scripting.hpp" -#include "../objects/EntityDef.hpp" -#include "../objects/rigging.hpp" +#include +#include #include "../voxels/Block.hpp" #include "ContentPack.hpp" diff --git a/src/content/ContentBuilder.cpp b/src/content/ContentBuilder.cpp index 0d94b61ed..f68af5d3f 100644 --- a/src/content/ContentBuilder.cpp +++ b/src/content/ContentBuilder.cpp @@ -1,6 +1,6 @@ #include "ContentBuilder.hpp" -#include "../objects/rigging.hpp" +#include ContentBuilder::~ContentBuilder() = default; diff --git a/src/content/ContentBuilder.hpp b/src/content/ContentBuilder.hpp index 7c228b25f..335236ab8 100644 --- a/src/content/ContentBuilder.hpp +++ b/src/content/ContentBuilder.hpp @@ -7,8 +7,8 @@ #include "Content.hpp" #include "ContentPack.hpp" -#include "../items/ItemDef.hpp" -#include "../objects/EntityDef.hpp" +#include +#include #include "../voxels/Block.hpp" template diff --git a/src/content/ContentLUT.cpp b/src/content/ContentLUT.cpp index 5e3d80d42..f6bacab16 100644 --- a/src/content/ContentLUT.cpp +++ b/src/content/ContentLUT.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "../items/ItemDef.hpp" +#include #include "../voxels/Block.hpp" #include "Content.hpp" diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index 49d4eace1..932e8c14f 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -11,12 +11,12 @@ #include "../data/dynamic.hpp" #include #include -#include "../items/ItemDef.hpp" +#include #include "../logic/scripting/scripting.hpp" -#include "../objects/rigging.hpp" +#include #include -#include "../util/listutil.hpp" -#include "../util/stringutil.hpp" +#include +#include #include "../voxels/Block.hpp" #include "Content.hpp" #include "ContentBuilder.hpp" diff --git a/src/content/PacksManager.cpp b/src/content/PacksManager.cpp index 76a98e3ba..5934feb3e 100644 --- a/src/content/PacksManager.cpp +++ b/src/content/PacksManager.cpp @@ -3,7 +3,7 @@ #include #include -#include "../util/listutil.hpp" +#include PacksManager::PacksManager() = default; diff --git a/src/core_defs.cpp b/src/core_defs.cpp index 3cd0bcabc..b1ad11cb2 100644 --- a/src/core_defs.cpp +++ b/src/core_defs.cpp @@ -1,6 +1,6 @@ #include "core_defs.hpp" -#include "items/ItemDef.hpp" +#include #include #include #include diff --git a/src/data/setting.cpp b/src/data/setting.cpp index b6a9bbf7e..397caf245 100644 --- a/src/data/setting.cpp +++ b/src/data/setting.cpp @@ -1,6 +1,6 @@ #include "setting.hpp" -#include "../util/stringutil.hpp" +#include std::string NumberSetting::toString() const { switch (getFormat()) { diff --git a/src/engine.cpp b/src/engine.cpp index bbd15e6a7..5451856a4 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -24,12 +24,12 @@ #include #include #include -#include "objects/rigging.hpp" +#include #include "logic/EngineController.hpp" #include "logic/CommandsInterpreter.hpp" #include "logic/scripting/scripting.hpp" -#include "util/listutil.hpp" -#include "util/platform.hpp" +#include +#include #include "voxels/DefaultWorldGenerator.hpp" #include "voxels/FlatWorldGenerator.hpp" #include "window/Camera.hpp" diff --git a/src/engine.hpp b/src/engine.hpp index bb7769cea..b90076994 100644 --- a/src/engine.hpp +++ b/src/engine.hpp @@ -9,7 +9,7 @@ #include #include #include -#include "util/ObjectsKeeper.hpp" +#include #include #include diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp index 14117ebc4..2f07f7a93 100644 --- a/src/files/WorldConverter.cpp +++ b/src/files/WorldConverter.cpp @@ -9,8 +9,8 @@ #include "../data/dynamic.hpp" #include #include -#include "../objects/Player.hpp" -#include "../util/ThreadPool.hpp" +#include +#include #include "../voxels/Chunk.hpp" #include "WorldFiles.hpp" diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 4faac6675..1c8840147 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -15,16 +15,16 @@ #include #include "../data/dynamic.hpp" #include -#include "../items/Inventory.hpp" -#include "../items/ItemDef.hpp" +#include +#include #include "../lighting/Lightmap.hpp" #include "../maths/voxmaths.hpp" -#include "../objects/EntityDef.hpp" -#include "../objects/Player.hpp" +#include +#include #include "../physics/Hitbox.hpp" #include #include -#include "../util/data_io.hpp" +#include #include "../voxels/Block.hpp" #include "../voxels/Chunk.hpp" #include "../voxels/voxel.hpp" diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp index f58526751..77dfe0d16 100644 --- a/src/files/WorldRegions.cpp +++ b/src/files/WorldRegions.cpp @@ -7,9 +7,9 @@ #include #include #include "../data/dynamic.hpp" -#include "../items/Inventory.hpp" +#include #include "../maths/voxmaths.hpp" -#include "../util/data_io.hpp" +#include #define REGION_FORMAT_MAGIC ".VOXREG" diff --git a/src/files/WorldRegions.hpp b/src/files/WorldRegions.hpp index 971438a6d..2477ff617 100644 --- a/src/files/WorldRegions.hpp +++ b/src/files/WorldRegions.hpp @@ -11,7 +11,7 @@ #include "../data/dynamic_fwd.hpp" #include -#include "../util/BufferPool.hpp" +#include #include "../voxels/Chunk.hpp" #include "files.hpp" #define GLM_ENABLE_EXPERIMENTAL diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp index dbcd41ff0..e4917e82e 100644 --- a/src/files/engine_paths.cpp +++ b/src/files/engine_paths.cpp @@ -7,7 +7,7 @@ #include #include -#include "../util/stringutil.hpp" +#include #include "WorldFiles.hpp" const fs::path SCREENSHOTS_FOLDER {"screenshots"}; diff --git a/src/files/files.cpp b/src/files/files.cpp index 469feec70..d5b9939d4 100644 --- a/src/files/files.cpp +++ b/src/files/files.cpp @@ -12,7 +12,7 @@ #include #include #include "../data/dynamic.hpp" -#include "../util/stringutil.hpp" +#include namespace fs = std::filesystem; diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index 6a0521eac..70bf0f6ff 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -9,7 +9,7 @@ #include #include "../logic/LevelController.hpp" #include "../logic/PlayerController.hpp" -#include "../objects/Player.hpp" +#include #include "../voxels/Block.hpp" #include "../world/Level.hpp" diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index 49f7a9b55..d74612375 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -10,11 +10,11 @@ #include #include #include "../logic/scripting/scripting.hpp" -#include "../objects/Player.hpp" -#include "../objects/Entities.hpp" -#include "../objects/EntityDef.hpp" +#include +#include +#include #include "../physics/Hitbox.hpp" -#include "../util/stringutil.hpp" +#include #include "../voxels/Block.hpp" #include "../voxels/Chunk.hpp" #include "../voxels/Chunks.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index e8fbbb951..d056a3b1c 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -25,15 +25,15 @@ #include #include #include -#include "../items/Inventories.hpp" -#include "../items/Inventory.hpp" -#include "../items/ItemDef.hpp" +#include +#include +#include #include "../logic/scripting/scripting.hpp" #include "../maths/voxmaths.hpp" -#include "../objects/Player.hpp" +#include #include "../physics/Hitbox.hpp" #include -#include "../util/stringutil.hpp" +#include #include "../voxels/Block.hpp" #include "../voxels/Chunk.hpp" #include "../voxels/Chunks.hpp" diff --git a/src/frontend/hud.hpp b/src/frontend/hud.hpp index 0f58d2b6f..a47303d1a 100644 --- a/src/frontend/hud.hpp +++ b/src/frontend/hud.hpp @@ -2,7 +2,7 @@ #define FRONTEND_HUD_HPP_ #include -#include "../util/ObjectsKeeper.hpp" +#include #include #include diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp index 18d13ce15..4a5bba124 100644 --- a/src/frontend/locale.cpp +++ b/src/frontend/locale.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "../util/stringutil.hpp" +#include #include "../data/dynamic.hpp" #include diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index 858969d84..40e0988f6 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -15,7 +15,7 @@ #include "../logic/scripting/scripting.hpp" #include #include -#include "../util/stringutil.hpp" +#include #include "../window/Window.hpp" #include diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 779ef4f36..3e936db0d 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -18,7 +18,7 @@ #include #include "../../logic/LevelController.hpp" #include "../../logic/scripting/scripting_hud.hpp" -#include "../../util/stringutil.hpp" +#include #include "../../physics/Hitbox.hpp" #include "../../voxels/Chunks.hpp" #include "../../window/Camera.hpp" diff --git a/src/frontend/screens/Screen.hpp b/src/frontend/screens/Screen.hpp index 6b283165b..4e6f31204 100644 --- a/src/frontend/screens/Screen.hpp +++ b/src/frontend/screens/Screen.hpp @@ -1,7 +1,7 @@ #ifndef FRONTEND_SCREENS_SCREEN_HPP_ #define FRONTEND_SCREENS_SCREEN_HPP_ -#include "../../util/ObjectsKeeper.hpp" +#include class Engine; class Batch2D; diff --git a/src/graphics/render/ChunksRenderer.hpp b/src/graphics/render/ChunksRenderer.hpp index 1eac41855..5789510f3 100644 --- a/src/graphics/render/ChunksRenderer.hpp +++ b/src/graphics/render/ChunksRenderer.hpp @@ -9,7 +9,7 @@ #include "../../voxels/Block.hpp" #include "../../voxels/ChunksStorage.hpp" -#include "../../util/ThreadPool.hpp" +#include class Mesh; class Chunk; diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 3665ba676..bd43f582d 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -12,15 +12,15 @@ #include #include #include "../../frontend/LevelFrontend.hpp" -#include "../../items/Inventory.hpp" -#include "../../items/ItemDef.hpp" -#include "../../items/ItemStack.hpp" +#include +#include +#include #include "../../logic/PlayerController.hpp" #include "../../logic/scripting/scripting_hud.hpp" #include "../../maths/FrustumCulling.hpp" #include "../../maths/voxmaths.hpp" -#include "../../objects/Entities.hpp" -#include "../../objects/Player.hpp" +#include +#include #include #include "../../voxels/Block.hpp" #include "../../voxels/Chunk.hpp" diff --git a/src/graphics/ui/elements/InputBindBox.cpp b/src/graphics/ui/elements/InputBindBox.cpp index 5d9b62e03..f740b0154 100644 --- a/src/graphics/ui/elements/InputBindBox.cpp +++ b/src/graphics/ui/elements/InputBindBox.cpp @@ -3,7 +3,7 @@ #include "Label.hpp" #include #include -#include "../../../util/stringutil.hpp" +#include using namespace gui; diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 5946c95f4..50ec2c87f 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -4,14 +4,14 @@ #include #include "../../../frontend/LevelFrontend.hpp" #include "../../../frontend/locale.hpp" -#include "../../../items/Inventories.hpp" -#include "../../../items/Inventory.hpp" -#include "../../../items/ItemDef.hpp" -#include "../../../items/ItemStack.hpp" +#include +#include +#include +#include #include "../../../logic/scripting/scripting.hpp" #include "../../../maths/voxmaths.hpp" -#include "../../../objects/Player.hpp" -#include "../../../util/stringutil.hpp" +#include +#include #include "../../../voxels/Block.hpp" #include "../../../window/Events.hpp" #include "../../../window/input.hpp" diff --git a/src/graphics/ui/elements/Label.cpp b/src/graphics/ui/elements/Label.cpp index 313db6625..98a1a6c35 100644 --- a/src/graphics/ui/elements/Label.cpp +++ b/src/graphics/ui/elements/Label.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "../../../util/stringutil.hpp" +#include using namespace gui; diff --git a/src/graphics/ui/elements/Plotter.cpp b/src/graphics/ui/elements/Plotter.cpp index 3dcbc9bed..5a9e9b30a 100644 --- a/src/graphics/ui/elements/Plotter.cpp +++ b/src/graphics/ui/elements/Plotter.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "../../../util/stringutil.hpp" +#include using namespace gui; diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp index 86ed2123a..a27ea0288 100644 --- a/src/graphics/ui/elements/TextBox.cpp +++ b/src/graphics/ui/elements/TextBox.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "../../../util/stringutil.hpp" +#include #include "../../../window/Events.hpp" #include "../../../window/Window.hpp" diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp index 70e441cb2..452be7ef2 100644 --- a/src/graphics/ui/gui_util.cpp +++ b/src/graphics/ui/gui_util.cpp @@ -7,7 +7,7 @@ #include "../../logic/scripting/scripting.hpp" #include "../../frontend/locale.hpp" -#include "../../util/stringutil.hpp" +#include #include #include diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp index 8c61e2e8a..cc35ae217 100644 --- a/src/graphics/ui/gui_xml.cpp +++ b/src/graphics/ui/gui_xml.cpp @@ -12,10 +12,10 @@ #include "../../frontend/menu.hpp" #include "../../frontend/locale.hpp" -#include "../../items/Inventory.hpp" +#include #include "../../logic/scripting/scripting.hpp" #include "../../maths/voxmaths.hpp" -#include "../../util/stringutil.hpp" +#include #include "../../window/Events.hpp" #include diff --git a/src/items/ItemDef.cpp b/src/items/ItemDef.cpp index 22c480481..872fe022f 100644 --- a/src/items/ItemDef.cpp +++ b/src/items/ItemDef.cpp @@ -1,6 +1,6 @@ #include "ItemDef.hpp" -#include "../util/stringutil.hpp" +#include ItemDef::ItemDef(const std::string& name) : name(name) { caption = util::id_to_caption(name); diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp index 63f2407d4..52f54c493 100644 --- a/src/lighting/Lighting.cpp +++ b/src/lighting/Lighting.cpp @@ -7,7 +7,7 @@ #include "../voxels/voxel.hpp" #include "../voxels/Block.hpp" #include -#include "../util/timeutil.hpp" +#include #include diff --git a/src/lighting/Lightmap.cpp b/src/lighting/Lightmap.cpp index 14d7f5529..e47b5e5e8 100644 --- a/src/lighting/Lightmap.cpp +++ b/src/lighting/Lightmap.cpp @@ -1,6 +1,6 @@ #include "Lightmap.hpp" -#include "../util/data_io.hpp" +#include #include diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp index 9bc659e2d..973601641 100644 --- a/src/logic/BlocksController.cpp +++ b/src/logic/BlocksController.cpp @@ -1,11 +1,11 @@ #include "BlocksController.hpp" #include -#include "../items/Inventories.hpp" -#include "../items/Inventory.hpp" +#include +#include #include "../lighting/Lighting.hpp" #include "../maths/fastmaths.hpp" -#include "../util/timeutil.hpp" +#include #include "../voxels/Block.hpp" #include "../voxels/Chunk.hpp" #include "../voxels/Chunks.hpp" diff --git a/src/logic/BlocksController.hpp b/src/logic/BlocksController.hpp index 6243f0814..d2760703f 100644 --- a/src/logic/BlocksController.hpp +++ b/src/logic/BlocksController.hpp @@ -6,7 +6,7 @@ #include "../maths/fastmaths.hpp" #include -#include "../util/Clock.hpp" +#include #include "../voxels/voxel.hpp" class Player; diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index a1e3b71f9..8d35a5b36 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -10,7 +10,7 @@ #include #include "../lighting/Lighting.hpp" #include "../maths/voxmaths.hpp" -#include "../util/timeutil.hpp" +#include #include "../voxels/Block.hpp" #include "../voxels/Chunk.hpp" #include "../voxels/Chunks.hpp" diff --git a/src/logic/CommandsInterpreter.cpp b/src/logic/CommandsInterpreter.cpp index a197cb4ac..7e715caa3 100644 --- a/src/logic/CommandsInterpreter.cpp +++ b/src/logic/CommandsInterpreter.cpp @@ -4,7 +4,7 @@ #include #include -#include "../util/stringutil.hpp" +#include using namespace cmd; diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index a2b49cd63..346b1220c 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -17,7 +17,7 @@ #include #include #include "../interfaces/Task.hpp" -#include "../util/stringutil.hpp" +#include #include "../world/Level.hpp" #include "../world/World.hpp" #include "LevelController.hpp" diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp index 695e22f29..01b778ddc 100644 --- a/src/logic/LevelController.cpp +++ b/src/logic/LevelController.cpp @@ -5,7 +5,7 @@ #include #include #include "../interfaces/Object.hpp" -#include "../objects/Entities.hpp" +#include #include "../physics/Hitbox.hpp" #include #include "../world/Level.hpp" diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 86cd1fc36..11adefcd2 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -6,12 +6,12 @@ #include #include -#include "../items/Inventory.hpp" -#include "../items/ItemDef.hpp" -#include "../items/ItemStack.hpp" +#include +#include +#include #include "../lighting/Lighting.hpp" -#include "../objects/Entities.hpp" -#include "../objects/Player.hpp" +#include +#include #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" #include diff --git a/src/logic/PlayerController.hpp b/src/logic/PlayerController.hpp index e115e97cb..f8b133954 100644 --- a/src/logic/PlayerController.hpp +++ b/src/logic/PlayerController.hpp @@ -5,7 +5,7 @@ #include #include -#include "../objects/Player.hpp" +#include class Camera; class Level; diff --git a/src/logic/scripting/lua/lib__rigidbody.cpp b/src/logic/scripting/lua/lib__rigidbody.cpp index 5175a36ff..b9f6f7826 100644 --- a/src/logic/scripting/lua/lib__rigidbody.cpp +++ b/src/logic/scripting/lua/lib__rigidbody.cpp @@ -1,4 +1,4 @@ -#include "../../../util/stringutil.hpp" +#include #include "libentity.hpp" static int l_get_vel(lua::State* L) { diff --git a/src/logic/scripting/lua/lib__skeleton.cpp b/src/logic/scripting/lua/lib__skeleton.cpp index 8ce77c988..041183edd 100644 --- a/src/logic/scripting/lua/lib__skeleton.cpp +++ b/src/logic/scripting/lua/lib__skeleton.cpp @@ -1,4 +1,4 @@ -#include "../../../objects/rigging.hpp" +#include #include "libentity.hpp" static int index_range_check( diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libentity.cpp index 90152d1bb..9e92c3f75 100644 --- a/src/logic/scripting/lua/libentity.cpp +++ b/src/logic/scripting/lua/libentity.cpp @@ -2,10 +2,10 @@ #include #include -#include "../../../objects/Entities.hpp" -#include "../../../objects/EntityDef.hpp" -#include "../../../objects/Player.hpp" -#include "../../../objects/rigging.hpp" +#include +#include +#include +#include #include "../../../physics/Hitbox.hpp" #include "../../../voxels/Chunks.hpp" #include "../../../window/Camera.hpp" diff --git a/src/logic/scripting/lua/libentity.hpp b/src/logic/scripting/lua/libentity.hpp index 724aaefb4..be944c2e7 100644 --- a/src/logic/scripting/lua/libentity.hpp +++ b/src/logic/scripting/lua/libentity.hpp @@ -4,7 +4,7 @@ #include #include "../../../frontend/hud.hpp" -#include "../../../objects/Entities.hpp" +#include #include "../../../world/Level.hpp" #include "../../LevelController.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libfile.cpp index 9c8c647d9..2066cb8ce 100644 --- a/src/logic/scripting/lua/libfile.cpp +++ b/src/logic/scripting/lua/libfile.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "../../../util/stringutil.hpp" +#include #include "api_lua.hpp" namespace fs = std::filesystem; diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp index e79d60306..202d6da9c 100644 --- a/src/logic/scripting/lua/libgui.cpp +++ b/src/logic/scripting/lua/libgui.cpp @@ -12,8 +12,8 @@ #include #include #include -#include "../../../items/Inventories.hpp" -#include "../../../util/stringutil.hpp" +#include +#include #include "../../../world/Level.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index 9aec8325b..cf5beae4b 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -7,10 +7,10 @@ #include "../../../frontend/UiDocument.hpp" #include "../../../frontend/hud.hpp" #include -#include "../../../items/Inventories.hpp" +#include #include "../../../logic/BlocksController.hpp" -#include "../../../objects/Player.hpp" -#include "../../../util/stringutil.hpp" +#include +#include #include "../../../voxels/Block.hpp" #include "../../../voxels/Chunks.hpp" #include "../../../voxels/voxel.hpp" diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libinput.cpp index 3a7980d0b..bba163cf4 100644 --- a/src/logic/scripting/lua/libinput.cpp +++ b/src/logic/scripting/lua/libinput.cpp @@ -2,7 +2,7 @@ #include "../../../frontend/hud.hpp" #include "../../../frontend/screens/Screen.hpp" #include -#include "../../../util/stringutil.hpp" +#include #include "../../../window/Events.hpp" #include "../../../window/input.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libinventory.cpp b/src/logic/scripting/lua/libinventory.cpp index fd7cc14bd..df37daa6a 100644 --- a/src/logic/scripting/lua/libinventory.cpp +++ b/src/logic/scripting/lua/libinventory.cpp @@ -1,6 +1,6 @@ #include -#include "../../../items/Inventories.hpp" -#include "../../../items/ItemStack.hpp" +#include +#include #include "../../../logic/BlocksController.hpp" #include "../../../world/Level.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libitem.cpp b/src/logic/scripting/lua/libitem.cpp index e720c691e..5e203fa86 100644 --- a/src/logic/scripting/lua/libitem.cpp +++ b/src/logic/scripting/lua/libitem.cpp @@ -1,5 +1,5 @@ #include -#include "../../../items/ItemDef.hpp" +#include #include "api_lua.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libplayer.cpp b/src/logic/scripting/lua/libplayer.cpp index d11e7d350..bb22926f3 100644 --- a/src/logic/scripting/lua/libplayer.cpp +++ b/src/logic/scripting/lua/libplayer.cpp @@ -1,9 +1,9 @@ #include #include -#include "../../../items/Inventory.hpp" -#include "../../../objects/Entities.hpp" -#include "../../../objects/Player.hpp" +#include +#include +#include #include "../../../physics/Hitbox.hpp" #include "../../../window/Camera.hpp" #include "../../../world/Level.hpp" diff --git a/src/logic/scripting/lua/lua_engine.cpp b/src/logic/scripting/lua/lua_engine.cpp index 755f6476b..7ae59f102 100644 --- a/src/logic/scripting/lua/lua_engine.cpp +++ b/src/logic/scripting/lua/lua_engine.cpp @@ -4,7 +4,7 @@ #include #include -#include "../../../util/stringutil.hpp" +#include #include "api_lua.hpp" #include "lua_custom_types.hpp" diff --git a/src/logic/scripting/lua/lua_util.cpp b/src/logic/scripting/lua/lua_util.cpp index 50069cad7..25c51caa4 100644 --- a/src/logic/scripting/lua/lua_util.cpp +++ b/src/logic/scripting/lua/lua_util.cpp @@ -3,7 +3,7 @@ #include #include -#include "../../../util/stringutil.hpp" +#include using namespace lua; diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index b63d4365d..d0d43ff71 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -10,15 +10,15 @@ #include #include #include "../../frontend/UiDocument.hpp" -#include "../../items/Inventory.hpp" -#include "../../items/ItemDef.hpp" +#include +#include #include "../../logic/BlocksController.hpp" #include "../../logic/LevelController.hpp" -#include "../../objects/Entities.hpp" -#include "../../objects/EntityDef.hpp" -#include "../../objects/Player.hpp" -#include "../../util/stringutil.hpp" -#include "../../util/timeutil.hpp" +#include +#include +#include +#include +#include #include "../../voxels/Block.hpp" #include "../../world/Level.hpp" #include "lua/lua_engine.hpp" diff --git a/src/logic/scripting/scripting_functional.cpp b/src/logic/scripting/scripting_functional.cpp index 5f235d6c1..9f7e294eb 100644 --- a/src/logic/scripting/scripting_functional.cpp +++ b/src/logic/scripting/scripting_functional.cpp @@ -2,7 +2,7 @@ #include #include -#include "../../util/stringutil.hpp" +#include #include "lua/lua_engine.hpp" using namespace scripting; diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp index b86902a6b..b48ab897b 100644 --- a/src/logic/scripting/scripting_hud.cpp +++ b/src/logic/scripting/scripting_hud.cpp @@ -4,7 +4,7 @@ #include #include #include "../../frontend/hud.hpp" -#include "../../objects/Player.hpp" +#include #include "lua/api_lua.hpp" #include "lua/lua_engine.hpp" #include "scripting.hpp" diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index e9b83fb54..f7c13d873 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -15,8 +15,8 @@ #include "../logic/scripting/scripting.hpp" #include "../maths/FrustumCulling.hpp" #include "../maths/rays.hpp" -#include "../objects/EntityDef.hpp" -#include "../objects/rigging.hpp" +#include "EntityDef.hpp" +#include "rigging.hpp" #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" #include "../world/Level.hpp" diff --git a/src/objects/Entities.hpp b/src/objects/Entities.hpp index 6cf739e07..3e882554f 100644 --- a/src/objects/Entities.hpp +++ b/src/objects/Entities.hpp @@ -9,7 +9,7 @@ #include "../data/dynamic.hpp" #include "../physics/Hitbox.hpp" #include -#include "../util/Clock.hpp" +#include #define GLM_ENABLE_EXPERIMENTAL #include #include diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index 6f0ff3195..a9f3a9a76 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -5,9 +5,9 @@ #include #include -#include "../items/Inventory.hpp" -#include "../objects/Entities.hpp" -#include "../objects/rigging.hpp" +#include +#include "Entities.hpp" +#include "rigging.hpp" #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" #include "../voxels/Chunks.hpp" diff --git a/src/util/listutil.cpp b/src/util/listutil.cpp index ccbe0d15c..97d24aa61 100644 --- a/src/util/listutil.cpp +++ b/src/util/listutil.cpp @@ -2,7 +2,7 @@ #include -#include "../util/stringutil.hpp" +#include "stringutil.hpp" std::string util::to_string(const std::vector& vec) { std::stringstream ss; diff --git a/src/util/platform.cpp b/src/util/platform.cpp index 00e64b12d..9f50d97d7 100644 --- a/src/util/platform.cpp +++ b/src/util/platform.cpp @@ -11,7 +11,7 @@ #ifdef _WIN32 #include -#include "./stringutil.hpp" +#include "stringutil.hpp" void platform::configure_encoding() { // set utf-8 encoding to console output diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index af0cc60c0..584f6214b 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -2,8 +2,8 @@ #include #include #include -#include "util/platform.hpp" -#include "util/command_line.hpp" +#include +#include #include #include diff --git a/src/voxels/Block.cpp b/src/voxels/Block.cpp index d9ab6461f..0586ac1c4 100644 --- a/src/voxels/Block.cpp +++ b/src/voxels/Block.cpp @@ -3,7 +3,7 @@ #include #include -#include "../util/stringutil.hpp" +#include std::string to_string(BlockModel model) { switch (model) { diff --git a/src/voxels/Chunk.cpp b/src/voxels/Chunk.cpp index 3201be09b..85f9f30e0 100644 --- a/src/voxels/Chunk.cpp +++ b/src/voxels/Chunk.cpp @@ -3,7 +3,7 @@ #include #include -#include "../items/Inventory.hpp" +#include #include "../lighting/Lightmap.hpp" #include "voxel.hpp" diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index 6a3a79e55..34b70f1d5 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -15,7 +15,7 @@ #include "../maths/aabb.hpp" #include "../maths/rays.hpp" #include "../maths/voxmaths.hpp" -#include "../objects/Entities.hpp" +#include #include "../world/Level.hpp" #include "../world/LevelEvents.hpp" #include "Block.hpp" diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp index f3c91df13..aa92d57da 100644 --- a/src/voxels/ChunksStorage.cpp +++ b/src/voxels/ChunksStorage.cpp @@ -3,10 +3,10 @@ #include #include #include -#include "../items/Inventories.hpp" +#include #include "../lighting/Lightmap.hpp" #include "../maths/voxmaths.hpp" -#include "../objects/Entities.hpp" +#include #include #include "../world/Level.hpp" #include "../world/World.hpp" diff --git a/src/window/Events.cpp b/src/window/Events.cpp index d4c018e90..a99818ffc 100644 --- a/src/window/Events.cpp +++ b/src/window/Events.cpp @@ -5,7 +5,7 @@ #include #include -#include "../util/stringutil.hpp" +#include #include "Window.hpp" static debug::Logger logger("events"); diff --git a/src/window/Window.cpp b/src/window/Window.cpp index 028706cf0..af9d4de5d 100644 --- a/src/window/Window.cpp +++ b/src/window/Window.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "../util/ObjectsKeeper.hpp" +#include #include "Events.hpp" static debug::Logger logger("window"); diff --git a/src/window/input.hpp b/src/window/input.hpp index 5cc516713..e9150b3fa 100644 --- a/src/window/input.hpp +++ b/src/window/input.hpp @@ -3,7 +3,7 @@ #include -#include "../util/RunnablesList.hpp" +#include /// @brief Represents glfw3 keycode values. enum class keycode : int { diff --git a/src/world/Level.cpp b/src/world/Level.cpp index af8e9f6b5..e28fb3866 100644 --- a/src/world/Level.cpp +++ b/src/world/Level.cpp @@ -2,11 +2,11 @@ #include #include "../data/dynamic_util.hpp" -#include "../items/Inventories.hpp" -#include "../items/Inventory.hpp" +#include +#include #include "../lighting/Lighting.hpp" -#include "../objects/Entities.hpp" -#include "../objects/Player.hpp" +#include +#include #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" #include diff --git a/src/world/World.cpp b/src/world/World.cpp index b1892af6c..c0acc907d 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -8,9 +8,9 @@ #include #include #include -#include "../items/Inventories.hpp" -#include "../objects/Entities.hpp" -#include "../objects/Player.hpp" +#include +#include +#include #include #include "../voxels/Chunk.hpp" #include "../voxels/Chunks.hpp" diff --git a/src/world/World.hpp b/src/world/World.hpp index b48a9f325..1bd516f86 100644 --- a/src/world/World.hpp +++ b/src/world/World.hpp @@ -10,7 +10,7 @@ #include "../data/dynamic.hpp" #include "../interfaces/Serializable.hpp" #include -#include "../util/timeutil.hpp" +#include class Content; class WorldFiles;