From eeb9ba77fb30f08dc6bd10bbf9a1ee7d8a8a0817 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 10:11:01 +0300 Subject: [PATCH 01/31] Add global include directory --- CMakeLists.txt | 1 + src/coders/png.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fac47303..8a726e648 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,7 @@ file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp) file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) if(VOXELENGINE_BUILD_APPDIR) file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/bin) diff --git a/src/coders/png.cpp b/src/coders/png.cpp index c7c9b1794..878e4cb5f 100644 --- a/src/coders/png.cpp +++ b/src/coders/png.cpp @@ -28,7 +28,6 @@ int _png_write( FILE* fp = fopen(filename, "wb"); if (fp == nullptr) { logger.error() << "could not open file " << filename << " for writing"; - fclose(fp); return 1; } From d5dc68dd38e486a7529ef05176858e70d58894da Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 10:24:11 +0300 Subject: [PATCH 02/31] Root includes --- src/assets/AssetsLoader.cpp | 2 +- src/assets/AssetsLoader.hpp | 4 ++-- src/assets/assetload_funcs.cpp | 2 +- src/audio/AL/ALAudio.hpp | 2 +- src/audio/AL/alutil.hpp | 2 +- src/audio/audio.hpp | 2 +- src/coders/GLSLExtension.cpp | 2 +- src/coders/byte_utils.hpp | 2 +- src/coders/commons.hpp | 2 +- src/coders/gzip.hpp | 2 +- src/coders/json.hpp | 2 +- src/coders/ogg.cpp | 2 +- src/coders/rle.hpp | 2 +- src/constants.hpp | 2 +- src/content/ContentLUT.cpp | 2 +- src/content/ContentLUT.hpp | 4 ++-- src/content/ContentLoader.cpp | 4 ++-- src/content/ContentPack.hpp | 2 +- src/content/content_fwd.hpp | 2 +- src/data/dynamic_fwd.hpp | 2 +- src/data/setting.hpp | 4 ++-- src/engine.cpp | 4 ++-- src/engine.hpp | 4 ++-- src/files/WorldConverter.hpp | 4 ++-- src/files/WorldFiles.cpp | 8 ++++---- src/files/WorldFiles.hpp | 2 +- src/files/WorldRegions.hpp | 2 +- src/files/engine_paths.cpp | 2 +- src/files/files.hpp | 2 +- src/files/settings_io.cpp | 2 +- src/frontend/ContentGfxCache.cpp | 2 +- src/frontend/ContentGfxCache.hpp | 2 +- src/frontend/UiDocument.hpp | 2 +- src/frontend/debug_panel.cpp | 6 +++--- src/frontend/hud.cpp | 8 ++++---- src/frontend/hud.hpp | 2 +- src/frontend/menu.cpp | 6 +++--- src/frontend/screens/LevelScreen.cpp | 4 ++-- src/frontend/screens/MenuScreen.cpp | 2 +- src/frontend/screens/Screen.cpp | 2 +- src/graphics/core/Atlas.hpp | 2 +- src/graphics/core/Batch3D.cpp | 2 +- src/graphics/core/Batch3D.hpp | 2 +- src/graphics/core/DrawContext.hpp | 2 +- src/graphics/core/Font.hpp | 2 +- src/graphics/core/Framebuffer.hpp | 2 +- src/graphics/core/ImageData.hpp | 2 +- src/graphics/core/Mesh.hpp | 2 +- src/graphics/core/Shader.hpp | 2 +- src/graphics/core/Texture.hpp | 2 +- src/graphics/core/TextureAnimation.hpp | 2 +- src/graphics/core/Viewport.hpp | 2 +- src/graphics/render/BlocksPreview.cpp | 2 +- src/graphics/render/BlocksPreview.hpp | 2 +- src/graphics/render/BlocksRenderer.cpp | 4 ++-- src/graphics/render/BlocksRenderer.hpp | 2 +- src/graphics/render/ChunksRenderer.cpp | 2 +- src/graphics/render/Skybox.hpp | 2 +- src/graphics/render/WorldRenderer.cpp | 4 ++-- src/graphics/ui/GUI.hpp | 2 +- src/graphics/ui/elements/InventoryView.hpp | 4 ++-- src/graphics/ui/elements/Plotter.hpp | 2 +- src/graphics/ui/elements/UINode.hpp | 2 +- src/graphics/ui/gui_util.cpp | 2 +- src/graphics/ui/gui_util.hpp | 4 ++-- src/interfaces/Task.hpp | 2 +- src/items/Inventory.hpp | 2 +- src/items/ItemDef.hpp | 2 +- src/items/ItemStack.hpp | 4 ++-- src/lighting/Lighting.cpp | 2 +- src/lighting/Lighting.hpp | 2 +- src/lighting/Lightmap.hpp | 4 ++-- src/logic/BlocksController.hpp | 2 +- src/logic/ChunksController.hpp | 2 +- src/logic/EngineController.cpp | 2 +- src/logic/LevelController.cpp | 2 +- src/logic/PlayerController.cpp | 4 ++-- src/logic/scripting/lua/libaudio.cpp | 2 +- src/logic/scripting/lua/libconsole.cpp | 2 +- src/logic/scripting/lua/libcore.cpp | 4 ++-- src/logic/scripting/lua/libentity.cpp | 2 +- src/logic/scripting/lua/libfile.cpp | 2 +- src/logic/scripting/lua/libgui.cpp | 2 +- src/logic/scripting/lua/libhud.cpp | 2 +- src/logic/scripting/lua/libinput.cpp | 2 +- src/logic/scripting/lua/libpack.cpp | 2 +- src/logic/scripting/lua/libtime.cpp | 2 +- src/logic/scripting/lua/libworld.cpp | 2 +- src/logic/scripting/lua/lua_commons.hpp | 2 +- src/logic/scripting/lua/lua_engine.hpp | 2 +- src/logic/scripting/scripting.cpp | 2 +- src/logic/scripting/scripting.hpp | 4 ++-- src/logic/scripting/scripting_functional.hpp | 4 ++-- src/logic/scripting/scripting_hud.cpp | 2 +- src/logic/scripting/scripting_hud.hpp | 2 +- src/maths/fastmaths.hpp | 2 +- src/maths/voxmaths.hpp | 2 +- src/objects/Entities.cpp | 2 +- src/objects/Entities.hpp | 2 +- src/objects/EntityDef.hpp | 2 +- src/objects/Player.hpp | 2 +- src/objects/rigging.hpp | 2 +- src/physics/Hitbox.hpp | 2 +- src/physics/PhysicsSolver.hpp | 2 +- src/settings.hpp | 4 ++-- src/util/BufferPool.hpp | 2 +- src/util/RunnablesList.hpp | 4 ++-- src/util/ThreadPool.hpp | 2 +- src/util/data_io.hpp | 2 +- src/util/platform.cpp | 2 +- src/util/stringutil.hpp | 2 +- src/util/timeutil.hpp | 2 +- src/voxel_engine.cpp | 4 ++-- src/voxels/Block.cpp | 2 +- src/voxels/Block.hpp | 2 +- src/voxels/Chunk.hpp | 2 +- src/voxels/Chunks.hpp | 2 +- src/voxels/ChunksStorage.cpp | 2 +- src/voxels/ChunksStorage.hpp | 2 +- src/voxels/DefaultWorldGenerator.cpp | 2 +- src/voxels/DefaultWorldGenerator.hpp | 2 +- src/voxels/FlatWorldGenerator.cpp | 2 +- src/voxels/FlatWorldGenerator.hpp | 2 +- src/voxels/VoxelsVolume.hpp | 4 ++-- src/voxels/WorldGenerator.hpp | 2 +- src/voxels/voxel.hpp | 2 +- src/window/Events.hpp | 2 +- src/window/Window.cpp | 2 +- src/window/Window.hpp | 2 +- src/world/Level.cpp | 2 +- src/world/World.cpp | 2 +- src/world/World.hpp | 2 +- 132 files changed, 164 insertions(+), 164 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index 84ed2894a..663bc80de 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -5,7 +5,7 @@ #include #include "../coders/imageio.hpp" -#include "../constants.hpp" +#include #include "../content/Content.hpp" #include "../content/ContentPack.hpp" #include "../data/dynamic.hpp" diff --git a/src/assets/AssetsLoader.hpp b/src/assets/AssetsLoader.hpp index 09dd4b7f1..93e8fe3c7 100644 --- a/src/assets/AssetsLoader.hpp +++ b/src/assets/AssetsLoader.hpp @@ -9,9 +9,9 @@ #include #include -#include "../delegates.hpp" +#include #include "../interfaces/Task.hpp" -#include "../typedefs.hpp" +#include #include "Assets.hpp" namespace dynamic { diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp index a2ed0d9d2..702c38e0a 100644 --- a/src/assets/assetload_funcs.cpp +++ b/src/assets/assetload_funcs.cpp @@ -10,7 +10,7 @@ #include "../coders/imageio.hpp" #include "../coders/json.hpp" #include "../coders/obj.hpp" -#include "../constants.hpp" +#include #include "../data/dynamic.hpp" #include "../files/engine_paths.hpp" #include "../files/files.hpp" diff --git a/src/audio/AL/ALAudio.hpp b/src/audio/AL/ALAudio.hpp index dca71558d..a0dc4e6be 100644 --- a/src/audio/AL/ALAudio.hpp +++ b/src/audio/AL/ALAudio.hpp @@ -7,7 +7,7 @@ #include #include -#include "../../typedefs.hpp" +#include #include "../audio.hpp" #ifdef __APPLE__ diff --git a/src/audio/AL/alutil.hpp b/src/audio/AL/alutil.hpp index f5b5a07d6..26a11289f 100644 --- a/src/audio/AL/alutil.hpp +++ b/src/audio/AL/alutil.hpp @@ -5,7 +5,7 @@ #include #include -#include "../../typedefs.hpp" +#include #ifdef __APPLE__ #include diff --git a/src/audio/audio.hpp b/src/audio/audio.hpp index 9e6b6f6fd..ab7313af1 100644 --- a/src/audio/audio.hpp +++ b/src/audio/audio.hpp @@ -6,7 +6,7 @@ #include #include -#include "../typedefs.hpp" +#include namespace fs = std::filesystem; diff --git a/src/coders/GLSLExtension.cpp b/src/coders/GLSLExtension.cpp index 79bfb1cc3..301253661 100644 --- a/src/coders/GLSLExtension.cpp +++ b/src/coders/GLSLExtension.cpp @@ -7,7 +7,7 @@ #include "../files/engine_paths.hpp" #include "../files/files.hpp" -#include "../typedefs.hpp" +#include #include "../util/stringutil.hpp" namespace fs = std::filesystem; diff --git a/src/coders/byte_utils.hpp b/src/coders/byte_utils.hpp index 3e6e22770..326bcdb1e 100644 --- a/src/coders/byte_utils.hpp +++ b/src/coders/byte_utils.hpp @@ -4,7 +4,7 @@ #include #include -#include "../typedefs.hpp" +#include /* byteorder: little-endian */ class ByteBuilder { diff --git a/src/coders/commons.hpp b/src/coders/commons.hpp index 4b6618801..9fe62dca7 100644 --- a/src/coders/commons.hpp +++ b/src/coders/commons.hpp @@ -5,7 +5,7 @@ #include #include "../data/dynamic.hpp" -#include "../typedefs.hpp" +#include inline int is_box(int c) { switch (c) { diff --git a/src/coders/gzip.hpp b/src/coders/gzip.hpp index b35c898b5..87184acbe 100644 --- a/src/coders/gzip.hpp +++ b/src/coders/gzip.hpp @@ -3,7 +3,7 @@ #include -#include "../typedefs.hpp" +#include namespace gzip { const unsigned char MAGIC[] = "\x1F\x8B"; diff --git a/src/coders/json.hpp b/src/coders/json.hpp index ad4c07357..0a5ff4680 100644 --- a/src/coders/json.hpp +++ b/src/coders/json.hpp @@ -4,7 +4,7 @@ #include #include "../data/dynamic.hpp" -#include "../typedefs.hpp" +#include #include "binary_json.hpp" namespace json { diff --git a/src/coders/ogg.cpp b/src/coders/ogg.cpp index 7f4c99408..f6562f6e1 100644 --- a/src/coders/ogg.cpp +++ b/src/coders/ogg.cpp @@ -7,7 +7,7 @@ #include "../audio/audio.hpp" #include "../debug/Logger.hpp" -#include "../typedefs.hpp" +#include static debug::Logger logger("ogg"); diff --git a/src/coders/rle.hpp b/src/coders/rle.hpp index b4b5545f1..a2e45a859 100644 --- a/src/coders/rle.hpp +++ b/src/coders/rle.hpp @@ -1,7 +1,7 @@ #ifndef CODERS_RLE_HPP_ #define CODERS_RLE_HPP_ -#include "../typedefs.hpp" +#include namespace rle { size_t encode(const ubyte* src, size_t length, ubyte* dst); diff --git a/src/constants.hpp b/src/constants.hpp index 56ff31605..59b00fb08 100644 --- a/src/constants.hpp +++ b/src/constants.hpp @@ -1,7 +1,7 @@ #ifndef CONSTANTS_HPP_ #define CONSTANTS_HPP_ -#include "typedefs.hpp" +#include #include #include diff --git a/src/content/ContentLUT.cpp b/src/content/ContentLUT.cpp index 7808b48f6..fafb81e1b 100644 --- a/src/content/ContentLUT.cpp +++ b/src/content/ContentLUT.cpp @@ -3,7 +3,7 @@ #include #include "../coders/json.hpp" -#include "../constants.hpp" +#include #include "../files/files.hpp" #include "../items/ItemDef.hpp" #include "../voxels/Block.hpp" diff --git a/src/content/ContentLUT.hpp b/src/content/ContentLUT.hpp index 6bc2e139f..1d85f81b8 100644 --- a/src/content/ContentLUT.hpp +++ b/src/content/ContentLUT.hpp @@ -6,9 +6,9 @@ #include #include -#include "../constants.hpp" +#include #include "../data/dynamic.hpp" -#include "../typedefs.hpp" +#include #include "Content.hpp" namespace fs = std::filesystem; diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index 16bccb347..e518340ed 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -7,14 +7,14 @@ #include #include "../coders/json.hpp" -#include "../core_defs.hpp" +#include #include "../data/dynamic.hpp" #include "../debug/Logger.hpp" #include "../files/files.hpp" #include "../items/ItemDef.hpp" #include "../logic/scripting/scripting.hpp" #include "../objects/rigging.hpp" -#include "../typedefs.hpp" +#include #include "../util/listutil.hpp" #include "../util/stringutil.hpp" #include "../voxels/Block.hpp" diff --git a/src/content/ContentPack.hpp b/src/content/ContentPack.hpp index da373446a..ff8555f2d 100644 --- a/src/content/ContentPack.hpp +++ b/src/content/ContentPack.hpp @@ -6,7 +6,7 @@ #include #include -#include "../typedefs.hpp" +#include class EnginePaths; diff --git a/src/content/content_fwd.hpp b/src/content/content_fwd.hpp index 92392cc53..377b4d4d4 100644 --- a/src/content/content_fwd.hpp +++ b/src/content/content_fwd.hpp @@ -1,7 +1,7 @@ #ifndef CONTENT_CONTENT_FWD_HPP_ #define CONTENT_CONTENT_FWD_HPP_ -#include "../typedefs.hpp" +#include class Content; class ContentPackRuntime; diff --git a/src/data/dynamic_fwd.hpp b/src/data/dynamic_fwd.hpp index f655ed1ac..154d4d706 100644 --- a/src/data/dynamic_fwd.hpp +++ b/src/data/dynamic_fwd.hpp @@ -6,7 +6,7 @@ #include #include -#include "../typedefs.hpp" +#include namespace dynamic { class Map; diff --git a/src/data/setting.hpp b/src/data/setting.hpp index 4191ec6c1..73378459c 100644 --- a/src/data/setting.hpp +++ b/src/data/setting.hpp @@ -6,8 +6,8 @@ #include #include -#include "../delegates.hpp" -#include "../typedefs.hpp" +#include +#include enum class setting_format { simple, percent }; diff --git a/src/engine.cpp b/src/engine.cpp index de4f7b4d3..dbe894ad6 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -12,7 +12,7 @@ #include "content/Content.hpp" #include "content/ContentBuilder.hpp" #include "content/ContentLoader.hpp" -#include "core_defs.hpp" +#include #include "files/files.hpp" #include "files/settings_io.hpp" #include "frontend/locale.hpp" @@ -37,7 +37,7 @@ #include "window/input.hpp" #include "window/Window.hpp" #include "world/WorldGenerators.hpp" -#include "settings.hpp" +#include #include #include diff --git a/src/engine.hpp b/src/engine.hpp index de18b3e3e..4ed268678 100644 --- a/src/engine.hpp +++ b/src/engine.hpp @@ -1,8 +1,8 @@ #ifndef ENGINE_HPP_ #define ENGINE_HPP_ -#include "delegates.hpp" -#include "typedefs.hpp" +#include +#include #include "assets/Assets.hpp" #include "content/content_fwd.hpp" diff --git a/src/files/WorldConverter.hpp b/src/files/WorldConverter.hpp index 7e28bcf95..3ccf86427 100644 --- a/src/files/WorldConverter.hpp +++ b/src/files/WorldConverter.hpp @@ -5,9 +5,9 @@ #include #include -#include "../delegates.hpp" +#include #include "../interfaces/Task.hpp" -#include "../typedefs.hpp" +#include namespace fs = std::filesystem; diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index a9f81f6cb..46ccba7b1 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -10,9 +10,9 @@ #include "../coders/byte_utils.hpp" #include "../coders/json.hpp" -#include "../constants.hpp" +#include #include "../content/Content.hpp" -#include "../core_defs.hpp" +#include #include "../data/dynamic.hpp" #include "../debug/Logger.hpp" #include "../items/Inventory.hpp" @@ -22,8 +22,8 @@ #include "../objects/EntityDef.hpp" #include "../objects/Player.hpp" #include "../physics/Hitbox.hpp" -#include "../settings.hpp" -#include "../typedefs.hpp" +#include +#include #include "../util/data_io.hpp" #include "../voxels/Block.hpp" #include "../voxels/Chunk.hpp" diff --git a/src/files/WorldFiles.hpp b/src/files/WorldFiles.hpp index 6f0e9bd6d..84f77f87d 100644 --- a/src/files/WorldFiles.hpp +++ b/src/files/WorldFiles.hpp @@ -8,7 +8,7 @@ #include #include "../content/ContentPack.hpp" -#include "../typedefs.hpp" +#include #include "../voxels/Chunk.hpp" #include "WorldRegions.hpp" #include "files.hpp" diff --git a/src/files/WorldRegions.hpp b/src/files/WorldRegions.hpp index 6f8c101c1..971438a6d 100644 --- a/src/files/WorldRegions.hpp +++ b/src/files/WorldRegions.hpp @@ -10,7 +10,7 @@ #include #include "../data/dynamic_fwd.hpp" -#include "../typedefs.hpp" +#include #include "../util/BufferPool.hpp" #include "../voxels/Chunk.hpp" #include "files.hpp" diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp index 187133314..dbcd41ff0 100644 --- a/src/files/engine_paths.cpp +++ b/src/files/engine_paths.cpp @@ -6,7 +6,7 @@ #include #include -#include "../typedefs.hpp" +#include #include "../util/stringutil.hpp" #include "WorldFiles.hpp" diff --git a/src/files/files.hpp b/src/files/files.hpp index 99bce793f..5557b0f27 100644 --- a/src/files/files.hpp +++ b/src/files/files.hpp @@ -7,7 +7,7 @@ #include #include -#include "../typedefs.hpp" +#include namespace fs = std::filesystem; diff --git a/src/files/settings_io.cpp b/src/files/settings_io.cpp index 10589fb16..2799ac810 100644 --- a/src/files/settings_io.cpp +++ b/src/files/settings_io.cpp @@ -6,7 +6,7 @@ #include "../coders/json.hpp" #include "../coders/toml.hpp" #include "../debug/Logger.hpp" -#include "../settings.hpp" +#include #include "../window/Events.hpp" #include "../window/input.hpp" diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index 195b4fcd8..d434db2b9 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -5,7 +5,7 @@ #include "../assets/Assets.hpp" #include "../content/Content.hpp" #include "../content/ContentPack.hpp" -#include "../core_defs.hpp" +#include #include "../graphics/core/Atlas.hpp" #include "../maths/UVRegion.hpp" #include "../voxels/Block.hpp" diff --git a/src/frontend/ContentGfxCache.hpp b/src/frontend/ContentGfxCache.hpp index f1f696d4c..213e38c16 100644 --- a/src/frontend/ContentGfxCache.hpp +++ b/src/frontend/ContentGfxCache.hpp @@ -1,7 +1,7 @@ #ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_ #define FRONTEND_BLOCKS_GFX_CACHE_HPP_ -#include "../typedefs.hpp" +#include #include diff --git a/src/frontend/UiDocument.hpp b/src/frontend/UiDocument.hpp index 504411a91..6a9840b36 100644 --- a/src/frontend/UiDocument.hpp +++ b/src/frontend/UiDocument.hpp @@ -1,7 +1,7 @@ #ifndef FRONTEND_UI_DOCUMENT_HPP_ #define FRONTEND_UI_DOCUMENT_HPP_ -#include "../typedefs.hpp" +#include #include #include diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index 985e14f15..338fa751d 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -1,7 +1,7 @@ #include "../audio/audio.hpp" -#include "../delegates.hpp" -#include "../engine.hpp" -#include "../settings.hpp" +#include +#include +#include #include "../content/Content.hpp" #include "../graphics/core/Mesh.hpp" #include "../graphics/ui/elements/CheckBox.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index e4a83052e..7c0ad0f76 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -6,9 +6,9 @@ #include "../assets/Assets.hpp" #include "../content/Content.hpp" -#include "../core_defs.hpp" -#include "../delegates.hpp" -#include "../engine.hpp" +#include +#include +#include #include "../graphics/core/Atlas.hpp" #include "../graphics/core/Batch2D.hpp" #include "../graphics/core/Batch3D.hpp" @@ -32,7 +32,7 @@ #include "../maths/voxmaths.hpp" #include "../objects/Player.hpp" #include "../physics/Hitbox.hpp" -#include "../typedefs.hpp" +#include #include "../util/stringutil.hpp" #include "../voxels/Block.hpp" #include "../voxels/Chunk.hpp" diff --git a/src/frontend/hud.hpp b/src/frontend/hud.hpp index a2a778ed6..0f58d2b6f 100644 --- a/src/frontend/hud.hpp +++ b/src/frontend/hud.hpp @@ -1,7 +1,7 @@ #ifndef FRONTEND_HUD_HPP_ #define FRONTEND_HUD_HPP_ -#include "../typedefs.hpp" +#include #include "../util/ObjectsKeeper.hpp" #include diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index cb4dc7f39..a69a91e77 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -4,8 +4,8 @@ #include "UiDocument.hpp" #include "screens/MenuScreen.hpp" -#include "../delegates.hpp" -#include "../engine.hpp" +#include +#include #include "../data/dynamic.hpp" #include "../interfaces/Task.hpp" #include "../files/engine_paths.hpp" @@ -13,7 +13,7 @@ #include "../graphics/ui/gui_util.hpp" #include "../graphics/ui/GUI.hpp" #include "../logic/scripting/scripting.hpp" -#include "../settings.hpp" +#include #include "../coders/commons.hpp" #include "../util/stringutil.hpp" #include "../window/Window.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index bdf6032fb..f11ccd469 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -1,12 +1,12 @@ #include "LevelScreen.hpp" -#include "../../core_defs.hpp" +#include #include "../hud.hpp" #include "../LevelFrontend.hpp" #include "../../audio/audio.hpp" #include "../../coders/imageio.hpp" #include "../../debug/Logger.hpp" -#include "../../engine.hpp" +#include #include "../../files/files.hpp" #include "../../content/Content.hpp" #include "../../graphics/core/DrawContext.hpp" diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp index 74ad04219..e5d56f6c1 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 MenuScreen::MenuScreen(Engine* engine) : Screen(engine) { engine->resetContent(); diff --git a/src/frontend/screens/Screen.cpp b/src/frontend/screens/Screen.cpp index 477baf240..32aa74b09 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 Screen::Screen(Engine* engine) : engine(engine), diff --git a/src/graphics/core/Atlas.hpp b/src/graphics/core/Atlas.hpp index 827f6d0a7..8de9dc1c0 100644 --- a/src/graphics/core/Atlas.hpp +++ b/src/graphics/core/Atlas.hpp @@ -8,7 +8,7 @@ #include #include #include "../../maths/UVRegion.hpp" -#include "../../typedefs.hpp" +#include class ImageData; class Texture; diff --git a/src/graphics/core/Batch3D.cpp b/src/graphics/core/Batch3D.cpp index c25d6f0bd..ae0b42820 100644 --- a/src/graphics/core/Batch3D.cpp +++ b/src/graphics/core/Batch3D.cpp @@ -4,7 +4,7 @@ #include "Texture.hpp" #include -#include "../../typedefs.hpp" +#include #include "../../maths/UVRegion.hpp" /// xyz, uv, rgba diff --git a/src/graphics/core/Batch3D.hpp b/src/graphics/core/Batch3D.hpp index 79b176976..5d05c4602 100644 --- a/src/graphics/core/Batch3D.hpp +++ b/src/graphics/core/Batch3D.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_CORE_BATCH3D_HPP_ #define GRAPHICS_CORE_BATCH3D_HPP_ -#include "../../typedefs.hpp" +#include #include "commons.hpp" #include diff --git a/src/graphics/core/DrawContext.hpp b/src/graphics/core/DrawContext.hpp index ea152f203..ac816d139 100644 --- a/src/graphics/core/DrawContext.hpp +++ b/src/graphics/core/DrawContext.hpp @@ -3,7 +3,7 @@ #include "commons.hpp" #include "Viewport.hpp" -#include "../../typedefs.hpp" +#include class Batch2D; class Framebuffer; diff --git a/src/graphics/core/Font.hpp b/src/graphics/core/Font.hpp index 72a17ca56..d2dd7e695 100644 --- a/src/graphics/core/Font.hpp +++ b/src/graphics/core/Font.hpp @@ -4,7 +4,7 @@ #include #include #include -#include "../../typedefs.hpp" +#include class Texture; class Batch2D; diff --git a/src/graphics/core/Framebuffer.hpp b/src/graphics/core/Framebuffer.hpp index 2cca9dde6..ddb96316f 100644 --- a/src/graphics/core/Framebuffer.hpp +++ b/src/graphics/core/Framebuffer.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_CORE_FRAMEBUFFER_HPP_ #define GRAPHICS_CORE_FRAMEBUFFER_HPP_ -#include "../../typedefs.hpp" +#include #include diff --git a/src/graphics/core/ImageData.hpp b/src/graphics/core/ImageData.hpp index 0a0872f92..e4a77b090 100644 --- a/src/graphics/core/ImageData.hpp +++ b/src/graphics/core/ImageData.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_CORE_IMAGE_DATA_HPP_ #define GRAPHICS_CORE_IMAGE_DATA_HPP_ -#include "../../typedefs.hpp" +#include #include diff --git a/src/graphics/core/Mesh.hpp b/src/graphics/core/Mesh.hpp index abff9d5e7..ee5bfbd17 100644 --- a/src/graphics/core/Mesh.hpp +++ b/src/graphics/core/Mesh.hpp @@ -2,7 +2,7 @@ #define GRAPHICS_CORE_MESH_HPP_ #include -#include "../../typedefs.hpp" +#include struct vattr { ubyte size; diff --git a/src/graphics/core/Shader.hpp b/src/graphics/core/Shader.hpp index 25d182a5a..cd5e88329 100644 --- a/src/graphics/core/Shader.hpp +++ b/src/graphics/core/Shader.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_CORE_SHADER_HPP_ #define GRAPHICS_CORE_SHADER_HPP_ -#include "../../typedefs.hpp" +#include #include #include diff --git a/src/graphics/core/Texture.hpp b/src/graphics/core/Texture.hpp index 62cbae43e..16a8e1d21 100644 --- a/src/graphics/core/Texture.hpp +++ b/src/graphics/core/Texture.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_CORE_TEXTURE_HPP_ #define GRAPHICS_CORE_TEXTURE_HPP_ -#include "../../typedefs.hpp" +#include #include "../../maths/UVRegion.hpp" #include "ImageData.hpp" diff --git a/src/graphics/core/TextureAnimation.hpp b/src/graphics/core/TextureAnimation.hpp index 839566bd8..cc5da1023 100644 --- a/src/graphics/core/TextureAnimation.hpp +++ b/src/graphics/core/TextureAnimation.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_ #define GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_ -#include "../../typedefs.hpp" +#include #include #include diff --git a/src/graphics/core/Viewport.hpp b/src/graphics/core/Viewport.hpp index 30e9de1da..447289d3f 100644 --- a/src/graphics/core/Viewport.hpp +++ b/src/graphics/core/Viewport.hpp @@ -3,7 +3,7 @@ #include -#include "../../typedefs.hpp" +#include class Viewport { uint width; diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index cba0f90dc..e02daf52d 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -1,7 +1,7 @@ #include "BlocksPreview.hpp" #include "../../assets/Assets.hpp" -#include "../../constants.hpp" +#include #include "../../content/Content.hpp" #include "../../frontend/ContentGfxCache.hpp" #include "../../voxels/Block.hpp" diff --git a/src/graphics/render/BlocksPreview.hpp b/src/graphics/render/BlocksPreview.hpp index 0431f7e7d..ba08c0c2c 100644 --- a/src/graphics/render/BlocksPreview.hpp +++ b/src/graphics/render/BlocksPreview.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_ #define GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_ -#include "../../typedefs.hpp" +#include #include #include diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index b5ea8194d..a249e3245 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -2,7 +2,7 @@ #include "../core/Mesh.hpp" #include "../../maths/UVRegion.hpp" -#include "../../constants.hpp" +#include #include "../../content/Content.hpp" #include "../../voxels/Block.hpp" #include "../../voxels/Chunk.hpp" @@ -10,7 +10,7 @@ #include "../../voxels/ChunksStorage.hpp" #include "../../lighting/Lightmap.hpp" #include "../../frontend/ContentGfxCache.hpp" -#include "../../settings.hpp" +#include #include diff --git a/src/graphics/render/BlocksRenderer.hpp b/src/graphics/render/BlocksRenderer.hpp index d6cd6eb12..f3430fce7 100644 --- a/src/graphics/render/BlocksRenderer.hpp +++ b/src/graphics/render/BlocksRenderer.hpp @@ -6,7 +6,7 @@ #include #include #include "../../voxels/voxel.hpp" -#include "../../typedefs.hpp" +#include class Content; class Mesh; diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp index 0e7fe5cd4..eaf802b44 100644 --- a/src/graphics/render/ChunksRenderer.cpp +++ b/src/graphics/render/ChunksRenderer.cpp @@ -4,7 +4,7 @@ #include "../../graphics/core/Mesh.hpp" #include "../../voxels/Chunk.hpp" #include "../../world/Level.hpp" -#include "../../settings.hpp" +#include #include #include diff --git a/src/graphics/render/Skybox.hpp b/src/graphics/render/Skybox.hpp index 57bd9c99f..e793b2347 100644 --- a/src/graphics/render/Skybox.hpp +++ b/src/graphics/render/Skybox.hpp @@ -4,7 +4,7 @@ #include #include #include -#include "../../typedefs.hpp" +#include #include "../../maths/fastmaths.hpp" class Mesh; diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 08defc67d..7a64267ce 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -10,7 +10,7 @@ #include "../../assets/Assets.hpp" #include "../../content/Content.hpp" -#include "../../engine.hpp" +#include #include "../../frontend/LevelFrontend.hpp" #include "../../items/Inventory.hpp" #include "../../items/ItemDef.hpp" @@ -21,7 +21,7 @@ #include "../../maths/voxmaths.hpp" #include "../../objects/Entities.hpp" #include "../../objects/Player.hpp" -#include "../../settings.hpp" +#include #include "../../voxels/Block.hpp" #include "../../voxels/Chunk.hpp" #include "../../voxels/Chunks.hpp" diff --git a/src/graphics/ui/GUI.hpp b/src/graphics/ui/GUI.hpp index 9e8a387c9..d54fd8681 100644 --- a/src/graphics/ui/GUI.hpp +++ b/src/graphics/ui/GUI.hpp @@ -1,7 +1,7 @@ #ifndef FRONTEND_GUI_GUI_HPP_ #define FRONTEND_GUI_GUI_HPP_ -#include "../../delegates.hpp" +#include #include #include diff --git a/src/graphics/ui/elements/InventoryView.hpp b/src/graphics/ui/elements/InventoryView.hpp index 476b4d999..7dd1b3564 100644 --- a/src/graphics/ui/elements/InventoryView.hpp +++ b/src/graphics/ui/elements/InventoryView.hpp @@ -3,8 +3,8 @@ #include "UINode.hpp" #include "Container.hpp" -#include "../../../typedefs.hpp" -#include "../../../constants.hpp" +#include +#include #include #include diff --git a/src/graphics/ui/elements/Plotter.hpp b/src/graphics/ui/elements/Plotter.hpp index b651abaeb..17d7d9220 100644 --- a/src/graphics/ui/elements/Plotter.hpp +++ b/src/graphics/ui/elements/Plotter.hpp @@ -2,7 +2,7 @@ #define GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_ #include "UINode.hpp" -#include "../../../typedefs.hpp" +#include #include #include diff --git a/src/graphics/ui/elements/UINode.hpp b/src/graphics/ui/elements/UINode.hpp index 056b933fa..7281f0dd1 100644 --- a/src/graphics/ui/elements/UINode.hpp +++ b/src/graphics/ui/elements/UINode.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_UI_ELEMENTS_UINODE_HPP_ #define GRAPHICS_UI_ELEMENTS_UINODE_HPP_ -#include "../../../delegates.hpp" +#include #include "../../../window/input.hpp" #include diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp index 15e31d8a8..70e441cb2 100644 --- a/src/graphics/ui/gui_util.cpp +++ b/src/graphics/ui/gui_util.cpp @@ -8,7 +8,7 @@ #include "../../logic/scripting/scripting.hpp" #include "../../frontend/locale.hpp" #include "../../util/stringutil.hpp" -#include "../../delegates.hpp" +#include #include diff --git a/src/graphics/ui/gui_util.hpp b/src/graphics/ui/gui_util.hpp index 1f0950e3f..31572f028 100644 --- a/src/graphics/ui/gui_util.hpp +++ b/src/graphics/ui/gui_util.hpp @@ -2,8 +2,8 @@ #define FRONTEND_GUI_GUI_UTIL_HPP_ #include "GUI.hpp" -#include "../../typedefs.hpp" -#include "../../delegates.hpp" +#include +#include #include #include diff --git a/src/interfaces/Task.hpp b/src/interfaces/Task.hpp index 7974baf5c..ebcdc7fa1 100644 --- a/src/interfaces/Task.hpp +++ b/src/interfaces/Task.hpp @@ -1,7 +1,7 @@ #ifndef INTERFACES_TASK_HPP_ #define INTERFACES_TASK_HPP_ -#include "../typedefs.hpp" +#include /// @brief Task is a finite process interface. /// 'work' is a metric of task progress/remaining work (jobs/bytes/something other) diff --git a/src/items/Inventory.hpp b/src/items/Inventory.hpp index c2c73d417..e6ca4f32d 100644 --- a/src/items/Inventory.hpp +++ b/src/items/Inventory.hpp @@ -5,7 +5,7 @@ #include #include "../interfaces/Serializable.hpp" -#include "../typedefs.hpp" +#include #include "ItemStack.hpp" namespace dynamic { diff --git a/src/items/ItemDef.hpp b/src/items/ItemDef.hpp index def1abb3f..8ac8e47f8 100644 --- a/src/items/ItemDef.hpp +++ b/src/items/ItemDef.hpp @@ -4,7 +4,7 @@ #include #include -#include "../typedefs.hpp" +#include struct item_funcs_set { bool init : 1; diff --git a/src/items/ItemStack.hpp b/src/items/ItemStack.hpp index 8cfbd2ed2..f880f5f6b 100644 --- a/src/items/ItemStack.hpp +++ b/src/items/ItemStack.hpp @@ -1,8 +1,8 @@ #ifndef ITEMS_ITEM_STACK_HPP_ #define ITEMS_ITEM_STACK_HPP_ -#include "../constants.hpp" -#include "../typedefs.hpp" +#include +#include class ContentIndices; diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp index 6c00af35e..59876ac49 100644 --- a/src/lighting/Lighting.cpp +++ b/src/lighting/Lighting.cpp @@ -6,7 +6,7 @@ #include "../voxels/Chunk.hpp" #include "../voxels/voxel.hpp" #include "../voxels/Block.hpp" -#include "../constants.hpp" +#include #include "../util/timeutil.hpp" #include diff --git a/src/lighting/Lighting.hpp b/src/lighting/Lighting.hpp index ad8678192..ecc588ba5 100644 --- a/src/lighting/Lighting.hpp +++ b/src/lighting/Lighting.hpp @@ -1,7 +1,7 @@ #ifndef LIGHTING_LIGHTING_HPP_ #define LIGHTING_LIGHTING_HPP_ -#include "../typedefs.hpp" +#include class Content; class ContentIndices; diff --git a/src/lighting/Lightmap.hpp b/src/lighting/Lightmap.hpp index 43b6b4b07..36a7515f5 100644 --- a/src/lighting/Lightmap.hpp +++ b/src/lighting/Lightmap.hpp @@ -1,8 +1,8 @@ #ifndef LIGHTING_LIGHTMAP_HPP_ #define LIGHTING_LIGHTMAP_HPP_ -#include "../constants.hpp" -#include "../typedefs.hpp" +#include +#include #include diff --git a/src/logic/BlocksController.hpp b/src/logic/BlocksController.hpp index f2a747388..6243f0814 100644 --- a/src/logic/BlocksController.hpp +++ b/src/logic/BlocksController.hpp @@ -5,7 +5,7 @@ #include #include "../maths/fastmaths.hpp" -#include "../typedefs.hpp" +#include #include "../util/Clock.hpp" #include "../voxels/voxel.hpp" diff --git a/src/logic/ChunksController.hpp b/src/logic/ChunksController.hpp index b777c405f..d65eb9cbe 100644 --- a/src/logic/ChunksController.hpp +++ b/src/logic/ChunksController.hpp @@ -3,7 +3,7 @@ #include -#include "../typedefs.hpp" +#include class Level; class Chunk; diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index e7128e27d..2a6c36ef0 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -7,7 +7,7 @@ #include "../coders/commons.hpp" #include "../content/ContentLUT.hpp" #include "../debug/Logger.hpp" -#include "../engine.hpp" +#include #include "../files/WorldConverter.hpp" #include "../files/WorldFiles.hpp" #include "../frontend/locale.hpp" diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp index c86d6c757..f4adb481c 100644 --- a/src/logic/LevelController.cpp +++ b/src/logic/LevelController.cpp @@ -7,7 +7,7 @@ #include "../interfaces/Object.hpp" #include "../objects/Entities.hpp" #include "../physics/Hitbox.hpp" -#include "../settings.hpp" +#include #include "../world/Level.hpp" #include "../world/World.hpp" #include "scripting/scripting.hpp" diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index c86e01dd5..9c8381fd2 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -5,7 +5,7 @@ #include #include "../content/Content.hpp" -#include "../core_defs.hpp" +#include #include "../items/Inventory.hpp" #include "../items/ItemDef.hpp" #include "../items/ItemStack.hpp" @@ -14,7 +14,7 @@ #include "../objects/Player.hpp" #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" -#include "../settings.hpp" +#include #include "../voxels/Block.hpp" #include "../voxels/Chunks.hpp" #include "../voxels/voxel.hpp" diff --git a/src/logic/scripting/lua/libaudio.cpp b/src/logic/scripting/lua/libaudio.cpp index 1bf3704b2..21573a734 100644 --- a/src/logic/scripting/lua/libaudio.cpp +++ b/src/logic/scripting/lua/libaudio.cpp @@ -1,5 +1,5 @@ #include "../../../audio/audio.hpp" -#include "../../../engine.hpp" +#include #include "api_lua.hpp" inline const char* DEFAULT_CHANNEL = "regular"; diff --git a/src/logic/scripting/lua/libconsole.cpp b/src/logic/scripting/lua/libconsole.cpp index 4a106f955..0ec904a2b 100644 --- a/src/logic/scripting/lua/libconsole.cpp +++ b/src/logic/scripting/lua/libconsole.cpp @@ -1,5 +1,5 @@ #include "../../../coders/commons.hpp" -#include "../../../engine.hpp" +#include #include "../../CommandsInterpreter.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp index 0b28ddbd2..1e29856d3 100644 --- a/src/logic/scripting/lua/libcore.cpp +++ b/src/logic/scripting/lua/libcore.cpp @@ -1,8 +1,8 @@ #include #include -#include "../../../constants.hpp" -#include "../../../engine.hpp" +#include +#include #include "../../../files/engine_paths.hpp" #include "../../../files/settings_io.hpp" #include "../../../frontend/menu.hpp" diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libentity.cpp index 9e87cc112..33e61a6a7 100644 --- a/src/logic/scripting/lua/libentity.cpp +++ b/src/logic/scripting/lua/libentity.cpp @@ -1,7 +1,7 @@ #include "libentity.hpp" #include "../../../content/Content.hpp" -#include "../../../engine.hpp" +#include #include "../../../objects/Entities.hpp" #include "../../../objects/EntityDef.hpp" #include "../../../objects/Player.hpp" diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libfile.cpp index 785235a7a..b140bbc41 100644 --- a/src/logic/scripting/lua/libfile.cpp +++ b/src/logic/scripting/lua/libfile.cpp @@ -2,7 +2,7 @@ #include #include "../../../coders/gzip.hpp" -#include "../../../engine.hpp" +#include #include "../../../files/engine_paths.hpp" #include "../../../files/files.hpp" #include "../../../util/stringutil.hpp" diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp index 7b9872a87..ce5721139 100644 --- a/src/logic/scripting/lua/libgui.cpp +++ b/src/logic/scripting/lua/libgui.cpp @@ -1,5 +1,5 @@ #include "../../../assets/Assets.hpp" -#include "../../../engine.hpp" +#include #include "../../../frontend/UiDocument.hpp" #include "../../../frontend/locale.hpp" #include "../../../graphics/ui/elements/Button.hpp" diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index a421aa2eb..8ad6b6e68 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -3,7 +3,7 @@ #include "../../../assets/Assets.hpp" #include "../../../content/Content.hpp" -#include "../../../engine.hpp" +#include #include "../../../frontend/UiDocument.hpp" #include "../../../frontend/hud.hpp" #include "../../../graphics/ui/elements/InventoryView.hpp" diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libinput.cpp index 92fb42999..1f6892292 100644 --- a/src/logic/scripting/lua/libinput.cpp +++ b/src/logic/scripting/lua/libinput.cpp @@ -1,4 +1,4 @@ -#include "../../../engine.hpp" +#include #include "../../../frontend/hud.hpp" #include "../../../frontend/screens/Screen.hpp" #include "../../../graphics/ui/GUI.hpp" diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index b7a20ca5f..901cce9f1 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -5,7 +5,7 @@ #include "../../../assets/AssetsLoader.hpp" #include "../../../content/Content.hpp" -#include "../../../engine.hpp" +#include #include "../../../files/WorldFiles.hpp" #include "../../../files/engine_paths.hpp" #include "../../../world/Level.hpp" diff --git a/src/logic/scripting/lua/libtime.cpp b/src/logic/scripting/lua/libtime.cpp index 29c501d38..5993a1332 100644 --- a/src/logic/scripting/lua/libtime.cpp +++ b/src/logic/scripting/lua/libtime.cpp @@ -1,4 +1,4 @@ -#include "../../../engine.hpp" +#include #include "../../../window/Window.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp index 38ad347f9..a1736f573 100644 --- a/src/logic/scripting/lua/libworld.cpp +++ b/src/logic/scripting/lua/libworld.cpp @@ -3,7 +3,7 @@ #include "../../../assets/Assets.hpp" #include "../../../assets/AssetsLoader.hpp" -#include "../../../engine.hpp" +#include #include "../../../files/engine_paths.hpp" #include "../../../world/Level.hpp" #include "../../../world/World.hpp" diff --git a/src/logic/scripting/lua/lua_commons.hpp b/src/logic/scripting/lua/lua_commons.hpp index 8e82899c9..35ca9b2f3 100644 --- a/src/logic/scripting/lua/lua_commons.hpp +++ b/src/logic/scripting/lua/lua_commons.hpp @@ -1,7 +1,7 @@ #ifndef LOGIC_SCRIPTING_LUA_HPP_ #define LOGIC_SCRIPTING_LUA_HPP_ -#include "../../../delegates.hpp" +#include #include "../scripting.hpp" #ifdef __linux__ diff --git a/src/logic/scripting/lua/lua_engine.hpp b/src/logic/scripting/lua/lua_engine.hpp index a21d42926..d57c62c4c 100644 --- a/src/logic/scripting/lua/lua_engine.hpp +++ b/src/logic/scripting/lua/lua_engine.hpp @@ -5,7 +5,7 @@ #include #include "../../../data/dynamic.hpp" -#include "../../../delegates.hpp" +#include #include "../scripting_functional.hpp" #include "lua_util.hpp" diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index d928ad93b..7b0e84118 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -6,7 +6,7 @@ #include "../../content/Content.hpp" #include "../../content/ContentPack.hpp" #include "../../debug/Logger.hpp" -#include "../../engine.hpp" +#include #include "../../files/engine_paths.hpp" #include "../../files/files.hpp" #include "../../frontend/UiDocument.hpp" diff --git a/src/logic/scripting/scripting.hpp b/src/logic/scripting/scripting.hpp index 85959b825..f955a5275 100644 --- a/src/logic/scripting/scripting.hpp +++ b/src/logic/scripting/scripting.hpp @@ -8,8 +8,8 @@ #include #include "../../data/dynamic.hpp" -#include "../../delegates.hpp" -#include "../../typedefs.hpp" +#include +#include #include "scripting_functional.hpp" namespace fs = std::filesystem; diff --git a/src/logic/scripting/scripting_functional.hpp b/src/logic/scripting/scripting_functional.hpp index b0bec2184..40ccb5962 100644 --- a/src/logic/scripting/scripting_functional.hpp +++ b/src/logic/scripting/scripting_functional.hpp @@ -5,8 +5,8 @@ #include #include "../../data/dynamic.hpp" -#include "../../delegates.hpp" -#include "../../typedefs.hpp" +#include +#include namespace scripting { using common_func = diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp index 97154337e..c8019dc10 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 #include "../../files/files.hpp" #include "../../frontend/hud.hpp" #include "../../objects/Player.hpp" diff --git a/src/logic/scripting/scripting_hud.hpp b/src/logic/scripting/scripting_hud.hpp index 0ca10c040..1b8e9ae2f 100644 --- a/src/logic/scripting/scripting_hud.hpp +++ b/src/logic/scripting/scripting_hud.hpp @@ -4,7 +4,7 @@ #include #include -#include "../../typedefs.hpp" +#include namespace fs = std::filesystem; diff --git a/src/maths/fastmaths.hpp b/src/maths/fastmaths.hpp index bade03900..4c03fd61b 100644 --- a/src/maths/fastmaths.hpp +++ b/src/maths/fastmaths.hpp @@ -1,7 +1,7 @@ #ifndef MATHS_FASTMATHS_HPP_ #define MATHS_FASTMATHS_HPP_ -#include "../typedefs.hpp" +#include class FastRandom { uint seed; diff --git a/src/maths/voxmaths.hpp b/src/maths/voxmaths.hpp index daae514cb..bd11e79bb 100644 --- a/src/maths/voxmaths.hpp +++ b/src/maths/voxmaths.hpp @@ -1,7 +1,7 @@ #ifndef VOXNATHS_HPP_ #define VOXNATHS_HPP_ -#include "../typedefs.hpp" +#include inline int floordiv(int a, int b) { if (a < 0 && a % b) { diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index de5dc1160..83a09ca2f 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -7,7 +7,7 @@ #include "../content/Content.hpp" #include "../data/dynamic_util.hpp" #include "../debug/Logger.hpp" -#include "../engine.hpp" +#include #include "../graphics/core/DrawContext.hpp" #include "../graphics/core/LineBatch.hpp" #include "../graphics/core/Model.hpp" diff --git a/src/objects/Entities.hpp b/src/objects/Entities.hpp index eb4d963fc..e8fa1bc20 100644 --- a/src/objects/Entities.hpp +++ b/src/objects/Entities.hpp @@ -8,7 +8,7 @@ #include "../data/dynamic.hpp" #include "../physics/Hitbox.hpp" -#include "../typedefs.hpp" +#include #include "../util/Clock.hpp" #define GLM_ENABLE_EXPERIMENTAL #include diff --git a/src/objects/EntityDef.hpp b/src/objects/EntityDef.hpp index 6ddee6696..9002f1aeb 100644 --- a/src/objects/EntityDef.hpp +++ b/src/objects/EntityDef.hpp @@ -5,7 +5,7 @@ #include #include -#include "../typedefs.hpp" +#include #include "../maths/aabb.hpp" #include "../physics/Hitbox.hpp" diff --git a/src/objects/Player.hpp b/src/objects/Player.hpp index 8e97bde1a..a0bc88bf3 100644 --- a/src/objects/Player.hpp +++ b/src/objects/Player.hpp @@ -8,7 +8,7 @@ #include "../data/dynamic.hpp" #include "../interfaces/Object.hpp" #include "../interfaces/Serializable.hpp" -#include "../settings.hpp" +#include #include "../voxels/voxel.hpp" class Camera; diff --git a/src/objects/rigging.hpp b/src/objects/rigging.hpp index 2b1b54a1d..0abf1fb14 100644 --- a/src/objects/rigging.hpp +++ b/src/objects/rigging.hpp @@ -7,7 +7,7 @@ #include #include -#include "../typedefs.hpp" +#include class Assets; class ModelBatch; diff --git a/src/physics/Hitbox.hpp b/src/physics/Hitbox.hpp index 6d96f3f04..932bc4d43 100644 --- a/src/physics/Hitbox.hpp +++ b/src/physics/Hitbox.hpp @@ -2,7 +2,7 @@ #define PHYSICS_HITBOX_HPP_ #include "../maths/aabb.hpp" -#include "../typedefs.hpp" +#include #include #include diff --git a/src/physics/PhysicsSolver.hpp b/src/physics/PhysicsSolver.hpp index fbc9812bb..f4239f9db 100644 --- a/src/physics/PhysicsSolver.hpp +++ b/src/physics/PhysicsSolver.hpp @@ -3,7 +3,7 @@ #include "Hitbox.hpp" -#include "../typedefs.hpp" +#include #include "../voxels/voxel.hpp" #include diff --git a/src/settings.hpp b/src/settings.hpp index ccc3f9060..bd556766d 100644 --- a/src/settings.hpp +++ b/src/settings.hpp @@ -5,8 +5,8 @@ #include #include "data/setting.hpp" -#include "constants.hpp" -#include "typedefs.hpp" +#include +#include struct AudioSettings { /// @brief try to initialize AL backend diff --git a/src/util/BufferPool.hpp b/src/util/BufferPool.hpp index 4b72acf6a..cf7b0412c 100644 --- a/src/util/BufferPool.hpp +++ b/src/util/BufferPool.hpp @@ -6,7 +6,7 @@ #include #include -#include "../typedefs.hpp" +#include namespace util { /// @brief Thread-safe pool of same-sized buffers diff --git a/src/util/RunnablesList.hpp b/src/util/RunnablesList.hpp index 8955c9a42..7ae8af4f2 100644 --- a/src/util/RunnablesList.hpp +++ b/src/util/RunnablesList.hpp @@ -5,8 +5,8 @@ #include #include -#include "../delegates.hpp" -#include "../typedefs.hpp" +#include +#include namespace util { class RunnablesList { diff --git a/src/util/ThreadPool.hpp b/src/util/ThreadPool.hpp index 93c61aecd..8b76830e1 100644 --- a/src/util/ThreadPool.hpp +++ b/src/util/ThreadPool.hpp @@ -11,7 +11,7 @@ #include #include "../debug/Logger.hpp" -#include "../delegates.hpp" +#include #include "../interfaces/Task.hpp" namespace util { diff --git a/src/util/data_io.hpp b/src/util/data_io.hpp index dbfae0c6e..9aa1248cd 100644 --- a/src/util/data_io.hpp +++ b/src/util/data_io.hpp @@ -1,7 +1,7 @@ #ifndef UTIL_DATA_IO_HPP_ #define UTIL_DATA_IO_HPP_ -#include "../typedefs.hpp" +#include namespace dataio { /* Read big-endian 16 bit signed integer from bytes */ diff --git a/src/util/platform.cpp b/src/util/platform.cpp index c7b71bbf9..00e64b12d 100644 --- a/src/util/platform.cpp +++ b/src/util/platform.cpp @@ -6,7 +6,7 @@ #include #include -#include "../typedefs.hpp" +#include #ifdef _WIN32 #include diff --git a/src/util/stringutil.hpp b/src/util/stringutil.hpp index c25bd1824..04de47a87 100644 --- a/src/util/stringutil.hpp +++ b/src/util/stringutil.hpp @@ -4,7 +4,7 @@ #include #include -#include "../typedefs.hpp" +#include namespace util { /// @brief Function used for string serialization in text formats diff --git a/src/util/timeutil.hpp b/src/util/timeutil.hpp index 4e032d9d6..b92d84d45 100644 --- a/src/util/timeutil.hpp +++ b/src/util/timeutil.hpp @@ -3,7 +3,7 @@ #include -#include "../typedefs.hpp" +#include namespace timeutil { class Timer { diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index c6a2ec7ed..2106e3533 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -1,5 +1,5 @@ -#include "engine.hpp" -#include "settings.hpp" +#include +#include #include "files/settings_io.hpp" #include "files/engine_paths.hpp" #include "util/platform.hpp" diff --git a/src/voxels/Block.cpp b/src/voxels/Block.cpp index 4abdd339b..d9ab6461f 100644 --- a/src/voxels/Block.cpp +++ b/src/voxels/Block.cpp @@ -2,7 +2,7 @@ #include -#include "../core_defs.hpp" +#include #include "../util/stringutil.hpp" std::string to_string(BlockModel model) { diff --git a/src/voxels/Block.hpp b/src/voxels/Block.hpp index 9a01bb44f..251fbb83d 100644 --- a/src/voxels/Block.hpp +++ b/src/voxels/Block.hpp @@ -8,7 +8,7 @@ #include "../maths/UVRegion.hpp" #include "../maths/aabb.hpp" -#include "../typedefs.hpp" +#include inline std::string BLOCK_ITEM_SUFFIX = ".item"; diff --git a/src/voxels/Chunk.hpp b/src/voxels/Chunk.hpp index 0d8b0d8ad..5023266fd 100644 --- a/src/voxels/Chunk.hpp +++ b/src/voxels/Chunk.hpp @@ -6,7 +6,7 @@ #include #include -#include "../constants.hpp" +#include #include "../lighting/Lightmap.hpp" #include "voxel.hpp" diff --git a/src/voxels/Chunks.hpp b/src/voxels/Chunks.hpp index fbc1b9d10..73fea7ab0 100644 --- a/src/voxels/Chunks.hpp +++ b/src/voxels/Chunks.hpp @@ -7,7 +7,7 @@ #include #include -#include "../typedefs.hpp" +#include #include "voxel.hpp" class VoxelRenderer; diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp index 389ac3b85..c518005d2 100644 --- a/src/voxels/ChunksStorage.cpp +++ b/src/voxels/ChunksStorage.cpp @@ -7,7 +7,7 @@ #include "../lighting/Lightmap.hpp" #include "../maths/voxmaths.hpp" #include "../objects/Entities.hpp" -#include "../typedefs.hpp" +#include #include "../world/Level.hpp" #include "../world/World.hpp" #include "Block.hpp" diff --git a/src/voxels/ChunksStorage.hpp b/src/voxels/ChunksStorage.hpp index 7560b8a45..8b4253501 100644 --- a/src/voxels/ChunksStorage.hpp +++ b/src/voxels/ChunksStorage.hpp @@ -4,7 +4,7 @@ #include #include -#include "../typedefs.hpp" +#include #include "voxel.hpp" #define GLM_ENABLE_EXPERIMENTAL diff --git a/src/voxels/DefaultWorldGenerator.cpp b/src/voxels/DefaultWorldGenerator.cpp index 99a5a0f25..98a2bbe74 100644 --- a/src/voxels/DefaultWorldGenerator.cpp +++ b/src/voxels/DefaultWorldGenerator.cpp @@ -15,7 +15,7 @@ #include #include "../content/Content.hpp" -#include "../core_defs.hpp" +#include #include "../maths/FastNoiseLite.h" #include "../maths/util.hpp" #include "../maths/voxmaths.hpp" diff --git a/src/voxels/DefaultWorldGenerator.hpp b/src/voxels/DefaultWorldGenerator.hpp index 63fbb6d66..28721eb77 100644 --- a/src/voxels/DefaultWorldGenerator.hpp +++ b/src/voxels/DefaultWorldGenerator.hpp @@ -1,7 +1,7 @@ #ifndef VOXELS_DEFAULTWORLDGENERATOR_HPP_ #define VOXELS_DEFAULTWORLDGENERATOR_HPP_ -#include "../typedefs.hpp" +#include #include "../voxels/WorldGenerator.hpp" struct voxel; diff --git a/src/voxels/FlatWorldGenerator.cpp b/src/voxels/FlatWorldGenerator.cpp index 2121f8887..b56c12a43 100644 --- a/src/voxels/FlatWorldGenerator.cpp +++ b/src/voxels/FlatWorldGenerator.cpp @@ -1,7 +1,7 @@ #include "FlatWorldGenerator.hpp" #include "../content/Content.hpp" -#include "../core_defs.hpp" +#include #include "Chunk.hpp" #include "voxel.hpp" diff --git a/src/voxels/FlatWorldGenerator.hpp b/src/voxels/FlatWorldGenerator.hpp index bc507b302..7e0d92202 100644 --- a/src/voxels/FlatWorldGenerator.hpp +++ b/src/voxels/FlatWorldGenerator.hpp @@ -1,7 +1,7 @@ #ifndef VOXELS_FLATWORLDGENERATOR_HPP_ #define VOXELS_FLATWORLDGENERATOR_HPP_ -#include "../typedefs.hpp" +#include #include "../voxels/WorldGenerator.hpp" struct voxel; diff --git a/src/voxels/VoxelsVolume.hpp b/src/voxels/VoxelsVolume.hpp index 59afbbafc..8bf0016f6 100644 --- a/src/voxels/VoxelsVolume.hpp +++ b/src/voxels/VoxelsVolume.hpp @@ -1,8 +1,8 @@ #ifndef VOXELS_VOXELSVOLUME_HPP_ #define VOXELS_VOXELSVOLUME_HPP_ -#include "../constants.hpp" -#include "../typedefs.hpp" +#include +#include #include "voxel.hpp" class VoxelsVolume { diff --git a/src/voxels/WorldGenerator.hpp b/src/voxels/WorldGenerator.hpp index 1c57c0ffa..b404dd589 100644 --- a/src/voxels/WorldGenerator.hpp +++ b/src/voxels/WorldGenerator.hpp @@ -3,7 +3,7 @@ #include -#include "../typedefs.hpp" +#include struct voxel; class Content; diff --git a/src/voxels/voxel.hpp b/src/voxels/voxel.hpp index 637375f51..9243dc89b 100644 --- a/src/voxels/voxel.hpp +++ b/src/voxels/voxel.hpp @@ -1,7 +1,7 @@ #ifndef VOXELS_VOXEL_HPP_ #define VOXELS_VOXEL_HPP_ -#include "../typedefs.hpp" +#include inline constexpr int BLOCK_DIR_NORTH = 0x0; inline constexpr int BLOCK_DIR_WEST = 0x1; diff --git a/src/window/Events.hpp b/src/window/Events.hpp index 5977d8ae2..aa5b64e5a 100644 --- a/src/window/Events.hpp +++ b/src/window/Events.hpp @@ -5,7 +5,7 @@ #include #include -#include "../typedefs.hpp" +#include #include "input.hpp" inline constexpr short KEYS_BUFFER_SIZE = 1036; diff --git a/src/window/Window.cpp b/src/window/Window.cpp index 798e862ef..9ce1a0635 100644 --- a/src/window/Window.cpp +++ b/src/window/Window.cpp @@ -10,7 +10,7 @@ #include "../debug/Logger.hpp" #include "../graphics/core/ImageData.hpp" #include "../graphics/core/Texture.hpp" -#include "../settings.hpp" +#include #include "../util/ObjectsKeeper.hpp" #include "Events.hpp" diff --git a/src/window/Window.hpp b/src/window/Window.hpp index a19ed5bc6..e5214725c 100644 --- a/src/window/Window.hpp +++ b/src/window/Window.hpp @@ -6,7 +6,7 @@ #include #include -#include "../typedefs.hpp" +#include class ImageData; struct DisplaySettings; diff --git a/src/world/Level.cpp b/src/world/Level.cpp index f27ae8d8b..0ea50190f 100644 --- a/src/world/Level.cpp +++ b/src/world/Level.cpp @@ -9,7 +9,7 @@ #include "../objects/Player.hpp" #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" -#include "../settings.hpp" +#include #include "../voxels/Chunk.hpp" #include "../voxels/Chunks.hpp" #include "../voxels/ChunksStorage.hpp" diff --git a/src/world/World.cpp b/src/world/World.cpp index e6cff781b..f5546f4f6 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -11,7 +11,7 @@ #include "../items/Inventories.hpp" #include "../objects/Entities.hpp" #include "../objects/Player.hpp" -#include "../settings.hpp" +#include #include "../voxels/Chunk.hpp" #include "../voxels/Chunks.hpp" #include "../voxels/ChunksStorage.hpp" diff --git a/src/world/World.hpp b/src/world/World.hpp index 2c4eac32a..667be01fc 100644 --- a/src/world/World.hpp +++ b/src/world/World.hpp @@ -9,7 +9,7 @@ #include "../content/ContentPack.hpp" #include "../data/dynamic.hpp" #include "../interfaces/Serializable.hpp" -#include "../typedefs.hpp" +#include #include "../util/timeutil.hpp" class Content; From 21ff65d78160cd295a6f43f329120d345bd32de8 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 11:08:07 +0300 Subject: [PATCH 03/31] assets/ --- src/engine.cpp | 2 +- src/engine.hpp | 2 +- src/frontend/ContentGfxCache.cpp | 2 +- src/frontend/LevelFrontend.cpp | 2 +- src/frontend/hud.cpp | 2 +- src/graphics/render/BlocksPreview.cpp | 2 +- src/graphics/render/ModelBatch.cpp | 2 +- src/graphics/render/Skybox.cpp | 2 +- src/graphics/render/WorldRenderer.cpp | 2 +- src/graphics/ui/GUI.cpp | 2 +- src/graphics/ui/elements/Image.cpp | 2 +- src/graphics/ui/elements/InventoryView.cpp | 2 +- src/graphics/ui/elements/Label.cpp | 2 +- src/graphics/ui/elements/Plotter.cpp | 2 +- src/graphics/ui/elements/TextBox.cpp | 2 +- src/graphics/ui/elements/TrackBar.cpp | 2 +- src/logic/scripting/lua/libgui.cpp | 2 +- src/logic/scripting/lua/libhud.cpp | 2 +- src/logic/scripting/lua/libpack.cpp | 2 +- src/logic/scripting/lua/libworld.cpp | 4 ++-- src/objects/Entities.cpp | 2 +- src/objects/rigging.cpp | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/engine.cpp b/src/engine.cpp index dbe894ad6..b48a9c2e0 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -3,7 +3,7 @@ #define GLEW_STATIC #include "debug/Logger.hpp" -#include "assets/AssetsLoader.hpp" +#include #include "audio/audio.hpp" #include "coders/GLSLExtension.hpp" #include "coders/imageio.hpp" diff --git a/src/engine.hpp b/src/engine.hpp index 4ed268678..49c923123 100644 --- a/src/engine.hpp +++ b/src/engine.hpp @@ -4,7 +4,7 @@ #include #include -#include "assets/Assets.hpp" +#include #include "content/content_fwd.hpp" #include "content/ContentPack.hpp" #include "content/PacksManager.hpp" diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index d434db2b9..71ffe006b 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -2,7 +2,7 @@ #include "UiDocument.hpp" -#include "../assets/Assets.hpp" +#include #include "../content/Content.hpp" #include "../content/ContentPack.hpp" #include diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index d67c92614..c41d39b29 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -2,7 +2,7 @@ #include "ContentGfxCache.hpp" -#include "../assets/Assets.hpp" +#include #include "../audio/audio.hpp" #include "../content/Content.hpp" #include "../graphics/core/Atlas.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 7c0ad0f76..9bc7a7580 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -4,7 +4,7 @@ #include "LevelFrontend.hpp" #include "UiDocument.hpp" -#include "../assets/Assets.hpp" +#include #include "../content/Content.hpp" #include #include diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index e02daf52d..c9a89eb9e 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -1,6 +1,6 @@ #include "BlocksPreview.hpp" -#include "../../assets/Assets.hpp" +#include #include #include "../../content/Content.hpp" #include "../../frontend/ContentGfxCache.hpp" diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp index 468fcbd52..c3723dbaf 100644 --- a/src/graphics/render/ModelBatch.cpp +++ b/src/graphics/render/ModelBatch.cpp @@ -4,7 +4,7 @@ #include "../core/Model.hpp" #include "../core/Atlas.hpp" #include "../core/Texture.hpp" -#include "../../assets/Assets.hpp" +#include #include "../../window/Window.hpp" #include "../../voxels/Chunks.hpp" #include "../../lighting/Lightmap.hpp" diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp index a7aa3c46e..b2a6843af 100644 --- a/src/graphics/render/Skybox.cpp +++ b/src/graphics/render/Skybox.cpp @@ -1,5 +1,5 @@ #include "Skybox.hpp" -#include "../../assets/Assets.hpp" +#include #include "../../graphics/core/Shader.hpp" #include "../../graphics/core/Mesh.hpp" #include "../../graphics/core/Batch3D.hpp" diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 7a64267ce..f7d0c387b 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -8,7 +8,7 @@ #include #include -#include "../../assets/Assets.hpp" +#include #include "../../content/Content.hpp" #include #include "../../frontend/LevelFrontend.hpp" diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp index 40ae9bf57..946301a01 100644 --- a/src/graphics/ui/GUI.cpp +++ b/src/graphics/ui/GUI.cpp @@ -6,7 +6,7 @@ #include "elements/Label.hpp" #include "elements/Menu.hpp" -#include "../../assets/Assets.hpp" +#include #include "../../frontend/UiDocument.hpp" #include "../../frontend/locale.hpp" #include "../../graphics/core/Batch2D.hpp" diff --git a/src/graphics/ui/elements/Image.cpp b/src/graphics/ui/elements/Image.cpp index b6006c72b..b2d448b9e 100644 --- a/src/graphics/ui/elements/Image.cpp +++ b/src/graphics/ui/elements/Image.cpp @@ -6,7 +6,7 @@ #include "../../core/Batch2D.hpp" #include "../../core/Texture.hpp" #include "../../core/Atlas.hpp" -#include "../../../assets/Assets.hpp" +#include #include "../../../maths/UVRegion.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 3b64bbb16..7a6fda316 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -1,6 +1,6 @@ #include "InventoryView.hpp" -#include "../../../assets/Assets.hpp" +#include #include "../../../content/Content.hpp" #include "../../../frontend/LevelFrontend.hpp" #include "../../../frontend/locale.hpp" diff --git a/src/graphics/ui/elements/Label.cpp b/src/graphics/ui/elements/Label.cpp index e2fd44dbe..131b3ad9d 100644 --- a/src/graphics/ui/elements/Label.cpp +++ b/src/graphics/ui/elements/Label.cpp @@ -4,7 +4,7 @@ #include "../../core/DrawContext.hpp" #include "../../core/Batch2D.hpp" #include "../../core/Font.hpp" -#include "../../../assets/Assets.hpp" +#include #include "../../../util/stringutil.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/Plotter.cpp b/src/graphics/ui/elements/Plotter.cpp index 28057ae58..d574f3608 100644 --- a/src/graphics/ui/elements/Plotter.cpp +++ b/src/graphics/ui/elements/Plotter.cpp @@ -3,7 +3,7 @@ #include "../../core/Batch2D.hpp" #include "../../core/Font.hpp" #include "../../core/DrawContext.hpp" -#include "../../../assets/Assets.hpp" +#include #include "../../../util/stringutil.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp index 26eaae969..f9b5545e8 100644 --- a/src/graphics/ui/elements/TextBox.cpp +++ b/src/graphics/ui/elements/TextBox.cpp @@ -7,7 +7,7 @@ #include "../../core/DrawContext.hpp" #include "../../core/Batch2D.hpp" #include "../../core/Font.hpp" -#include "../../../assets/Assets.hpp" +#include #include "../../../util/stringutil.hpp" #include "../../../window/Events.hpp" #include "../../../window/Window.hpp" diff --git a/src/graphics/ui/elements/TrackBar.cpp b/src/graphics/ui/elements/TrackBar.cpp index ab90b763b..c06566dac 100644 --- a/src/graphics/ui/elements/TrackBar.cpp +++ b/src/graphics/ui/elements/TrackBar.cpp @@ -4,7 +4,7 @@ #include "../../core/DrawContext.hpp" #include "../../core/Batch2D.hpp" -#include "../../../assets/Assets.hpp" +#include using namespace gui; diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp index ce5721139..55af846d2 100644 --- a/src/logic/scripting/lua/libgui.cpp +++ b/src/logic/scripting/lua/libgui.cpp @@ -1,4 +1,4 @@ -#include "../../../assets/Assets.hpp" +#include #include #include "../../../frontend/UiDocument.hpp" #include "../../../frontend/locale.hpp" diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index 8ad6b6e68..5c32c8a08 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -1,7 +1,7 @@ #include #include -#include "../../../assets/Assets.hpp" +#include #include "../../../content/Content.hpp" #include #include "../../../frontend/UiDocument.hpp" diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index 901cce9f1..59d66e106 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -3,7 +3,7 @@ #include #include -#include "../../../assets/AssetsLoader.hpp" +#include #include "../../../content/Content.hpp" #include #include "../../../files/WorldFiles.hpp" diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp index a1736f573..0e8cda6f0 100644 --- a/src/logic/scripting/lua/libworld.cpp +++ b/src/logic/scripting/lua/libworld.cpp @@ -1,8 +1,8 @@ #include #include -#include "../../../assets/Assets.hpp" -#include "../../../assets/AssetsLoader.hpp" +#include +#include #include #include "../../../files/engine_paths.hpp" #include "../../../world/Level.hpp" diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index 83a09ca2f..3404d957d 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -3,7 +3,7 @@ #include #include -#include "../assets/Assets.hpp" +#include #include "../content/Content.hpp" #include "../data/dynamic_util.hpp" #include "../debug/Logger.hpp" diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp index c592e104e..c93523beb 100644 --- a/src/objects/rigging.cpp +++ b/src/objects/rigging.cpp @@ -1,6 +1,6 @@ #include "rigging.hpp" -#include "../assets/Assets.hpp" +#include #include "../coders/json.hpp" #include "../data/dynamic_util.hpp" #include "../graphics/core/Model.hpp" From a745507dddb3c8596d23d0e6797ba1cfe6cf3d23 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 11:23:08 +0300 Subject: [PATCH 04/31] coders/ --- src/assets/AssetsLoader.cpp | 2 +- src/assets/assetload_funcs.cpp | 10 +++++----- src/audio/audio.cpp | 4 ++-- src/content/ContentLUT.cpp | 2 +- src/content/ContentLoader.cpp | 2 +- src/content/ContentPack.cpp | 2 +- src/data/dynamic.cpp | 2 +- src/engine.cpp | 8 ++++---- src/files/WorldFiles.cpp | 4 ++-- src/files/WorldRegions.cpp | 4 ++-- src/files/files.cpp | 8 ++++---- src/files/settings_io.cpp | 4 ++-- src/frontend/locale.cpp | 4 ++-- src/frontend/menu.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/graphics/core/Shader.cpp | 2 +- src/graphics/ui/gui_xml.hpp | 2 +- src/interfaces/Serializable.hpp | 2 +- src/logic/CommandsInterpreter.cpp | 2 +- src/logic/EngineController.cpp | 2 +- src/logic/scripting/lua/libconsole.cpp | 2 +- src/logic/scripting/lua/libfile.cpp | 2 +- src/logic/scripting/lua/libjson.cpp | 2 +- src/logic/scripting/lua/libtoml.cpp | 2 +- src/logic/scripting/scripting_functional.cpp | 2 +- src/objects/rigging.cpp | 2 +- src/voxels/Chunks.cpp | 4 ++-- src/window/Events.cpp | 4 ++-- 28 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index 663bc80de..4b26c34f9 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -4,7 +4,7 @@ #include #include -#include "../coders/imageio.hpp" +#include #include #include "../content/Content.hpp" #include "../content/ContentPack.hpp" diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp index 702c38e0a..31eec6ca4 100644 --- a/src/assets/assetload_funcs.cpp +++ b/src/assets/assetload_funcs.cpp @@ -5,11 +5,11 @@ #include #include "../audio/audio.hpp" -#include "../coders/GLSLExtension.hpp" -#include "../coders/commons.hpp" -#include "../coders/imageio.hpp" -#include "../coders/json.hpp" -#include "../coders/obj.hpp" +#include +#include +#include +#include +#include #include #include "../data/dynamic.hpp" #include "../files/engine_paths.hpp" diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index ca743b548..0b8f979a0 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -4,8 +4,8 @@ #include #include -#include "../coders/ogg.hpp" -#include "../coders/wav.hpp" +#include +#include #include "AL/ALAudio.hpp" #include "NoAudio.hpp" diff --git a/src/content/ContentLUT.cpp b/src/content/ContentLUT.cpp index fafb81e1b..620b4d0f1 100644 --- a/src/content/ContentLUT.cpp +++ b/src/content/ContentLUT.cpp @@ -2,7 +2,7 @@ #include -#include "../coders/json.hpp" +#include #include #include "../files/files.hpp" #include "../items/ItemDef.hpp" diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index e518340ed..387cea259 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -6,7 +6,7 @@ #include #include -#include "../coders/json.hpp" +#include #include #include "../data/dynamic.hpp" #include "../debug/Logger.hpp" diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp index 6fdd83e3c..d972a026f 100644 --- a/src/content/ContentPack.cpp +++ b/src/content/ContentPack.cpp @@ -4,7 +4,7 @@ #include #include -#include "../coders/json.hpp" +#include #include "../data/dynamic.hpp" #include "../files/engine_paths.hpp" #include "../files/files.hpp" diff --git a/src/data/dynamic.cpp b/src/data/dynamic.cpp index dc4171ccc..792f1932a 100644 --- a/src/data/dynamic.cpp +++ b/src/data/dynamic.cpp @@ -1,6 +1,6 @@ #include "dynamic.hpp" -#include "../coders/json.hpp" +#include using namespace dynamic; diff --git a/src/engine.cpp b/src/engine.cpp index b48a9c2e0..8782749a7 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -5,10 +5,10 @@ #include "debug/Logger.hpp" #include #include "audio/audio.hpp" -#include "coders/GLSLExtension.hpp" -#include "coders/imageio.hpp" -#include "coders/json.hpp" -#include "coders/toml.hpp" +#include +#include +#include +#include #include "content/Content.hpp" #include "content/ContentBuilder.hpp" #include "content/ContentLoader.hpp" diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 46ccba7b1..82f98c4a4 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -8,8 +8,8 @@ #include #include -#include "../coders/byte_utils.hpp" -#include "../coders/json.hpp" +#include +#include #include #include "../content/Content.hpp" #include diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp index 5660ab75a..f58526751 100644 --- a/src/files/WorldRegions.cpp +++ b/src/files/WorldRegions.cpp @@ -4,8 +4,8 @@ #include #include -#include "../coders/byte_utils.hpp" -#include "../coders/rle.hpp" +#include +#include #include "../data/dynamic.hpp" #include "../items/Inventory.hpp" #include "../maths/voxmaths.hpp" diff --git a/src/files/files.cpp b/src/files/files.cpp index e471a6277..469feec70 100644 --- a/src/files/files.cpp +++ b/src/files/files.cpp @@ -7,10 +7,10 @@ #include #include -#include "../coders/commons.hpp" -#include "../coders/gzip.hpp" -#include "../coders/json.hpp" -#include "../coders/toml.hpp" +#include +#include +#include +#include #include "../data/dynamic.hpp" #include "../util/stringutil.hpp" diff --git a/src/files/settings_io.cpp b/src/files/settings_io.cpp index 2799ac810..133cddde1 100644 --- a/src/files/settings_io.cpp +++ b/src/files/settings_io.cpp @@ -3,8 +3,8 @@ #include #include -#include "../coders/json.hpp" -#include "../coders/toml.hpp" +#include +#include #include "../debug/Logger.hpp" #include #include "../window/Events.hpp" diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp index f4f08a265..6c6823c03 100644 --- a/src/frontend/locale.cpp +++ b/src/frontend/locale.cpp @@ -2,8 +2,8 @@ #include -#include "../coders/json.hpp" -#include "../coders/commons.hpp" +#include +#include #include "../content/ContentPack.hpp" #include "../files/files.hpp" #include "../util/stringutil.hpp" diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index a69a91e77..048829335 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -14,7 +14,7 @@ #include "../graphics/ui/GUI.hpp" #include "../logic/scripting/scripting.hpp" #include -#include "../coders/commons.hpp" +#include #include "../util/stringutil.hpp" #include "../window/Window.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index f11ccd469..f7546360b 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -4,7 +4,7 @@ #include "../hud.hpp" #include "../LevelFrontend.hpp" #include "../../audio/audio.hpp" -#include "../../coders/imageio.hpp" +#include #include "../../debug/Logger.hpp" #include #include "../../files/files.hpp" diff --git a/src/graphics/core/Shader.cpp b/src/graphics/core/Shader.cpp index a758e6477..56c336eae 100644 --- a/src/graphics/core/Shader.cpp +++ b/src/graphics/core/Shader.cpp @@ -11,7 +11,7 @@ #include #include -#include "../../coders/GLSLExtension.hpp" +#include namespace fs = std::filesystem; diff --git a/src/graphics/ui/gui_xml.hpp b/src/graphics/ui/gui_xml.hpp index bf466baa7..b49e5c070 100644 --- a/src/graphics/ui/gui_xml.hpp +++ b/src/graphics/ui/gui_xml.hpp @@ -2,7 +2,7 @@ #define FRONTEND_GUI_GUI_XML_HPP_ #include "GUI.hpp" -#include "../../coders/xml.hpp" +#include #include #include diff --git a/src/interfaces/Serializable.hpp b/src/interfaces/Serializable.hpp index cc64f2260..378536620 100644 --- a/src/interfaces/Serializable.hpp +++ b/src/interfaces/Serializable.hpp @@ -1,7 +1,7 @@ #ifndef SERIALIZABLE_HPP_ #define SERIALIZABLE_HPP_ -#include "../coders/json.hpp" +#include #include diff --git a/src/logic/CommandsInterpreter.cpp b/src/logic/CommandsInterpreter.cpp index e7dbbac60..a197cb4ac 100644 --- a/src/logic/CommandsInterpreter.cpp +++ b/src/logic/CommandsInterpreter.cpp @@ -3,7 +3,7 @@ #include #include -#include "../coders/commons.hpp" +#include #include "../util/stringutil.hpp" using namespace cmd; diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index 2a6c36ef0..ee05f3f88 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -4,7 +4,7 @@ #include #include -#include "../coders/commons.hpp" +#include #include "../content/ContentLUT.hpp" #include "../debug/Logger.hpp" #include diff --git a/src/logic/scripting/lua/libconsole.cpp b/src/logic/scripting/lua/libconsole.cpp index 0ec904a2b..28655f801 100644 --- a/src/logic/scripting/lua/libconsole.cpp +++ b/src/logic/scripting/lua/libconsole.cpp @@ -1,4 +1,4 @@ -#include "../../../coders/commons.hpp" +#include #include #include "../../CommandsInterpreter.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libfile.cpp index b140bbc41..df4cf5456 100644 --- a/src/logic/scripting/lua/libfile.cpp +++ b/src/logic/scripting/lua/libfile.cpp @@ -1,7 +1,7 @@ #include #include -#include "../../../coders/gzip.hpp" +#include #include #include "../../../files/engine_paths.hpp" #include "../../../files/files.hpp" diff --git a/src/logic/scripting/lua/libjson.cpp b/src/logic/scripting/lua/libjson.cpp index 3fbe173c1..f30b7cf29 100644 --- a/src/logic/scripting/lua/libjson.cpp +++ b/src/logic/scripting/lua/libjson.cpp @@ -1,4 +1,4 @@ -#include "../../../coders/json.hpp" +#include #include "../../../data/dynamic.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libtoml.cpp b/src/logic/scripting/lua/libtoml.cpp index 5b3c01624..06a793993 100644 --- a/src/logic/scripting/lua/libtoml.cpp +++ b/src/logic/scripting/lua/libtoml.cpp @@ -1,4 +1,4 @@ -#include "../../../coders/toml.hpp" +#include #include "../../../data/dynamic.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/scripting_functional.cpp b/src/logic/scripting/scripting_functional.cpp index db26db80b..2854c6c5b 100644 --- a/src/logic/scripting/scripting_functional.cpp +++ b/src/logic/scripting/scripting_functional.cpp @@ -1,6 +1,6 @@ #include "scripting_functional.hpp" -#include "../../coders/json.hpp" +#include #include "../../debug/Logger.hpp" #include "../../util/stringutil.hpp" #include "lua/lua_engine.hpp" diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp index c93523beb..828803720 100644 --- a/src/objects/rigging.cpp +++ b/src/objects/rigging.cpp @@ -1,7 +1,7 @@ #include "rigging.hpp" #include -#include "../coders/json.hpp" +#include #include "../data/dynamic_util.hpp" #include "../graphics/core/Model.hpp" #include "../graphics/render/ModelBatch.hpp" diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index 014712c6b..b9538f1fa 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -6,8 +6,8 @@ #include #include -#include "../coders/byte_utils.hpp" -#include "../coders/json.hpp" +#include +#include #include "../content/Content.hpp" #include "../files/WorldFiles.hpp" #include "../graphics/core/Mesh.hpp" diff --git a/src/window/Events.cpp b/src/window/Events.cpp index e2d3288ec..10448224a 100644 --- a/src/window/Events.cpp +++ b/src/window/Events.cpp @@ -165,8 +165,8 @@ void Events::setPosition(float xpos, float ypos) { Events::cursor.y = ypos; } -#include "../coders/json.hpp" -#include "../coders/toml.hpp" +#include +#include #include "../data/dynamic.hpp" std::string Events::writeBindings() { From 39618f09aa2780b586ed0c46a9db88d75046a55c Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 12:44:56 +0300 Subject: [PATCH 05/31] ContentBuilder.hpp patch --- src/content/ContentBuilder.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/content/ContentBuilder.hpp b/src/content/ContentBuilder.hpp index 10cdd4800..7c228b25f 100644 --- a/src/content/ContentBuilder.hpp +++ b/src/content/ContentBuilder.hpp @@ -5,8 +5,8 @@ #include #include -#include "../content/Content.hpp" -#include "../content/ContentPack.hpp" +#include "Content.hpp" +#include "ContentPack.hpp" #include "../items/ItemDef.hpp" #include "../objects/EntityDef.hpp" #include "../voxels/Block.hpp" From e1e345613953f93b20d8f7b685630511055b7b81 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 12:45:08 +0300 Subject: [PATCH 06/31] content/ --- src/assets/AssetsLoader.cpp | 4 ++-- src/core_defs.cpp | 4 ++-- src/engine.cpp | 6 +++--- src/engine.hpp | 6 +++--- src/files/WorldConverter.cpp | 2 +- src/files/WorldFiles.cpp | 2 +- src/files/WorldFiles.hpp | 2 +- src/files/engine_paths.hpp | 2 +- src/frontend/ContentGfxCache.cpp | 4 ++-- src/frontend/LevelFrontend.cpp | 2 +- src/frontend/debug_panel.cpp | 2 +- src/frontend/hud.cpp | 2 +- src/frontend/locale.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/graphics/render/BlocksPreview.cpp | 2 +- src/graphics/render/BlocksRenderer.cpp | 2 +- src/graphics/render/WorldRenderer.cpp | 2 +- src/graphics/ui/elements/InventoryView.cpp | 2 +- src/items/Inventory.cpp | 2 +- src/items/ItemStack.cpp | 2 +- src/lighting/LightSolver.cpp | 2 +- src/lighting/Lighting.cpp | 2 +- src/logic/BlocksController.cpp | 2 +- src/logic/ChunksController.cpp | 2 +- src/logic/EngineController.cpp | 2 +- src/logic/PlayerController.cpp | 2 +- src/logic/scripting/lua/libblock.cpp | 2 +- src/logic/scripting/lua/libcamera.cpp | 2 +- src/logic/scripting/lua/libentity.cpp | 2 +- src/logic/scripting/lua/libhud.cpp | 2 +- src/logic/scripting/lua/libinventory.cpp | 2 +- src/logic/scripting/lua/libitem.cpp | 2 +- src/logic/scripting/lua/libpack.cpp | 2 +- src/logic/scripting/scripting.cpp | 4 ++-- src/objects/Entities.cpp | 2 +- src/objects/Player.cpp | 2 +- src/voxels/Chunk.cpp | 2 +- src/voxels/Chunks.cpp | 2 +- src/voxels/ChunksStorage.cpp | 2 +- src/voxels/DefaultWorldGenerator.cpp | 2 +- src/voxels/FlatWorldGenerator.cpp | 2 +- src/voxels/WorldGenerator.cpp | 2 +- src/world/Level.cpp | 2 +- src/world/World.cpp | 4 ++-- src/world/World.hpp | 2 +- src/world/WorldGenerators.cpp | 2 +- 46 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index 4b26c34f9..750f87ace 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -6,8 +6,8 @@ #include #include -#include "../content/Content.hpp" -#include "../content/ContentPack.hpp" +#include +#include #include "../data/dynamic.hpp" #include "../debug/Logger.hpp" #include "../files/engine_paths.hpp" diff --git a/src/core_defs.cpp b/src/core_defs.cpp index 549988d02..ce9979146 100644 --- a/src/core_defs.cpp +++ b/src/core_defs.cpp @@ -1,8 +1,8 @@ #include "core_defs.hpp" #include "items/ItemDef.hpp" -#include "content/Content.hpp" -#include "content/ContentBuilder.hpp" +#include +#include #include "files/files.hpp" #include "files/engine_paths.hpp" #include "window/Window.hpp" diff --git a/src/engine.cpp b/src/engine.cpp index 8782749a7..140166f95 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -9,9 +9,9 @@ #include #include #include -#include "content/Content.hpp" -#include "content/ContentBuilder.hpp" -#include "content/ContentLoader.hpp" +#include +#include +#include #include #include "files/files.hpp" #include "files/settings_io.hpp" diff --git a/src/engine.hpp b/src/engine.hpp index 49c923123..6869e1da4 100644 --- a/src/engine.hpp +++ b/src/engine.hpp @@ -5,9 +5,9 @@ #include #include -#include "content/content_fwd.hpp" -#include "content/ContentPack.hpp" -#include "content/PacksManager.hpp" +#include +#include +#include #include "files/engine_paths.hpp" #include "util/ObjectsKeeper.hpp" diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp index 317c82408..b8a23cd81 100644 --- a/src/files/WorldConverter.cpp +++ b/src/files/WorldConverter.cpp @@ -5,7 +5,7 @@ #include #include -#include "../content/ContentLUT.hpp" +#include #include "../data/dynamic.hpp" #include "../debug/Logger.hpp" #include "../files/files.hpp" diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 82f98c4a4..3d00e21d0 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "../content/Content.hpp" +#include #include #include "../data/dynamic.hpp" #include "../debug/Logger.hpp" diff --git a/src/files/WorldFiles.hpp b/src/files/WorldFiles.hpp index 84f77f87d..c63ecff60 100644 --- a/src/files/WorldFiles.hpp +++ b/src/files/WorldFiles.hpp @@ -7,7 +7,7 @@ #include #include -#include "../content/ContentPack.hpp" +#include #include #include "../voxels/Chunk.hpp" #include "WorldRegions.hpp" diff --git a/src/files/engine_paths.hpp b/src/files/engine_paths.hpp index 6465905f8..56956d538 100644 --- a/src/files/engine_paths.hpp +++ b/src/files/engine_paths.hpp @@ -6,7 +6,7 @@ #include #include -#include "../content/ContentPack.hpp" +#include namespace fs = std::filesystem; diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index 71ffe006b..df5591f0f 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -3,8 +3,8 @@ #include "UiDocument.hpp" #include -#include "../content/Content.hpp" -#include "../content/ContentPack.hpp" +#include +#include #include #include "../graphics/core/Atlas.hpp" #include "../maths/UVRegion.hpp" diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index c41d39b29..c5f7adabd 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -4,7 +4,7 @@ #include #include "../audio/audio.hpp" -#include "../content/Content.hpp" +#include #include "../graphics/core/Atlas.hpp" #include "../graphics/render/BlocksPreview.hpp" #include "../logic/LevelController.hpp" diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index 338fa751d..60da236e9 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "../content/Content.hpp" +#include #include "../graphics/core/Mesh.hpp" #include "../graphics/ui/elements/CheckBox.hpp" #include "../graphics/ui/elements/TextBox.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 9bc7a7580..a8f53717b 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -5,7 +5,7 @@ #include "UiDocument.hpp" #include -#include "../content/Content.hpp" +#include #include #include #include diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp index 6c6823c03..5a266d96c 100644 --- a/src/frontend/locale.cpp +++ b/src/frontend/locale.cpp @@ -4,7 +4,7 @@ #include #include -#include "../content/ContentPack.hpp" +#include #include "../files/files.hpp" #include "../util/stringutil.hpp" #include "../data/dynamic.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index f7546360b..5928f1d5b 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -8,7 +8,7 @@ #include "../../debug/Logger.hpp" #include #include "../../files/files.hpp" -#include "../../content/Content.hpp" +#include #include "../../graphics/core/DrawContext.hpp" #include "../../graphics/core/ImageData.hpp" #include "../../graphics/core/PostProcessing.hpp" diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index c9a89eb9e..8e72f59c9 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -2,7 +2,7 @@ #include #include -#include "../../content/Content.hpp" +#include #include "../../frontend/ContentGfxCache.hpp" #include "../../voxels/Block.hpp" #include "../../window/Camera.hpp" diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index a249e3245..9ff5c57bd 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -3,7 +3,7 @@ #include "../core/Mesh.hpp" #include "../../maths/UVRegion.hpp" #include -#include "../../content/Content.hpp" +#include #include "../../voxels/Block.hpp" #include "../../voxels/Chunk.hpp" #include "../../voxels/VoxelsVolume.hpp" diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index f7d0c387b..bf59d4669 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -9,7 +9,7 @@ #include #include -#include "../../content/Content.hpp" +#include #include #include "../../frontend/LevelFrontend.hpp" #include "../../items/Inventory.hpp" diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 7a6fda316..640550cb6 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -1,7 +1,7 @@ #include "InventoryView.hpp" #include -#include "../../../content/Content.hpp" +#include #include "../../../frontend/LevelFrontend.hpp" #include "../../../frontend/locale.hpp" #include "../../../items/Inventories.hpp" diff --git a/src/items/Inventory.cpp b/src/items/Inventory.cpp index 05d6bb5ad..aa96a55e1 100644 --- a/src/items/Inventory.cpp +++ b/src/items/Inventory.cpp @@ -1,6 +1,6 @@ #include "Inventory.hpp" -#include "../content/ContentLUT.hpp" +#include #include "../data/dynamic.hpp" Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) { diff --git a/src/items/ItemStack.cpp b/src/items/ItemStack.cpp index eafbfea68..6a973aa43 100644 --- a/src/items/ItemStack.cpp +++ b/src/items/ItemStack.cpp @@ -1,6 +1,6 @@ #include "ItemStack.hpp" -#include "../content/Content.hpp" +#include #include "ItemDef.hpp" ItemStack::ItemStack() : item(ITEM_EMPTY), count(0) { diff --git a/src/lighting/LightSolver.cpp b/src/lighting/LightSolver.cpp index d2df6b4b7..bc110aa19 100644 --- a/src/lighting/LightSolver.cpp +++ b/src/lighting/LightSolver.cpp @@ -2,7 +2,7 @@ #include #include "LightSolver.hpp" #include "Lightmap.hpp" -#include "../content/Content.hpp" +#include #include "../voxels/Chunks.hpp" #include "../voxels/Chunk.hpp" #include "../voxels/voxel.hpp" diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp index 59876ac49..63f2407d4 100644 --- a/src/lighting/Lighting.cpp +++ b/src/lighting/Lighting.cpp @@ -1,7 +1,7 @@ #include "Lighting.hpp" #include "LightSolver.hpp" #include "Lightmap.hpp" -#include "../content/Content.hpp" +#include #include "../voxels/Chunks.hpp" #include "../voxels/Chunk.hpp" #include "../voxels/voxel.hpp" diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp index 810a1b9cb..9bc659e2d 100644 --- a/src/logic/BlocksController.cpp +++ b/src/logic/BlocksController.cpp @@ -1,6 +1,6 @@ #include "BlocksController.hpp" -#include "../content/Content.hpp" +#include #include "../items/Inventories.hpp" #include "../items/Inventory.hpp" #include "../lighting/Lighting.hpp" diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index 148b78ec4..bf717b972 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -5,7 +5,7 @@ #include #include -#include "../content/Content.hpp" +#include #include "../files/WorldFiles.hpp" #include "../graphics/core/Mesh.hpp" #include "../lighting/Lighting.hpp" diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index ee05f3f88..c03ff7830 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -5,7 +5,7 @@ #include #include -#include "../content/ContentLUT.hpp" +#include #include "../debug/Logger.hpp" #include #include "../files/WorldConverter.hpp" diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 9c8381fd2..3a09bed16 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -4,7 +4,7 @@ #include #include -#include "../content/Content.hpp" +#include #include #include "../items/Inventory.hpp" #include "../items/ItemDef.hpp" diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp index e9d12128c..f6360db93 100644 --- a/src/logic/scripting/lua/libblock.cpp +++ b/src/logic/scripting/lua/libblock.cpp @@ -1,4 +1,4 @@ -#include "../../../content/Content.hpp" +#include #include "../../../lighting/Lighting.hpp" #include "../../../logic/BlocksController.hpp" #include "../../../logic/LevelController.hpp" diff --git a/src/logic/scripting/lua/libcamera.cpp b/src/logic/scripting/lua/libcamera.cpp index 74c0ec2a1..ffdf90a3f 100644 --- a/src/logic/scripting/lua/libcamera.cpp +++ b/src/logic/scripting/lua/libcamera.cpp @@ -1,6 +1,6 @@ #include -#include "../../../content/Content.hpp" +#include #include "../../../window/Camera.hpp" #include "../../../world/Level.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libentity.cpp index 33e61a6a7..90152d1bb 100644 --- a/src/logic/scripting/lua/libentity.cpp +++ b/src/logic/scripting/lua/libentity.cpp @@ -1,6 +1,6 @@ #include "libentity.hpp" -#include "../../../content/Content.hpp" +#include #include #include "../../../objects/Entities.hpp" #include "../../../objects/EntityDef.hpp" diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index 5c32c8a08..eb55c8bb6 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -2,7 +2,7 @@ #include #include -#include "../../../content/Content.hpp" +#include #include #include "../../../frontend/UiDocument.hpp" #include "../../../frontend/hud.hpp" diff --git a/src/logic/scripting/lua/libinventory.cpp b/src/logic/scripting/lua/libinventory.cpp index 85c6cc274..fd7cc14bd 100644 --- a/src/logic/scripting/lua/libinventory.cpp +++ b/src/logic/scripting/lua/libinventory.cpp @@ -1,4 +1,4 @@ -#include "../../../content/Content.hpp" +#include #include "../../../items/Inventories.hpp" #include "../../../items/ItemStack.hpp" #include "../../../logic/BlocksController.hpp" diff --git a/src/logic/scripting/lua/libitem.cpp b/src/logic/scripting/lua/libitem.cpp index 099172e90..e720c691e 100644 --- a/src/logic/scripting/lua/libitem.cpp +++ b/src/logic/scripting/lua/libitem.cpp @@ -1,4 +1,4 @@ -#include "../../../content/Content.hpp" +#include #include "../../../items/ItemDef.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index 59d66e106..acdd459be 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -4,7 +4,7 @@ #include #include -#include "../../../content/Content.hpp" +#include #include #include "../../../files/WorldFiles.hpp" #include "../../../files/engine_paths.hpp" diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 7b0e84118..9584d608c 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -3,8 +3,8 @@ #include #include -#include "../../content/Content.hpp" -#include "../../content/ContentPack.hpp" +#include +#include #include "../../debug/Logger.hpp" #include #include "../../files/engine_paths.hpp" diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index 3404d957d..3331de267 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -4,7 +4,7 @@ #include #include -#include "../content/Content.hpp" +#include #include "../data/dynamic_util.hpp" #include "../debug/Logger.hpp" #include diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index 1d7a22185..6f0ff3195 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -4,7 +4,7 @@ #include #include -#include "../content/ContentLUT.hpp" +#include #include "../items/Inventory.hpp" #include "../objects/Entities.hpp" #include "../objects/rigging.hpp" diff --git a/src/voxels/Chunk.cpp b/src/voxels/Chunk.cpp index 6a2992210..3201be09b 100644 --- a/src/voxels/Chunk.cpp +++ b/src/voxels/Chunk.cpp @@ -2,7 +2,7 @@ #include -#include "../content/ContentLUT.hpp" +#include #include "../items/Inventory.hpp" #include "../lighting/Lightmap.hpp" #include "voxel.hpp" diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index b9538f1fa..fb6e174ce 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -8,7 +8,7 @@ #include #include -#include "../content/Content.hpp" +#include #include "../files/WorldFiles.hpp" #include "../graphics/core/Mesh.hpp" #include "../lighting/Lightmap.hpp" diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp index c518005d2..834e7a984 100644 --- a/src/voxels/ChunksStorage.cpp +++ b/src/voxels/ChunksStorage.cpp @@ -1,6 +1,6 @@ #include "ChunksStorage.hpp" -#include "../content/Content.hpp" +#include #include "../debug/Logger.hpp" #include "../files/WorldFiles.hpp" #include "../items/Inventories.hpp" diff --git a/src/voxels/DefaultWorldGenerator.cpp b/src/voxels/DefaultWorldGenerator.cpp index 98a2bbe74..024877d59 100644 --- a/src/voxels/DefaultWorldGenerator.cpp +++ b/src/voxels/DefaultWorldGenerator.cpp @@ -14,7 +14,7 @@ #include #include -#include "../content/Content.hpp" +#include #include #include "../maths/FastNoiseLite.h" #include "../maths/util.hpp" diff --git a/src/voxels/FlatWorldGenerator.cpp b/src/voxels/FlatWorldGenerator.cpp index b56c12a43..61884fee4 100644 --- a/src/voxels/FlatWorldGenerator.cpp +++ b/src/voxels/FlatWorldGenerator.cpp @@ -1,6 +1,6 @@ #include "FlatWorldGenerator.hpp" -#include "../content/Content.hpp" +#include #include #include "Chunk.hpp" #include "voxel.hpp" diff --git a/src/voxels/WorldGenerator.cpp b/src/voxels/WorldGenerator.cpp index 84d44d257..bb4af8702 100644 --- a/src/voxels/WorldGenerator.cpp +++ b/src/voxels/WorldGenerator.cpp @@ -1,6 +1,6 @@ #include "WorldGenerator.hpp" -#include "../content/Content.hpp" +#include #include "Block.hpp" #include "Chunk.hpp" #include "voxel.hpp" diff --git a/src/world/Level.cpp b/src/world/Level.cpp index 0ea50190f..af8e9f6b5 100644 --- a/src/world/Level.cpp +++ b/src/world/Level.cpp @@ -1,6 +1,6 @@ #include "Level.hpp" -#include "../content/Content.hpp" +#include #include "../data/dynamic_util.hpp" #include "../items/Inventories.hpp" #include "../items/Inventory.hpp" diff --git a/src/world/World.cpp b/src/world/World.cpp index f5546f4f6..bdf2dd87d 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -4,8 +4,8 @@ #include #include -#include "../content/Content.hpp" -#include "../content/ContentLUT.hpp" +#include +#include #include "../debug/Logger.hpp" #include "../files/WorldFiles.hpp" #include "../items/Inventories.hpp" diff --git a/src/world/World.hpp b/src/world/World.hpp index 667be01fc..b48a9f325 100644 --- a/src/world/World.hpp +++ b/src/world/World.hpp @@ -6,7 +6,7 @@ #include #include -#include "../content/ContentPack.hpp" +#include #include "../data/dynamic.hpp" #include "../interfaces/Serializable.hpp" #include diff --git a/src/world/WorldGenerators.cpp b/src/world/WorldGenerators.cpp index 759253232..feba8d52c 100644 --- a/src/world/WorldGenerators.cpp +++ b/src/world/WorldGenerators.cpp @@ -2,7 +2,7 @@ #include -#include "../content/Content.hpp" +#include #include "../voxels/FlatWorldGenerator.hpp" #include "../voxels/WorldGenerator.hpp" From e6da3638f0af2916a443eb075bebe10381de565d Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 12:46:03 +0300 Subject: [PATCH 07/31] Logger.hpp --- src/assets/AssetsLoader.cpp | 2 +- src/audio/AL/ALAudio.cpp | 2 +- src/audio/AL/alutil.cpp | 2 +- src/coders/ogg.cpp | 2 +- src/coders/png.cpp | 2 +- src/coders/wav.cpp | 2 +- src/content/ContentLoader.cpp | 2 +- src/engine.cpp | 2 +- src/files/WorldConverter.cpp | 2 +- src/files/WorldFiles.cpp | 2 +- src/files/settings_io.cpp | 2 +- src/frontend/locale.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/graphics/render/ChunksRenderer.cpp | 2 +- src/logic/EngineController.cpp | 2 +- src/logic/LevelController.cpp | 2 +- src/logic/scripting/lua/lua_commons.cpp | 2 +- src/logic/scripting/lua/lua_engine.cpp | 2 +- src/logic/scripting/lua/lua_extensions.cpp | 2 +- src/logic/scripting/scripting.cpp | 2 +- src/logic/scripting/scripting_functional.cpp | 2 +- src/logic/scripting/scripting_hud.cpp | 2 +- src/objects/Entities.cpp | 2 +- src/util/ThreadPool.hpp | 2 +- src/voxel_engine.cpp | 2 +- src/voxels/ChunksStorage.cpp | 2 +- src/window/Events.cpp | 2 +- src/window/Window.cpp | 2 +- src/world/World.cpp | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index 750f87ace..a9953d5c5 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -9,7 +9,7 @@ #include #include #include "../data/dynamic.hpp" -#include "../debug/Logger.hpp" +#include #include "../files/engine_paths.hpp" #include "../files/files.hpp" #include "../graphics/core/Texture.hpp" diff --git a/src/audio/AL/ALAudio.cpp b/src/audio/AL/ALAudio.cpp index fe0891e36..a2f72c410 100644 --- a/src/audio/AL/ALAudio.cpp +++ b/src/audio/AL/ALAudio.cpp @@ -3,7 +3,7 @@ #include #include -#include "../../debug/Logger.hpp" +#include #include "alutil.hpp" static debug::Logger logger("al-audio"); diff --git a/src/audio/AL/alutil.cpp b/src/audio/AL/alutil.cpp index 5fca22448..7d59e7eaf 100644 --- a/src/audio/AL/alutil.cpp +++ b/src/audio/AL/alutil.cpp @@ -5,7 +5,7 @@ #include #include -#include "../../debug/Logger.hpp" +#include #ifdef __APPLE__ #include diff --git a/src/coders/ogg.cpp b/src/coders/ogg.cpp index f6562f6e1..3ba4d34de 100644 --- a/src/coders/ogg.cpp +++ b/src/coders/ogg.cpp @@ -6,7 +6,7 @@ #include #include "../audio/audio.hpp" -#include "../debug/Logger.hpp" +#include #include static debug::Logger logger("ogg"); diff --git a/src/coders/png.cpp b/src/coders/png.cpp index 878e4cb5f..e93c3c443 100644 --- a/src/coders/png.cpp +++ b/src/coders/png.cpp @@ -4,7 +4,7 @@ #include -#include "../debug/Logger.hpp" +#include #include "../files/files.hpp" #include "../graphics/core/GLTexture.hpp" #include "../graphics/core/ImageData.hpp" diff --git a/src/coders/wav.cpp b/src/coders/wav.cpp index c007308d0..9062eb271 100644 --- a/src/coders/wav.cpp +++ b/src/coders/wav.cpp @@ -7,7 +7,7 @@ #include #include "../audio/audio.hpp" -#include "../debug/Logger.hpp" +#include namespace fs = std::filesystem; diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index 387cea259..59346f70c 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -9,7 +9,7 @@ #include #include #include "../data/dynamic.hpp" -#include "../debug/Logger.hpp" +#include #include "../files/files.hpp" #include "../items/ItemDef.hpp" #include "../logic/scripting/scripting.hpp" diff --git a/src/engine.cpp b/src/engine.cpp index 140166f95..39b23990c 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -2,7 +2,7 @@ #define GLEW_STATIC -#include "debug/Logger.hpp" +#include #include #include "audio/audio.hpp" #include diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp index b8a23cd81..41291a135 100644 --- a/src/files/WorldConverter.cpp +++ b/src/files/WorldConverter.cpp @@ -7,7 +7,7 @@ #include #include "../data/dynamic.hpp" -#include "../debug/Logger.hpp" +#include #include "../files/files.hpp" #include "../objects/Player.hpp" #include "../util/ThreadPool.hpp" diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 3d00e21d0..4faac6675 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -14,7 +14,7 @@ #include #include #include "../data/dynamic.hpp" -#include "../debug/Logger.hpp" +#include #include "../items/Inventory.hpp" #include "../items/ItemDef.hpp" #include "../lighting/Lightmap.hpp" diff --git a/src/files/settings_io.cpp b/src/files/settings_io.cpp index 133cddde1..4464a823d 100644 --- a/src/files/settings_io.cpp +++ b/src/files/settings_io.cpp @@ -5,7 +5,7 @@ #include #include -#include "../debug/Logger.hpp" +#include #include #include "../window/Events.hpp" #include "../window/input.hpp" diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp index 5a266d96c..b8b7e32a9 100644 --- a/src/frontend/locale.cpp +++ b/src/frontend/locale.cpp @@ -8,7 +8,7 @@ #include "../files/files.hpp" #include "../util/stringutil.hpp" #include "../data/dynamic.hpp" -#include "../debug/Logger.hpp" +#include static debug::Logger logger("locale"); diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 5928f1d5b..132c5f489 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -5,7 +5,7 @@ #include "../LevelFrontend.hpp" #include "../../audio/audio.hpp" #include -#include "../../debug/Logger.hpp" +#include #include #include "../../files/files.hpp" #include diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp index eaf802b44..ebd639270 100644 --- a/src/graphics/render/ChunksRenderer.cpp +++ b/src/graphics/render/ChunksRenderer.cpp @@ -1,6 +1,6 @@ #include "ChunksRenderer.hpp" #include "BlocksRenderer.hpp" -#include "../../debug/Logger.hpp" +#include #include "../../graphics/core/Mesh.hpp" #include "../../voxels/Chunk.hpp" #include "../../world/Level.hpp" diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index c03ff7830..d5a32829e 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -6,7 +6,7 @@ #include #include -#include "../debug/Logger.hpp" +#include #include #include "../files/WorldConverter.hpp" #include "../files/WorldFiles.hpp" diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp index f4adb481c..d4030a32a 100644 --- a/src/logic/LevelController.cpp +++ b/src/logic/LevelController.cpp @@ -2,7 +2,7 @@ #include -#include "../debug/Logger.hpp" +#include #include "../files/WorldFiles.hpp" #include "../interfaces/Object.hpp" #include "../objects/Entities.hpp" diff --git a/src/logic/scripting/lua/lua_commons.cpp b/src/logic/scripting/lua/lua_commons.cpp index 00669d036..64b6c1bbd 100644 --- a/src/logic/scripting/lua/lua_commons.cpp +++ b/src/logic/scripting/lua/lua_commons.cpp @@ -1,6 +1,6 @@ #include "lua_commons.hpp" -#include "../../../debug/Logger.hpp" +#include static debug::Logger logger("lua"); diff --git a/src/logic/scripting/lua/lua_engine.cpp b/src/logic/scripting/lua/lua_engine.cpp index fa83b0a11..755f6476b 100644 --- a/src/logic/scripting/lua/lua_engine.cpp +++ b/src/logic/scripting/lua/lua_engine.cpp @@ -3,7 +3,7 @@ #include #include -#include "../../../debug/Logger.hpp" +#include #include "../../../util/stringutil.hpp" #include "api_lua.hpp" #include "lua_custom_types.hpp" diff --git a/src/logic/scripting/lua/lua_extensions.cpp b/src/logic/scripting/lua/lua_extensions.cpp index df88b3dd8..a1667e218 100644 --- a/src/logic/scripting/lua/lua_extensions.cpp +++ b/src/logic/scripting/lua/lua_extensions.cpp @@ -1,4 +1,4 @@ -#include "../../../debug/Logger.hpp" +#include #include "api_lua.hpp" static debug::Logger logger("lua-debug"); diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 9584d608c..b357a95b4 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -5,7 +5,7 @@ #include #include -#include "../../debug/Logger.hpp" +#include #include #include "../../files/engine_paths.hpp" #include "../../files/files.hpp" diff --git a/src/logic/scripting/scripting_functional.cpp b/src/logic/scripting/scripting_functional.cpp index 2854c6c5b..5f235d6c1 100644 --- a/src/logic/scripting/scripting_functional.cpp +++ b/src/logic/scripting/scripting_functional.cpp @@ -1,7 +1,7 @@ #include "scripting_functional.hpp" #include -#include "../../debug/Logger.hpp" +#include #include "../../util/stringutil.hpp" #include "lua/lua_engine.hpp" diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp index c8019dc10..158e4d67e 100644 --- a/src/logic/scripting/scripting_hud.cpp +++ b/src/logic/scripting/scripting_hud.cpp @@ -1,6 +1,6 @@ #include "scripting_hud.hpp" -#include "../../debug/Logger.hpp" +#include #include #include "../../files/files.hpp" #include "../../frontend/hud.hpp" diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index 3331de267..1635729a3 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -6,7 +6,7 @@ #include #include #include "../data/dynamic_util.hpp" -#include "../debug/Logger.hpp" +#include #include #include "../graphics/core/DrawContext.hpp" #include "../graphics/core/LineBatch.hpp" diff --git a/src/util/ThreadPool.hpp b/src/util/ThreadPool.hpp index 8b76830e1..ad58c40a6 100644 --- a/src/util/ThreadPool.hpp +++ b/src/util/ThreadPool.hpp @@ -10,7 +10,7 @@ #include #include -#include "../debug/Logger.hpp" +#include #include #include "../interfaces/Task.hpp" diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 2106e3533..bbbed5303 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -4,7 +4,7 @@ #include "files/engine_paths.hpp" #include "util/platform.hpp" #include "util/command_line.hpp" -#include "debug/Logger.hpp" +#include #include diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp index 834e7a984..8166d83a5 100644 --- a/src/voxels/ChunksStorage.cpp +++ b/src/voxels/ChunksStorage.cpp @@ -1,7 +1,7 @@ #include "ChunksStorage.hpp" #include -#include "../debug/Logger.hpp" +#include #include "../files/WorldFiles.hpp" #include "../items/Inventories.hpp" #include "../lighting/Lightmap.hpp" diff --git a/src/window/Events.cpp b/src/window/Events.cpp index 10448224a..d4c018e90 100644 --- a/src/window/Events.cpp +++ b/src/window/Events.cpp @@ -4,7 +4,7 @@ #include #include -#include "../debug/Logger.hpp" +#include #include "../util/stringutil.hpp" #include "Window.hpp" diff --git a/src/window/Window.cpp b/src/window/Window.cpp index 9ce1a0635..cfc430086 100644 --- a/src/window/Window.cpp +++ b/src/window/Window.cpp @@ -7,7 +7,7 @@ #include #include -#include "../debug/Logger.hpp" +#include #include "../graphics/core/ImageData.hpp" #include "../graphics/core/Texture.hpp" #include diff --git a/src/world/World.cpp b/src/world/World.cpp index bdf2dd87d..591e99a13 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -6,7 +6,7 @@ #include #include -#include "../debug/Logger.hpp" +#include #include "../files/WorldFiles.hpp" #include "../items/Inventories.hpp" #include "../objects/Entities.hpp" From 3aa0298c85eb97ec2075bdf41d77e43918696137 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 17:08:11 +0300 Subject: [PATCH 08/31] files/ --- src/assets/AssetsLoader.cpp | 4 ++-- src/assets/assetload_funcs.cpp | 4 ++-- src/coders/GLSLExtension.cpp | 4 ++-- src/coders/png.cpp | 2 +- src/coders/toml.cpp | 2 +- src/content/ContentLUT.cpp | 2 +- src/content/ContentLoader.cpp | 2 +- src/content/ContentPack.cpp | 4 ++-- src/core_defs.cpp | 4 ++-- src/engine.cpp | 4 ++-- src/engine.hpp | 2 +- src/files/WorldConverter.cpp | 2 +- src/frontend/UiDocument.cpp | 2 +- src/frontend/locale.cpp | 2 +- src/frontend/menu.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/logic/ChunksController.cpp | 2 +- src/logic/EngineController.cpp | 4 ++-- src/logic/LevelController.cpp | 2 +- src/logic/scripting/lua/libcore.cpp | 4 ++-- src/logic/scripting/lua/libfile.cpp | 4 ++-- src/logic/scripting/lua/libpack.cpp | 4 ++-- src/logic/scripting/lua/libworld.cpp | 2 +- src/logic/scripting/scripting.cpp | 4 ++-- src/logic/scripting/scripting_hud.cpp | 2 +- src/util/command_line.cpp | 2 +- src/voxel_engine.cpp | 4 ++-- src/voxels/Chunks.cpp | 2 +- src/voxels/ChunksStorage.cpp | 2 +- src/world/World.cpp | 2 +- 30 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index a9953d5c5..c58496567 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -10,8 +10,8 @@ #include #include "../data/dynamic.hpp" #include -#include "../files/engine_paths.hpp" -#include "../files/files.hpp" +#include +#include #include "../graphics/core/Texture.hpp" #include "../logic/scripting/scripting.hpp" #include "../objects/rigging.hpp" diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp index 31eec6ca4..2b0eb9248 100644 --- a/src/assets/assetload_funcs.cpp +++ b/src/assets/assetload_funcs.cpp @@ -12,8 +12,8 @@ #include #include #include "../data/dynamic.hpp" -#include "../files/engine_paths.hpp" -#include "../files/files.hpp" +#include +#include #include "../frontend/UiDocument.hpp" #include "../graphics/core/Atlas.hpp" #include "../graphics/core/Font.hpp" diff --git a/src/coders/GLSLExtension.cpp b/src/coders/GLSLExtension.cpp index 301253661..96f3ba155 100644 --- a/src/coders/GLSLExtension.cpp +++ b/src/coders/GLSLExtension.cpp @@ -5,8 +5,8 @@ #include #include -#include "../files/engine_paths.hpp" -#include "../files/files.hpp" +#include +#include #include #include "../util/stringutil.hpp" diff --git a/src/coders/png.cpp b/src/coders/png.cpp index e93c3c443..c17fa19f4 100644 --- a/src/coders/png.cpp +++ b/src/coders/png.cpp @@ -5,7 +5,7 @@ #include #include -#include "../files/files.hpp" +#include #include "../graphics/core/GLTexture.hpp" #include "../graphics/core/ImageData.hpp" diff --git a/src/coders/toml.cpp b/src/coders/toml.cpp index 9250b431a..a1b8fe107 100644 --- a/src/coders/toml.cpp +++ b/src/coders/toml.cpp @@ -8,7 +8,7 @@ #include "../data/dynamic.hpp" #include "../data/setting.hpp" -#include "../files/settings_io.hpp" +#include #include "../util/stringutil.hpp" #include "commons.hpp" diff --git a/src/content/ContentLUT.cpp b/src/content/ContentLUT.cpp index 620b4d0f1..5e3d80d42 100644 --- a/src/content/ContentLUT.cpp +++ b/src/content/ContentLUT.cpp @@ -4,7 +4,7 @@ #include #include -#include "../files/files.hpp" +#include #include "../items/ItemDef.hpp" #include "../voxels/Block.hpp" #include "Content.hpp" diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index 59346f70c..49d4eace1 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -10,7 +10,7 @@ #include #include "../data/dynamic.hpp" #include -#include "../files/files.hpp" +#include #include "../items/ItemDef.hpp" #include "../logic/scripting/scripting.hpp" #include "../objects/rigging.hpp" diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp index d972a026f..a50b69eb0 100644 --- a/src/content/ContentPack.cpp +++ b/src/content/ContentPack.cpp @@ -6,8 +6,8 @@ #include #include "../data/dynamic.hpp" -#include "../files/engine_paths.hpp" -#include "../files/files.hpp" +#include +#include namespace fs = std::filesystem; diff --git a/src/core_defs.cpp b/src/core_defs.cpp index ce9979146..3cd0bcabc 100644 --- a/src/core_defs.cpp +++ b/src/core_defs.cpp @@ -3,8 +3,8 @@ #include "items/ItemDef.hpp" #include #include -#include "files/files.hpp" -#include "files/engine_paths.hpp" +#include +#include #include "window/Window.hpp" #include "window/Events.hpp" #include "window/input.hpp" diff --git a/src/engine.cpp b/src/engine.cpp index 39b23990c..4d588488e 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -13,8 +13,8 @@ #include #include #include -#include "files/files.hpp" -#include "files/settings_io.hpp" +#include +#include #include "frontend/locale.hpp" #include "frontend/menu.hpp" #include "frontend/screens/Screen.hpp" diff --git a/src/engine.hpp b/src/engine.hpp index 6869e1da4..bb7769cea 100644 --- a/src/engine.hpp +++ b/src/engine.hpp @@ -8,7 +8,7 @@ #include #include #include -#include "files/engine_paths.hpp" +#include #include "util/ObjectsKeeper.hpp" #include diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp index 41291a135..14117ebc4 100644 --- a/src/files/WorldConverter.cpp +++ b/src/files/WorldConverter.cpp @@ -8,7 +8,7 @@ #include #include "../data/dynamic.hpp" #include -#include "../files/files.hpp" +#include #include "../objects/Player.hpp" #include "../util/ThreadPool.hpp" #include "../voxels/Chunk.hpp" diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp index 3951e4e95..86dae7eb5 100644 --- a/src/frontend/UiDocument.cpp +++ b/src/frontend/UiDocument.cpp @@ -2,7 +2,7 @@ #include -#include "../files/files.hpp" +#include #include "../graphics/ui/elements/UINode.hpp" #include "../graphics/ui/elements/InventoryView.hpp" #include "../graphics/ui/gui_xml.hpp" diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp index b8b7e32a9..18d13ce15 100644 --- a/src/frontend/locale.cpp +++ b/src/frontend/locale.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "../files/files.hpp" +#include #include "../util/stringutil.hpp" #include "../data/dynamic.hpp" #include diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index 048829335..cca8b0207 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -8,7 +8,7 @@ #include #include "../data/dynamic.hpp" #include "../interfaces/Task.hpp" -#include "../files/engine_paths.hpp" +#include #include "../graphics/ui/elements/Menu.hpp" #include "../graphics/ui/gui_util.hpp" #include "../graphics/ui/GUI.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 132c5f489..d83fbf694 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "../../files/files.hpp" +#include #include #include "../../graphics/core/DrawContext.hpp" #include "../../graphics/core/ImageData.hpp" diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index bf717b972..5d7826b92 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -6,7 +6,7 @@ #include #include -#include "../files/WorldFiles.hpp" +#include #include "../graphics/core/Mesh.hpp" #include "../lighting/Lighting.hpp" #include "../maths/voxmaths.hpp" diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index d5a32829e..d38e68fc8 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -8,8 +8,8 @@ #include #include #include -#include "../files/WorldConverter.hpp" -#include "../files/WorldFiles.hpp" +#include +#include #include "../frontend/locale.hpp" #include "../frontend/menu.hpp" #include "../frontend/screens/LevelScreen.hpp" diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp index d4030a32a..695e22f29 100644 --- a/src/logic/LevelController.cpp +++ b/src/logic/LevelController.cpp @@ -3,7 +3,7 @@ #include #include -#include "../files/WorldFiles.hpp" +#include #include "../interfaces/Object.hpp" #include "../objects/Entities.hpp" #include "../physics/Hitbox.hpp" diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp index 1e29856d3..b19bf5396 100644 --- a/src/logic/scripting/lua/libcore.cpp +++ b/src/logic/scripting/lua/libcore.cpp @@ -3,8 +3,8 @@ #include #include -#include "../../../files/engine_paths.hpp" -#include "../../../files/settings_io.hpp" +#include +#include #include "../../../frontend/menu.hpp" #include "../../../frontend/screens/MenuScreen.hpp" #include "../../../logic/EngineController.hpp" diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libfile.cpp index df4cf5456..9c8c647d9 100644 --- a/src/logic/scripting/lua/libfile.cpp +++ b/src/logic/scripting/lua/libfile.cpp @@ -3,8 +3,8 @@ #include #include -#include "../../../files/engine_paths.hpp" -#include "../../../files/files.hpp" +#include +#include #include "../../../util/stringutil.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index acdd459be..827ad9d7d 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -6,8 +6,8 @@ #include #include #include -#include "../../../files/WorldFiles.hpp" -#include "../../../files/engine_paths.hpp" +#include +#include #include "../../../world/Level.hpp" #include "../../../world/World.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp index 0e8cda6f0..e3bdcb005 100644 --- a/src/logic/scripting/lua/libworld.cpp +++ b/src/logic/scripting/lua/libworld.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "../../../files/engine_paths.hpp" +#include #include "../../../world/Level.hpp" #include "../../../world/World.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index b357a95b4..b63d4365d 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -7,8 +7,8 @@ #include #include #include -#include "../../files/engine_paths.hpp" -#include "../../files/files.hpp" +#include +#include #include "../../frontend/UiDocument.hpp" #include "../../items/Inventory.hpp" #include "../../items/ItemDef.hpp" diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp index 158e4d67e..b86902a6b 100644 --- a/src/logic/scripting/scripting_hud.cpp +++ b/src/logic/scripting/scripting_hud.cpp @@ -2,7 +2,7 @@ #include #include -#include "../../files/files.hpp" +#include #include "../../frontend/hud.hpp" #include "../../objects/Player.hpp" #include "lua/api_lua.hpp" diff --git a/src/util/command_line.cpp b/src/util/command_line.cpp index 1f988e5ce..9485e6f81 100644 --- a/src/util/command_line.cpp +++ b/src/util/command_line.cpp @@ -6,7 +6,7 @@ #include #include -#include "../files/engine_paths.hpp" +#include namespace fs = std::filesystem; diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index bbbed5303..af0cc60c0 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -1,7 +1,7 @@ #include #include -#include "files/settings_io.hpp" -#include "files/engine_paths.hpp" +#include +#include #include "util/platform.hpp" #include "util/command_line.hpp" #include diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index fb6e174ce..4ff3ea7fc 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "../files/WorldFiles.hpp" +#include #include "../graphics/core/Mesh.hpp" #include "../lighting/Lightmap.hpp" #include "../maths/aabb.hpp" diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp index 8166d83a5..f3c91df13 100644 --- a/src/voxels/ChunksStorage.cpp +++ b/src/voxels/ChunksStorage.cpp @@ -2,7 +2,7 @@ #include #include -#include "../files/WorldFiles.hpp" +#include #include "../items/Inventories.hpp" #include "../lighting/Lightmap.hpp" #include "../maths/voxmaths.hpp" diff --git a/src/world/World.cpp b/src/world/World.cpp index 591e99a13..b1892af6c 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "../files/WorldFiles.hpp" +#include #include "../items/Inventories.hpp" #include "../objects/Entities.hpp" #include "../objects/Player.hpp" From eb061bcaf4842a3c340c89e7274612c29d209a5c Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 22:12:48 +0300 Subject: [PATCH 09/31] graphics/ --- src/assets/Assets.hpp | 2 +- src/assets/AssetsLoader.cpp | 2 +- src/assets/assetload_funcs.cpp | 14 +++++----- src/coders/imageio.cpp | 2 +- src/coders/obj.cpp | 2 +- src/coders/png.cpp | 4 +-- src/engine.cpp | 10 +++---- src/frontend/ContentGfxCache.cpp | 2 +- src/frontend/LevelFrontend.cpp | 4 +-- src/frontend/UiDocument.cpp | 6 ++-- src/frontend/debug_panel.cpp | 12 ++++---- src/frontend/hud.cpp | 32 +++++++++++----------- src/frontend/menu.cpp | 6 ++-- src/frontend/menu.hpp | 2 +- src/frontend/screens/LevelScreen.cpp | 14 +++++----- src/frontend/screens/MenuScreen.cpp | 10 +++---- src/frontend/screens/Screen.cpp | 2 +- src/graphics/render/BlocksPreview.cpp | 14 +++++----- src/graphics/render/BlocksRenderer.cpp | 2 +- src/graphics/render/ChunksRenderer.cpp | 2 +- src/graphics/render/ModelBatch.cpp | 8 +++--- src/graphics/render/Skybox.cpp | 14 +++++----- src/graphics/render/WorldRenderer.cpp | 18 ++++++------ src/graphics/ui/GUI.cpp | 6 ++-- src/graphics/ui/elements/Button.cpp | 4 +-- src/graphics/ui/elements/CheckBox.cpp | 4 +-- src/graphics/ui/elements/Container.cpp | 4 +-- src/graphics/ui/elements/Image.cpp | 8 +++--- src/graphics/ui/elements/InputBindBox.cpp | 4 +-- src/graphics/ui/elements/InventoryView.cpp | 14 +++++----- src/graphics/ui/elements/Label.cpp | 6 ++-- src/graphics/ui/elements/Plotter.cpp | 6 ++-- src/graphics/ui/elements/TextBox.cpp | 6 ++-- src/graphics/ui/elements/TrackBar.cpp | 4 +-- src/graphics/ui/elements/UINode.cpp | 2 +- src/logic/ChunksController.cpp | 2 +- src/logic/EngineController.cpp | 4 +-- src/logic/scripting/lua/libgui.cpp | 20 +++++++------- src/logic/scripting/lua/libhud.cpp | 2 +- src/logic/scripting/lua/libinput.cpp | 2 +- src/objects/Entities.cpp | 8 +++--- src/objects/rigging.cpp | 4 +-- src/voxels/Chunks.cpp | 2 +- src/window/Window.cpp | 4 +-- 44 files changed, 150 insertions(+), 150 deletions(-) diff --git a/src/assets/Assets.hpp b/src/assets/Assets.hpp index 9a6784622..a3b689e7e 100644 --- a/src/assets/Assets.hpp +++ b/src/assets/Assets.hpp @@ -11,7 +11,7 @@ #include #include -#include "../graphics/core/TextureAnimation.hpp" +#include class Assets; diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index c58496567..07de43953 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "../graphics/core/Texture.hpp" +#include #include "../logic/scripting/scripting.hpp" #include "../objects/rigging.hpp" #include "../util/ThreadPool.hpp" diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp index 2b0eb9248..e1c36e6b7 100644 --- a/src/assets/assetload_funcs.cpp +++ b/src/assets/assetload_funcs.cpp @@ -15,13 +15,13 @@ #include #include #include "../frontend/UiDocument.hpp" -#include "../graphics/core/Atlas.hpp" -#include "../graphics/core/Font.hpp" -#include "../graphics/core/ImageData.hpp" -#include "../graphics/core/Model.hpp" -#include "../graphics/core/Shader.hpp" -#include "../graphics/core/Texture.hpp" -#include "../graphics/core/TextureAnimation.hpp" +#include +#include +#include +#include +#include +#include +#include #include "../objects/rigging.hpp" #include "Assets.hpp" #include "AssetsLoader.hpp" diff --git a/src/coders/imageio.cpp b/src/coders/imageio.cpp index 59917593a..90d34beec 100644 --- a/src/coders/imageio.cpp +++ b/src/coders/imageio.cpp @@ -4,7 +4,7 @@ #include #include -#include "../graphics/core/ImageData.hpp" +#include #include "png.hpp" namespace fs = std::filesystem; diff --git a/src/coders/obj.cpp b/src/coders/obj.cpp index c3df555af..0e0b29dc9 100644 --- a/src/coders/obj.cpp +++ b/src/coders/obj.cpp @@ -1,6 +1,6 @@ #include "obj.hpp" -#include "../graphics/core/Model.hpp" +#include #include "commons.hpp" using namespace model; diff --git a/src/coders/png.cpp b/src/coders/png.cpp index c17fa19f4..14f5c8010 100644 --- a/src/coders/png.cpp +++ b/src/coders/png.cpp @@ -6,8 +6,8 @@ #include #include -#include "../graphics/core/GLTexture.hpp" -#include "../graphics/core/ImageData.hpp" +#include +#include static debug::Logger logger("png-coder"); diff --git a/src/engine.cpp b/src/engine.cpp index 4d588488e..bbd15e6a7 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -19,11 +19,11 @@ #include "frontend/menu.hpp" #include "frontend/screens/Screen.hpp" #include "frontend/screens/MenuScreen.hpp" -#include "graphics/core/Batch2D.hpp" -#include "graphics/core/DrawContext.hpp" -#include "graphics/core/ImageData.hpp" -#include "graphics/core/Shader.hpp" -#include "graphics/ui/GUI.hpp" +#include +#include +#include +#include +#include #include "objects/rigging.hpp" #include "logic/EngineController.hpp" #include "logic/CommandsInterpreter.hpp" diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index df5591f0f..8c0eb8ed1 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "../graphics/core/Atlas.hpp" +#include #include "../maths/UVRegion.hpp" #include "../voxels/Block.hpp" diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index c5f7adabd..6a0521eac 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -5,8 +5,8 @@ #include #include "../audio/audio.hpp" #include -#include "../graphics/core/Atlas.hpp" -#include "../graphics/render/BlocksPreview.hpp" +#include +#include #include "../logic/LevelController.hpp" #include "../logic/PlayerController.hpp" #include "../objects/Player.hpp" diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp index 86dae7eb5..b51cf23ff 100644 --- a/src/frontend/UiDocument.cpp +++ b/src/frontend/UiDocument.cpp @@ -3,9 +3,9 @@ #include #include -#include "../graphics/ui/elements/UINode.hpp" -#include "../graphics/ui/elements/InventoryView.hpp" -#include "../graphics/ui/gui_xml.hpp" +#include +#include +#include #include "../logic/scripting/scripting.hpp" UiDocument::UiDocument( diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index 60da236e9..49f7a9b55 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -3,12 +3,12 @@ #include #include #include -#include "../graphics/core/Mesh.hpp" -#include "../graphics/ui/elements/CheckBox.hpp" -#include "../graphics/ui/elements/TextBox.hpp" -#include "../graphics/ui/elements/TrackBar.hpp" -#include "../graphics/ui/elements/InputBindBox.hpp" -#include "../graphics/render/WorldRenderer.hpp" +#include +#include +#include +#include +#include +#include #include "../logic/scripting/scripting.hpp" #include "../objects/Player.hpp" #include "../objects/Entities.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index a8f53717b..e8fbbb951 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -9,22 +9,22 @@ #include #include #include -#include "../graphics/core/Atlas.hpp" -#include "../graphics/core/Batch2D.hpp" -#include "../graphics/core/Batch3D.hpp" -#include "../graphics/core/DrawContext.hpp" -#include "../graphics/core/Font.hpp" -#include "../graphics/core/Mesh.hpp" -#include "../graphics/core/Shader.hpp" -#include "../graphics/core/Texture.hpp" -#include "../graphics/render/WorldRenderer.hpp" -#include "../graphics/ui/elements/InventoryView.hpp" -#include "../graphics/ui/elements/Menu.hpp" -#include "../graphics/ui/elements/Panel.hpp" -#include "../graphics/ui/elements/Plotter.hpp" -#include "../graphics/ui/elements/UINode.hpp" -#include "../graphics/ui/gui_util.hpp" -#include "../graphics/ui/GUI.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "../items/Inventories.hpp" #include "../items/Inventory.hpp" #include "../items/ItemDef.hpp" diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index cca8b0207..858969d84 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -9,9 +9,9 @@ #include "../data/dynamic.hpp" #include "../interfaces/Task.hpp" #include -#include "../graphics/ui/elements/Menu.hpp" -#include "../graphics/ui/gui_util.hpp" -#include "../graphics/ui/GUI.hpp" +#include +#include +#include #include "../logic/scripting/scripting.hpp" #include #include diff --git a/src/frontend/menu.hpp b/src/frontend/menu.hpp index 4bc5e4ea7..b54cd822c 100644 --- a/src/frontend/menu.hpp +++ b/src/frontend/menu.hpp @@ -2,7 +2,7 @@ #define FRONTEND_MENU_MENU_HPP_ #include "../data/dynamic.hpp" -#include "../graphics/ui/elements/Menu.hpp" +#include #include #include diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index d83fbf694..779ef4f36 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -9,13 +9,13 @@ #include #include #include -#include "../../graphics/core/DrawContext.hpp" -#include "../../graphics/core/ImageData.hpp" -#include "../../graphics/core/PostProcessing.hpp" -#include "../../graphics/core/Viewport.hpp" -#include "../../graphics/render/WorldRenderer.hpp" -#include "../../graphics/ui/elements/Menu.hpp" -#include "../../graphics/ui/GUI.hpp" +#include +#include +#include +#include +#include +#include +#include #include "../../logic/LevelController.hpp" #include "../../logic/scripting/scripting_hud.hpp" #include "../../util/stringutil.hpp" diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp index e5d56f6c1..98d464f4e 100644 --- a/src/frontend/screens/MenuScreen.cpp +++ b/src/frontend/screens/MenuScreen.cpp @@ -1,10 +1,10 @@ #include "MenuScreen.hpp" -#include "../../graphics/ui/GUI.hpp" -#include "../../graphics/ui/elements/Menu.hpp" -#include "../../graphics/core/Batch2D.hpp" -#include "../../graphics/core/Shader.hpp" -#include "../../graphics/core/Texture.hpp" +#include +#include +#include +#include +#include #include "../../maths/UVRegion.hpp" #include "../../window/Window.hpp" #include "../../window/Camera.hpp" diff --git a/src/frontend/screens/Screen.cpp b/src/frontend/screens/Screen.cpp index 32aa74b09..a167b98ad 100644 --- a/src/frontend/screens/Screen.cpp +++ b/src/frontend/screens/Screen.cpp @@ -1,6 +1,6 @@ #include "Screen.hpp" -#include "../../graphics/core/Batch2D.hpp" +#include #include Screen::Screen(Engine* engine) diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index 8e72f59c9..515d99c30 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -7,13 +7,13 @@ #include "../../voxels/Block.hpp" #include "../../window/Camera.hpp" #include "../../window/Window.hpp" -#include "../core/Atlas.hpp" -#include "../core/Batch3D.hpp" -#include "../core/Framebuffer.hpp" -#include "../core/DrawContext.hpp" -#include "../core/Shader.hpp" -#include "../core/Texture.hpp" -#include "../core/Viewport.hpp" +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index 9ff5c57bd..ae0795151 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -1,6 +1,6 @@ #include "BlocksRenderer.hpp" -#include "../core/Mesh.hpp" +#include #include "../../maths/UVRegion.hpp" #include #include diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp index ebd639270..f69aa793a 100644 --- a/src/graphics/render/ChunksRenderer.cpp +++ b/src/graphics/render/ChunksRenderer.cpp @@ -1,7 +1,7 @@ #include "ChunksRenderer.hpp" #include "BlocksRenderer.hpp" #include -#include "../../graphics/core/Mesh.hpp" +#include #include "../../voxels/Chunk.hpp" #include "../../world/Level.hpp" #include diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp index c3723dbaf..e523a2952 100644 --- a/src/graphics/render/ModelBatch.cpp +++ b/src/graphics/render/ModelBatch.cpp @@ -1,9 +1,9 @@ #include "ModelBatch.hpp" -#include "../core/Mesh.hpp" -#include "../core/Model.hpp" -#include "../core/Atlas.hpp" -#include "../core/Texture.hpp" +#include +#include +#include +#include #include #include "../../window/Window.hpp" #include "../../voxels/Chunks.hpp" diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp index b2a6843af..7f9d9fee9 100644 --- a/src/graphics/render/Skybox.cpp +++ b/src/graphics/render/Skybox.cpp @@ -1,12 +1,12 @@ #include "Skybox.hpp" #include -#include "../../graphics/core/Shader.hpp" -#include "../../graphics/core/Mesh.hpp" -#include "../../graphics/core/Batch3D.hpp" -#include "../../graphics/core/Texture.hpp" -#include "../../graphics/core/Cubemap.hpp" -#include "../../graphics/core/Framebuffer.hpp" -#include "../../graphics/core/DrawContext.hpp" +#include +#include +#include +#include +#include +#include +#include #include "../../window/Window.hpp" #include "../../window/Camera.hpp" #include "../../maths/UVRegion.hpp" diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index bf59d4669..3665ba676 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -30,15 +30,15 @@ #include "../../world/Level.hpp" #include "../../world/LevelEvents.hpp" #include "../../world/World.hpp" -#include "../core/Atlas.hpp" -#include "../core/Batch3D.hpp" -#include "../core/DrawContext.hpp" -#include "../core/LineBatch.hpp" -#include "../core/Mesh.hpp" -#include "../core/Model.hpp" -#include "../core/PostProcessing.hpp" -#include "../core/Shader.hpp" -#include "../core/Texture.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "ChunksRenderer.hpp" #include "ModelBatch.hpp" #include "Skybox.hpp" diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp index 946301a01..457d2110a 100644 --- a/src/graphics/ui/GUI.cpp +++ b/src/graphics/ui/GUI.cpp @@ -9,9 +9,9 @@ #include #include "../../frontend/UiDocument.hpp" #include "../../frontend/locale.hpp" -#include "../../graphics/core/Batch2D.hpp" -#include "../../graphics/core/Shader.hpp" -#include "../../graphics/core/DrawContext.hpp" +#include +#include +#include #include "../../window/Events.hpp" #include "../../window/Window.hpp" #include "../../window/input.hpp" diff --git a/src/graphics/ui/elements/Button.cpp b/src/graphics/ui/elements/Button.cpp index dcd892a4a..91b96a3b8 100644 --- a/src/graphics/ui/elements/Button.cpp +++ b/src/graphics/ui/elements/Button.cpp @@ -3,8 +3,8 @@ #include #include "Label.hpp" -#include "../../core/DrawContext.hpp" -#include "../../core/Batch2D.hpp" +#include +#include using namespace gui; diff --git a/src/graphics/ui/elements/CheckBox.cpp b/src/graphics/ui/elements/CheckBox.cpp index 0ccb07130..26f3c3d93 100644 --- a/src/graphics/ui/elements/CheckBox.cpp +++ b/src/graphics/ui/elements/CheckBox.cpp @@ -2,8 +2,8 @@ #include -#include "../../core/DrawContext.hpp" -#include "../../core/Batch2D.hpp" +#include +#include #include "Label.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/Container.cpp b/src/graphics/ui/elements/Container.cpp index 6ca2b8532..77a014132 100644 --- a/src/graphics/ui/elements/Container.cpp +++ b/src/graphics/ui/elements/Container.cpp @@ -1,7 +1,7 @@ #include "Container.hpp" -#include "../../core/DrawContext.hpp" -#include "../../core/Batch2D.hpp" +#include +#include #include #include diff --git a/src/graphics/ui/elements/Image.cpp b/src/graphics/ui/elements/Image.cpp index b2d448b9e..8927f625d 100644 --- a/src/graphics/ui/elements/Image.cpp +++ b/src/graphics/ui/elements/Image.cpp @@ -2,10 +2,10 @@ #include -#include "../../core/DrawContext.hpp" -#include "../../core/Batch2D.hpp" -#include "../../core/Texture.hpp" -#include "../../core/Atlas.hpp" +#include +#include +#include +#include #include #include "../../../maths/UVRegion.hpp" diff --git a/src/graphics/ui/elements/InputBindBox.cpp b/src/graphics/ui/elements/InputBindBox.cpp index fef066525..5d9b62e03 100644 --- a/src/graphics/ui/elements/InputBindBox.cpp +++ b/src/graphics/ui/elements/InputBindBox.cpp @@ -1,8 +1,8 @@ #include "InputBindBox.hpp" #include "Label.hpp" -#include "../../core/DrawContext.hpp" -#include "../../core/Batch2D.hpp" +#include +#include #include "../../../util/stringutil.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 640550cb6..5946c95f4 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -16,13 +16,13 @@ #include "../../../window/Events.hpp" #include "../../../window/input.hpp" #include "../../../world/Level.hpp" -#include "../../core/Atlas.hpp" -#include "../../core/Batch2D.hpp" -#include "../../core/Font.hpp" -#include "../../core/DrawContext.hpp" -#include "../../core/Shader.hpp" -#include "../../core/Texture.hpp" -#include "../../render/BlocksPreview.hpp" +#include +#include +#include +#include +#include +#include +#include #include "../GUI.hpp" #include diff --git a/src/graphics/ui/elements/Label.cpp b/src/graphics/ui/elements/Label.cpp index 131b3ad9d..313db6625 100644 --- a/src/graphics/ui/elements/Label.cpp +++ b/src/graphics/ui/elements/Label.cpp @@ -1,9 +1,9 @@ #include "Label.hpp" #include -#include "../../core/DrawContext.hpp" -#include "../../core/Batch2D.hpp" -#include "../../core/Font.hpp" +#include +#include +#include #include #include "../../../util/stringutil.hpp" diff --git a/src/graphics/ui/elements/Plotter.cpp b/src/graphics/ui/elements/Plotter.cpp index d574f3608..3dcbc9bed 100644 --- a/src/graphics/ui/elements/Plotter.cpp +++ b/src/graphics/ui/elements/Plotter.cpp @@ -1,8 +1,8 @@ #include "Plotter.hpp" -#include "../../core/Batch2D.hpp" -#include "../../core/Font.hpp" -#include "../../core/DrawContext.hpp" +#include +#include +#include #include #include "../../../util/stringutil.hpp" diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp index f9b5545e8..86ed2123a 100644 --- a/src/graphics/ui/elements/TextBox.cpp +++ b/src/graphics/ui/elements/TextBox.cpp @@ -4,9 +4,9 @@ #include #include "Label.hpp" -#include "../../core/DrawContext.hpp" -#include "../../core/Batch2D.hpp" -#include "../../core/Font.hpp" +#include +#include +#include #include #include "../../../util/stringutil.hpp" #include "../../../window/Events.hpp" diff --git a/src/graphics/ui/elements/TrackBar.cpp b/src/graphics/ui/elements/TrackBar.cpp index c06566dac..8cf09c475 100644 --- a/src/graphics/ui/elements/TrackBar.cpp +++ b/src/graphics/ui/elements/TrackBar.cpp @@ -2,8 +2,8 @@ #include -#include "../../core/DrawContext.hpp" -#include "../../core/Batch2D.hpp" +#include +#include #include using namespace gui; diff --git a/src/graphics/ui/elements/UINode.cpp b/src/graphics/ui/elements/UINode.cpp index b2c967215..5fe697412 100644 --- a/src/graphics/ui/elements/UINode.cpp +++ b/src/graphics/ui/elements/UINode.cpp @@ -3,7 +3,7 @@ #include #include "Container.hpp" -#include "../../core/Batch2D.hpp" +#include using gui::UINode; using gui::Align; diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index 5d7826b92..a1e3b71f9 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -7,7 +7,7 @@ #include #include -#include "../graphics/core/Mesh.hpp" +#include #include "../lighting/Lighting.hpp" #include "../maths/voxmaths.hpp" #include "../util/timeutil.hpp" diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index d38e68fc8..a2b49cd63 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -14,8 +14,8 @@ #include "../frontend/menu.hpp" #include "../frontend/screens/LevelScreen.hpp" #include "../frontend/screens/MenuScreen.hpp" -#include "../graphics/ui/elements/Menu.hpp" -#include "../graphics/ui/gui_util.hpp" +#include +#include #include "../interfaces/Task.hpp" #include "../util/stringutil.hpp" #include "../world/Level.hpp" diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp index 55af846d2..e79d60306 100644 --- a/src/logic/scripting/lua/libgui.cpp +++ b/src/logic/scripting/lua/libgui.cpp @@ -2,16 +2,16 @@ #include #include "../../../frontend/UiDocument.hpp" #include "../../../frontend/locale.hpp" -#include "../../../graphics/ui/elements/Button.hpp" -#include "../../../graphics/ui/elements/CheckBox.hpp" -#include "../../../graphics/ui/elements/Image.hpp" -#include "../../../graphics/ui/elements/InventoryView.hpp" -#include "../../../graphics/ui/elements/Menu.hpp" -#include "../../../graphics/ui/elements/Panel.hpp" -#include "../../../graphics/ui/elements/TextBox.hpp" -#include "../../../graphics/ui/elements/TrackBar.hpp" -#include "../../../graphics/ui/elements/UINode.hpp" -#include "../../../graphics/ui/gui_util.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "../../../items/Inventories.hpp" #include "../../../util/stringutil.hpp" #include "../../../world/Level.hpp" diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index eb55c8bb6..9aec8325b 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -6,7 +6,7 @@ #include #include "../../../frontend/UiDocument.hpp" #include "../../../frontend/hud.hpp" -#include "../../../graphics/ui/elements/InventoryView.hpp" +#include #include "../../../items/Inventories.hpp" #include "../../../logic/BlocksController.hpp" #include "../../../objects/Player.hpp" diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libinput.cpp index 1f6892292..3a7980d0b 100644 --- a/src/logic/scripting/lua/libinput.cpp +++ b/src/logic/scripting/lua/libinput.cpp @@ -1,7 +1,7 @@ #include #include "../../../frontend/hud.hpp" #include "../../../frontend/screens/Screen.hpp" -#include "../../../graphics/ui/GUI.hpp" +#include #include "../../../util/stringutil.hpp" #include "../../../window/Events.hpp" #include "../../../window/input.hpp" diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index 1635729a3..e9b83fb54 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -8,10 +8,10 @@ #include "../data/dynamic_util.hpp" #include #include -#include "../graphics/core/DrawContext.hpp" -#include "../graphics/core/LineBatch.hpp" -#include "../graphics/core/Model.hpp" -#include "../graphics/render/ModelBatch.hpp" +#include +#include +#include +#include #include "../logic/scripting/scripting.hpp" #include "../maths/FrustumCulling.hpp" #include "../maths/rays.hpp" diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp index 828803720..cc3e59750 100644 --- a/src/objects/rigging.cpp +++ b/src/objects/rigging.cpp @@ -3,8 +3,8 @@ #include #include #include "../data/dynamic_util.hpp" -#include "../graphics/core/Model.hpp" -#include "../graphics/render/ModelBatch.hpp" +#include +#include #define GLM_ENABLE_EXPERIMENTAL #include diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index 4ff3ea7fc..6a3a79e55 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -10,7 +10,7 @@ #include #include #include -#include "../graphics/core/Mesh.hpp" +#include #include "../lighting/Lightmap.hpp" #include "../maths/aabb.hpp" #include "../maths/rays.hpp" diff --git a/src/window/Window.cpp b/src/window/Window.cpp index cfc430086..028706cf0 100644 --- a/src/window/Window.cpp +++ b/src/window/Window.cpp @@ -8,8 +8,8 @@ #include #include -#include "../graphics/core/ImageData.hpp" -#include "../graphics/core/Texture.hpp" +#include +#include #include #include "../util/ObjectsKeeper.hpp" #include "Events.hpp" From 5c9bc83bbde05c6012659685613fc29231007675 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 22:26:08 +0300 Subject: [PATCH 10/31] 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; From c7755040bd76828e654b830887de5ca8cc3a1031 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 22:42:44 +0300 Subject: [PATCH 11/31] voxels/ --- src/assets/AssetsLoader.cpp | 2 +- src/content/Content.cpp | 2 +- src/content/ContentBuilder.hpp | 2 +- src/content/ContentLUT.cpp | 2 +- src/content/ContentLoader.cpp | 2 +- src/core_defs.cpp | 2 +- src/engine.cpp | 4 ++-- src/files/WorldConverter.cpp | 2 +- src/files/WorldFiles.cpp | 6 +++--- src/files/WorldFiles.hpp | 2 +- src/files/WorldRegions.hpp | 2 +- src/frontend/ContentGfxCache.cpp | 2 +- src/frontend/LevelFrontend.cpp | 2 +- src/frontend/debug_panel.cpp | 6 +++--- src/frontend/hud.cpp | 6 +++--- src/frontend/screens/LevelScreen.cpp | 2 +- src/graphics/render/BlocksPreview.cpp | 2 +- src/graphics/render/BlocksRenderer.cpp | 8 ++++---- src/graphics/render/BlocksRenderer.hpp | 2 +- src/graphics/render/ChunksRenderer.cpp | 2 +- src/graphics/render/ChunksRenderer.hpp | 4 ++-- src/graphics/render/ModelBatch.cpp | 2 +- src/graphics/render/WorldRenderer.cpp | 6 +++--- src/graphics/ui/elements/InventoryView.cpp | 2 +- src/lighting/LightSolver.cpp | 8 ++++---- src/lighting/Lighting.cpp | 8 ++++---- src/logic/BlocksController.cpp | 8 ++++---- src/logic/BlocksController.hpp | 2 +- src/logic/ChunksController.cpp | 10 +++++----- src/logic/PlayerController.cpp | 6 +++--- src/logic/scripting/lua/libblock.cpp | 8 ++++---- src/logic/scripting/lua/libentity.cpp | 2 +- src/logic/scripting/lua/libhud.cpp | 6 +++--- src/logic/scripting/scripting.cpp | 2 +- src/objects/Player.cpp | 2 +- src/objects/Player.hpp | 2 +- src/physics/PhysicsSolver.cpp | 6 +++--- src/physics/PhysicsSolver.hpp | 2 +- src/voxels/DefaultWorldGenerator.hpp | 2 +- src/voxels/FlatWorldGenerator.hpp | 2 +- src/world/Level.cpp | 6 +++--- src/world/LevelEvents.cpp | 2 +- src/world/World.cpp | 6 +++--- src/world/WorldGenerators.cpp | 4 ++-- src/world/WorldGenerators.hpp | 2 +- 45 files changed, 85 insertions(+), 85 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index e824762b4..e7389ac6f 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -16,7 +16,7 @@ #include "../logic/scripting/scripting.hpp" #include #include -#include "../voxels/Block.hpp" +#include #include "Assets.hpp" #include "assetload_funcs.hpp" diff --git a/src/content/Content.cpp b/src/content/Content.cpp index 8fb6a0e85..ab3de75f3 100644 --- a/src/content/Content.cpp +++ b/src/content/Content.cpp @@ -9,7 +9,7 @@ #include "../logic/scripting/scripting.hpp" #include #include -#include "../voxels/Block.hpp" +#include #include "ContentPack.hpp" ContentIndices::ContentIndices( diff --git a/src/content/ContentBuilder.hpp b/src/content/ContentBuilder.hpp index 335236ab8..f27bd8f8a 100644 --- a/src/content/ContentBuilder.hpp +++ b/src/content/ContentBuilder.hpp @@ -9,7 +9,7 @@ #include "ContentPack.hpp" #include #include -#include "../voxels/Block.hpp" +#include template class ContentUnitBuilder { diff --git a/src/content/ContentLUT.cpp b/src/content/ContentLUT.cpp index f6bacab16..c1c4c9602 100644 --- a/src/content/ContentLUT.cpp +++ b/src/content/ContentLUT.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "../voxels/Block.hpp" +#include #include "Content.hpp" ContentLUT::ContentLUT( diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index 932e8c14f..a34f13fd2 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "../voxels/Block.hpp" +#include #include "Content.hpp" #include "ContentBuilder.hpp" #include "ContentPack.hpp" diff --git a/src/core_defs.cpp b/src/core_defs.cpp index b1ad11cb2..4f4b27735 100644 --- a/src/core_defs.cpp +++ b/src/core_defs.cpp @@ -8,7 +8,7 @@ #include "window/Window.hpp" #include "window/Events.hpp" #include "window/input.hpp" -#include "voxels/Block.hpp" +#include // All in-game definitions (blocks, items, etc..) void corecontent::setup(EnginePaths* paths, ContentBuilder* builder) { diff --git a/src/engine.cpp b/src/engine.cpp index 5451856a4..74fdc23d4 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -30,8 +30,8 @@ #include "logic/scripting/scripting.hpp" #include #include -#include "voxels/DefaultWorldGenerator.hpp" -#include "voxels/FlatWorldGenerator.hpp" +#include +#include #include "window/Camera.hpp" #include "window/Events.hpp" #include "window/input.hpp" diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp index 2f07f7a93..1fc30a20e 100644 --- a/src/files/WorldConverter.cpp +++ b/src/files/WorldConverter.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "../voxels/Chunk.hpp" +#include #include "WorldFiles.hpp" namespace fs = std::filesystem; diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 1c8840147..ede078514 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -25,9 +25,9 @@ #include #include #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/voxel.hpp" +#include +#include +#include #include "../window/Camera.hpp" #include "../world/World.hpp" diff --git a/src/files/WorldFiles.hpp b/src/files/WorldFiles.hpp index c63ecff60..2ba543b89 100644 --- a/src/files/WorldFiles.hpp +++ b/src/files/WorldFiles.hpp @@ -9,7 +9,7 @@ #include #include -#include "../voxels/Chunk.hpp" +#include #include "WorldRegions.hpp" #include "files.hpp" #define GLM_ENABLE_EXPERIMENTAL diff --git a/src/files/WorldRegions.hpp b/src/files/WorldRegions.hpp index 2477ff617..22d6ff3a6 100644 --- a/src/files/WorldRegions.hpp +++ b/src/files/WorldRegions.hpp @@ -12,7 +12,7 @@ #include "../data/dynamic_fwd.hpp" #include #include -#include "../voxels/Chunk.hpp" +#include #include "files.hpp" #define GLM_ENABLE_EXPERIMENTAL #include "glm/gtx/hash.hpp" diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index 8c0eb8ed1..0a61c0231 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -8,7 +8,7 @@ #include #include #include "../maths/UVRegion.hpp" -#include "../voxels/Block.hpp" +#include #include diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index 70bf0f6ff..f8145d61d 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -10,7 +10,7 @@ #include "../logic/LevelController.hpp" #include "../logic/PlayerController.hpp" #include -#include "../voxels/Block.hpp" +#include #include "../world/Level.hpp" LevelFrontend::LevelFrontend( diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index d74612375..48c01cd8b 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -15,9 +15,9 @@ #include #include "../physics/Hitbox.hpp" #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" +#include +#include +#include #include "../world/Level.hpp" #include "../world/World.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index d056a3b1c..10317fa2e 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -34,9 +34,9 @@ #include "../physics/Hitbox.hpp" #include #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" +#include +#include +#include #include "../window/Camera.hpp" #include "../window/Events.hpp" #include "../window/input.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 3e936db0d..4a253b8f4 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -20,7 +20,7 @@ #include "../../logic/scripting/scripting_hud.hpp" #include #include "../../physics/Hitbox.hpp" -#include "../../voxels/Chunks.hpp" +#include #include "../../window/Camera.hpp" #include "../../window/Events.hpp" #include "../../window/Window.hpp" diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index 515d99c30..c5d3d844a 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -4,7 +4,7 @@ #include #include #include "../../frontend/ContentGfxCache.hpp" -#include "../../voxels/Block.hpp" +#include #include "../../window/Camera.hpp" #include "../../window/Window.hpp" #include diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index ae0795151..28e06fdbf 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -4,10 +4,10 @@ #include "../../maths/UVRegion.hpp" #include #include -#include "../../voxels/Block.hpp" -#include "../../voxels/Chunk.hpp" -#include "../../voxels/VoxelsVolume.hpp" -#include "../../voxels/ChunksStorage.hpp" +#include +#include +#include +#include #include "../../lighting/Lightmap.hpp" #include "../../frontend/ContentGfxCache.hpp" #include diff --git a/src/graphics/render/BlocksRenderer.hpp b/src/graphics/render/BlocksRenderer.hpp index f3430fce7..b37e4b7a7 100644 --- a/src/graphics/render/BlocksRenderer.hpp +++ b/src/graphics/render/BlocksRenderer.hpp @@ -5,7 +5,7 @@ #include #include #include -#include "../../voxels/voxel.hpp" +#include #include class Content; diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp index f69aa793a..9ad50f277 100644 --- a/src/graphics/render/ChunksRenderer.cpp +++ b/src/graphics/render/ChunksRenderer.cpp @@ -2,7 +2,7 @@ #include "BlocksRenderer.hpp" #include #include -#include "../../voxels/Chunk.hpp" +#include #include "../../world/Level.hpp" #include diff --git a/src/graphics/render/ChunksRenderer.hpp b/src/graphics/render/ChunksRenderer.hpp index 5789510f3..bb03c09e3 100644 --- a/src/graphics/render/ChunksRenderer.hpp +++ b/src/graphics/render/ChunksRenderer.hpp @@ -7,8 +7,8 @@ #include #include -#include "../../voxels/Block.hpp" -#include "../../voxels/ChunksStorage.hpp" +#include +#include #include class Mesh; diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp index e523a2952..7e3bbf96d 100644 --- a/src/graphics/render/ModelBatch.cpp +++ b/src/graphics/render/ModelBatch.cpp @@ -6,7 +6,7 @@ #include #include #include "../../window/Window.hpp" -#include "../../voxels/Chunks.hpp" +#include #include "../../lighting/Lightmap.hpp" #define GLM_ENABLE_EXPERIMENTAL diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index bd43f582d..4262f66b1 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -22,9 +22,9 @@ #include #include #include -#include "../../voxels/Block.hpp" -#include "../../voxels/Chunk.hpp" -#include "../../voxels/Chunks.hpp" +#include +#include +#include #include "../../window/Camera.hpp" #include "../../window/Window.hpp" #include "../../world/Level.hpp" diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 50ec2c87f..10fdce52a 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -12,7 +12,7 @@ #include "../../../maths/voxmaths.hpp" #include #include -#include "../../../voxels/Block.hpp" +#include #include "../../../window/Events.hpp" #include "../../../window/input.hpp" #include "../../../world/Level.hpp" diff --git a/src/lighting/LightSolver.cpp b/src/lighting/LightSolver.cpp index bc110aa19..7c7d5c4aa 100644 --- a/src/lighting/LightSolver.cpp +++ b/src/lighting/LightSolver.cpp @@ -3,10 +3,10 @@ #include "LightSolver.hpp" #include "Lightmap.hpp" #include -#include "../voxels/Chunks.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/voxel.hpp" -#include "../voxels/Block.hpp" +#include +#include +#include +#include LightSolver::LightSolver(const ContentIndices* contentIds, Chunks* chunks, int channel) : contentIds(contentIds), diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp index 52f54c493..285d244ed 100644 --- a/src/lighting/Lighting.cpp +++ b/src/lighting/Lighting.cpp @@ -2,10 +2,10 @@ #include "LightSolver.hpp" #include "Lightmap.hpp" #include -#include "../voxels/Chunks.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/voxel.hpp" -#include "../voxels/Block.hpp" +#include +#include +#include +#include #include #include diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp index 973601641..27117cf03 100644 --- a/src/logic/BlocksController.cpp +++ b/src/logic/BlocksController.cpp @@ -6,10 +6,10 @@ #include "../lighting/Lighting.hpp" #include "../maths/fastmaths.hpp" #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/voxel.hpp" +#include +#include +#include +#include #include "../world/Level.hpp" #include "../world/World.hpp" #include "scripting/scripting.hpp" diff --git a/src/logic/BlocksController.hpp b/src/logic/BlocksController.hpp index d2760703f..80971870b 100644 --- a/src/logic/BlocksController.hpp +++ b/src/logic/BlocksController.hpp @@ -7,7 +7,7 @@ #include "../maths/fastmaths.hpp" #include #include -#include "../voxels/voxel.hpp" +#include class Player; class Block; diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index 8d35a5b36..45d9287ac 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -11,11 +11,11 @@ #include "../lighting/Lighting.hpp" #include "../maths/voxmaths.hpp" #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/ChunksStorage.hpp" -#include "../voxels/WorldGenerator.hpp" +#include +#include +#include +#include +#include #include "../world/Level.hpp" #include "../world/World.hpp" #include "../world/WorldGenerators.hpp" diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 11adefcd2..f3e364b53 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -15,9 +15,9 @@ #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/voxel.hpp" +#include +#include +#include #include "../window/Camera.hpp" #include "../window/Events.hpp" #include "../window/Window.hpp" diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp index f6360db93..96eed6f52 100644 --- a/src/logic/scripting/lua/libblock.cpp +++ b/src/logic/scripting/lua/libblock.cpp @@ -2,10 +2,10 @@ #include "../../../lighting/Lighting.hpp" #include "../../../logic/BlocksController.hpp" #include "../../../logic/LevelController.hpp" -#include "../../../voxels/Block.hpp" -#include "../../../voxels/Chunk.hpp" -#include "../../../voxels/Chunks.hpp" -#include "../../../voxels/voxel.hpp" +#include +#include +#include +#include #include "../../../world/Level.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libentity.cpp index 9e92c3f75..b93bbb7cb 100644 --- a/src/logic/scripting/lua/libentity.cpp +++ b/src/logic/scripting/lua/libentity.cpp @@ -7,7 +7,7 @@ #include #include #include "../../../physics/Hitbox.hpp" -#include "../../../voxels/Chunks.hpp" +#include #include "../../../window/Camera.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index cf5beae4b..290a0fd9d 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -11,9 +11,9 @@ #include "../../../logic/BlocksController.hpp" #include #include -#include "../../../voxels/Block.hpp" -#include "../../../voxels/Chunks.hpp" -#include "../../../voxels/voxel.hpp" +#include +#include +#include #include "../../../world/Level.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index d0d43ff71..30f93c63e 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -19,7 +19,7 @@ #include #include #include -#include "../../voxels/Block.hpp" +#include #include "../../world/Level.hpp" #include "lua/lua_engine.hpp" diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index a9f3a9a76..525aa54e8 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -10,7 +10,7 @@ #include "rigging.hpp" #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" -#include "../voxels/Chunks.hpp" +#include #include "../window/Camera.hpp" #include "../window/Events.hpp" #include "../world/Level.hpp" diff --git a/src/objects/Player.hpp b/src/objects/Player.hpp index a0bc88bf3..4037356cd 100644 --- a/src/objects/Player.hpp +++ b/src/objects/Player.hpp @@ -9,7 +9,7 @@ #include "../interfaces/Object.hpp" #include "../interfaces/Serializable.hpp" #include -#include "../voxels/voxel.hpp" +#include class Camera; class Inventory; diff --git a/src/physics/PhysicsSolver.cpp b/src/physics/PhysicsSolver.cpp index aafb6a373..89dd89e4a 100644 --- a/src/physics/PhysicsSolver.cpp +++ b/src/physics/PhysicsSolver.cpp @@ -2,9 +2,9 @@ #include "Hitbox.hpp" #include "../maths/aabb.hpp" -#include "../voxels/Block.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/voxel.hpp" +#include +#include +#include #include #define GLM_ENABLE_EXPERIMENTAL diff --git a/src/physics/PhysicsSolver.hpp b/src/physics/PhysicsSolver.hpp index f4239f9db..b50a751a8 100644 --- a/src/physics/PhysicsSolver.hpp +++ b/src/physics/PhysicsSolver.hpp @@ -4,7 +4,7 @@ #include "Hitbox.hpp" #include -#include "../voxels/voxel.hpp" +#include #include #include diff --git a/src/voxels/DefaultWorldGenerator.hpp b/src/voxels/DefaultWorldGenerator.hpp index 28721eb77..2e1070f98 100644 --- a/src/voxels/DefaultWorldGenerator.hpp +++ b/src/voxels/DefaultWorldGenerator.hpp @@ -2,7 +2,7 @@ #define VOXELS_DEFAULTWORLDGENERATOR_HPP_ #include -#include "../voxels/WorldGenerator.hpp" +#include "WorldGenerator.hpp" struct voxel; class Content; diff --git a/src/voxels/FlatWorldGenerator.hpp b/src/voxels/FlatWorldGenerator.hpp index 7e0d92202..33b9edaea 100644 --- a/src/voxels/FlatWorldGenerator.hpp +++ b/src/voxels/FlatWorldGenerator.hpp @@ -2,7 +2,7 @@ #define VOXELS_FLATWORLDGENERATOR_HPP_ #include -#include "../voxels/WorldGenerator.hpp" +#include "WorldGenerator.hpp" struct voxel; class Content; diff --git a/src/world/Level.cpp b/src/world/Level.cpp index e28fb3866..f7aa062b0 100644 --- a/src/world/Level.cpp +++ b/src/world/Level.cpp @@ -10,9 +10,9 @@ #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" #include -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/ChunksStorage.hpp" +#include +#include +#include #include "../window/Camera.hpp" #include "LevelEvents.hpp" #include "World.hpp" diff --git a/src/world/LevelEvents.cpp b/src/world/LevelEvents.cpp index 12bedc1ae..9139dc373 100644 --- a/src/world/LevelEvents.cpp +++ b/src/world/LevelEvents.cpp @@ -1,6 +1,6 @@ #include "LevelEvents.hpp" -#include "../voxels/Chunk.hpp" +#include using std::vector; diff --git a/src/world/World.cpp b/src/world/World.cpp index c0acc907d..b9dfa9081 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -12,9 +12,9 @@ #include #include #include -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/ChunksStorage.hpp" +#include +#include +#include #include "../world/WorldGenerators.hpp" #include "Level.hpp" diff --git a/src/world/WorldGenerators.cpp b/src/world/WorldGenerators.cpp index feba8d52c..caa0174bd 100644 --- a/src/world/WorldGenerators.cpp +++ b/src/world/WorldGenerators.cpp @@ -3,8 +3,8 @@ #include #include -#include "../voxels/FlatWorldGenerator.hpp" -#include "../voxels/WorldGenerator.hpp" +#include +#include std::vector WorldGenerators::getGeneratorsIDs() { std::vector ids; diff --git a/src/world/WorldGenerators.hpp b/src/world/WorldGenerators.hpp index e21ddb12d..49afce15b 100644 --- a/src/world/WorldGenerators.hpp +++ b/src/world/WorldGenerators.hpp @@ -5,7 +5,7 @@ #include #include -#include "../voxels/WorldGenerator.hpp" +#include class Content; From 811599b55a736d5efc89ebba7a7045ba25b4f5ed Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 5 Aug 2024 20:39:16 +0300 Subject: [PATCH 12/31] fix docs typos --- doc/en/scripting/ecs.md | 2 +- doc/ru/scripting/ecs.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/en/scripting/ecs.md b/doc/en/scripting/ecs.md index df24663b6..8763d9819 100644 --- a/doc/en/scripting/ecs.md +++ b/doc/en/scripting/ecs.md @@ -51,7 +51,7 @@ tsf:set_size(size: vec3) -- Returns the entity rotation tsf:get_rot() -> mat4 -- Sets entity rotation -tsf:set_rot(size: mat4) +tsf:set_rot(rotation: mat4) ``` ### Rigidbody diff --git a/doc/ru/scripting/ecs.md b/doc/ru/scripting/ecs.md index fef88b014..3e8e00e54 100644 --- a/doc/ru/scripting/ecs.md +++ b/doc/ru/scripting/ecs.md @@ -51,7 +51,7 @@ tsf:set_size(size: vec3) -- Возвращает вращение сущности tsf:get_rot() -> mat4 -- Устанавливает вращение сущности -tsf:set_rot(size: mat4) +tsf:set_rot(rotation: mat4) ``` ### Rigidbody From 24b3045c07213206cffcabc10c5824ef1508497c Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 5 Aug 2024 20:46:46 +0300 Subject: [PATCH 13/31] update doc/*/libplayer.md --- doc/en/scripting/builtins/libplayer.md | 12 ++++++++++++ doc/ru/scripting/builtins/libplayer.md | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/doc/en/scripting/builtins/libplayer.md b/doc/en/scripting/builtins/libplayer.md index dda4f450e..015bf86ae 100644 --- a/doc/en/scripting/builtins/libplayer.md +++ b/doc/en/scripting/builtins/libplayer.md @@ -12,6 +12,18 @@ player.set_pos(playerid: int, x: number, y: number, z: number) Set player position +``` python +player.get_vel(playerid: int) -> number, number, number +``` + +Returns the x, y, z linear velocity of the player + +``` python +player.set_vel(playerid: int, x: number, y: number, z: number) +``` + +Sets x, y, z player linear velocity + ```python player.get_rot(playerid: int) -> number, number, number ``` diff --git a/doc/ru/scripting/builtins/libplayer.md b/doc/ru/scripting/builtins/libplayer.md index 8b15d8df5..b054e59fc 100644 --- a/doc/ru/scripting/builtins/libplayer.md +++ b/doc/ru/scripting/builtins/libplayer.md @@ -12,6 +12,18 @@ player.set_pos(playerid: int, x: number, y: number, z: number) Устанавливает x, y, z координаты игрока +```python +player.get_vel(playerid: int) -> number, number, number +``` + +Возвращает x, y, z линейной скорости игрока + +```python +player.set_vel(playerid: int, x: number, y: number, z: number) +``` + +Устанавливает x, y, z линейной скорости игрока + ```python player.get_rot(playerid: int) -> number, number, number ``` From 7f75c454c8a519f7e7aed289aa45db962edcb9e4 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Mon, 5 Aug 2024 23:23:28 +0300 Subject: [PATCH 14/31] logic/ --- src/assets/AssetsLoader.cpp | 2 +- src/content/Content.cpp | 2 +- src/content/ContentLoader.cpp | 2 +- src/engine.cpp | 6 +++--- src/frontend/LevelFrontend.cpp | 4 ++-- src/frontend/UiDocument.cpp | 2 +- src/frontend/debug_panel.cpp | 2 +- src/frontend/hud.cpp | 2 +- src/frontend/menu.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 4 ++-- src/graphics/render/WorldRenderer.cpp | 4 ++-- src/graphics/ui/elements/InventoryView.cpp | 2 +- src/graphics/ui/gui_util.cpp | 2 +- src/graphics/ui/gui_xml.cpp | 2 +- src/logic/scripting/lua/libblock.cpp | 4 ++-- src/logic/scripting/lua/libconsole.cpp | 2 +- src/logic/scripting/lua/libcore.cpp | 4 ++-- src/logic/scripting/lua/libentity.hpp | 2 +- src/logic/scripting/lua/libhud.cpp | 2 +- src/logic/scripting/lua/libinventory.cpp | 2 +- src/logic/scripting/scripting.cpp | 4 ++-- src/objects/Entities.cpp | 2 +- 22 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index e7389ac6f..b3e42f123 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -13,7 +13,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include #include #include diff --git a/src/content/Content.cpp b/src/content/Content.cpp index ab3de75f3..3f3cf32eb 100644 --- a/src/content/Content.cpp +++ b/src/content/Content.cpp @@ -6,7 +6,7 @@ #include #include -#include "../logic/scripting/scripting.hpp" +#include #include #include #include diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index a34f13fd2..1f1a68cc3 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include #include #include diff --git a/src/engine.cpp b/src/engine.cpp index 74fdc23d4..a1bdbad60 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -25,9 +25,9 @@ #include #include #include -#include "logic/EngineController.hpp" -#include "logic/CommandsInterpreter.hpp" -#include "logic/scripting/scripting.hpp" +#include +#include +#include #include #include #include diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index f8145d61d..f761bac17 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -7,8 +7,8 @@ #include #include #include -#include "../logic/LevelController.hpp" -#include "../logic/PlayerController.hpp" +#include +#include #include #include #include "../world/Level.hpp" diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp index b51cf23ff..06e6029ce 100644 --- a/src/frontend/UiDocument.cpp +++ b/src/frontend/UiDocument.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include UiDocument::UiDocument( std::string id, diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index 48c01cd8b..c88ae69d5 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include #include #include diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 10317fa2e..84e86c41d 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -28,7 +28,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include "../maths/voxmaths.hpp" #include #include "../physics/Hitbox.hpp" diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index 40e0988f6..0c2850613 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include #include #include diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 4a253b8f4..56c13a5b0 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -16,8 +16,8 @@ #include #include #include -#include "../../logic/LevelController.hpp" -#include "../../logic/scripting/scripting_hud.hpp" +#include +#include #include #include "../../physics/Hitbox.hpp" #include diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 894b5f9b0..f2c81a04a 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -15,8 +15,8 @@ #include #include #include -#include "../../logic/PlayerController.hpp" -#include "../../logic/scripting/scripting_hud.hpp" +#include +#include #include "../../maths/FrustumCulling.hpp" #include "../../maths/voxmaths.hpp" #include diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 10fdce52a..bce128e37 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "../../../logic/scripting/scripting.hpp" +#include #include "../../../maths/voxmaths.hpp" #include #include diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp index 452be7ef2..9bc2dad07 100644 --- a/src/graphics/ui/gui_util.cpp +++ b/src/graphics/ui/gui_util.cpp @@ -5,7 +5,7 @@ #include "elements/Button.hpp" #include "gui_xml.hpp" -#include "../../logic/scripting/scripting.hpp" +#include #include "../../frontend/locale.hpp" #include #include diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp index cc35ae217..ebd57698b 100644 --- a/src/graphics/ui/gui_xml.cpp +++ b/src/graphics/ui/gui_xml.cpp @@ -13,7 +13,7 @@ #include "../../frontend/menu.hpp" #include "../../frontend/locale.hpp" #include -#include "../../logic/scripting/scripting.hpp" +#include #include "../../maths/voxmaths.hpp" #include #include "../../window/Events.hpp" diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp index 96eed6f52..31432fb48 100644 --- a/src/logic/scripting/lua/libblock.cpp +++ b/src/logic/scripting/lua/libblock.cpp @@ -1,7 +1,7 @@ #include #include "../../../lighting/Lighting.hpp" -#include "../../../logic/BlocksController.hpp" -#include "../../../logic/LevelController.hpp" +#include +#include #include #include #include diff --git a/src/logic/scripting/lua/libconsole.cpp b/src/logic/scripting/lua/libconsole.cpp index 28655f801..3202bc1dd 100644 --- a/src/logic/scripting/lua/libconsole.cpp +++ b/src/logic/scripting/lua/libconsole.cpp @@ -1,6 +1,6 @@ #include #include -#include "../../CommandsInterpreter.hpp" +#include #include "api_lua.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp index b19bf5396..679fe21e3 100644 --- a/src/logic/scripting/lua/libcore.cpp +++ b/src/logic/scripting/lua/libcore.cpp @@ -7,8 +7,8 @@ #include #include "../../../frontend/menu.hpp" #include "../../../frontend/screens/MenuScreen.hpp" -#include "../../../logic/EngineController.hpp" -#include "../../../logic/LevelController.hpp" +#include +#include #include "../../../window/Events.hpp" #include "../../../window/Window.hpp" #include "../../../world/Level.hpp" diff --git a/src/logic/scripting/lua/libentity.hpp b/src/logic/scripting/lua/libentity.hpp index be944c2e7..290febbc7 100644 --- a/src/logic/scripting/lua/libentity.hpp +++ b/src/logic/scripting/lua/libentity.hpp @@ -6,7 +6,7 @@ #include "../../../frontend/hud.hpp" #include #include "../../../world/Level.hpp" -#include "../../LevelController.hpp" +#include #include "api_lua.hpp" namespace scripting { diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index 290a0fd9d..4357546f0 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -8,7 +8,7 @@ #include "../../../frontend/hud.hpp" #include #include -#include "../../../logic/BlocksController.hpp" +#include #include #include #include diff --git a/src/logic/scripting/lua/libinventory.cpp b/src/logic/scripting/lua/libinventory.cpp index df37daa6a..79269bc9a 100644 --- a/src/logic/scripting/lua/libinventory.cpp +++ b/src/logic/scripting/lua/libinventory.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "../../../logic/BlocksController.hpp" +#include #include "../../../world/Level.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 30f93c63e..64355e19e 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -12,8 +12,8 @@ #include "../../frontend/UiDocument.hpp" #include #include -#include "../../logic/BlocksController.hpp" -#include "../../logic/LevelController.hpp" +#include "../BlocksController.hpp" +#include "../LevelController.hpp" #include #include #include diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index f7c13d873..9e3f65d5e 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include "../maths/FrustumCulling.hpp" #include "../maths/rays.hpp" #include "EntityDef.hpp" From 9340e962d36e1ac1699b04b13da92197b371a25e Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Mon, 5 Aug 2024 23:26:43 +0300 Subject: [PATCH 15/31] Controversial --- src/logic/scripting/scripting.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 64355e19e..be4ebf4d6 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -12,8 +12,8 @@ #include "../../frontend/UiDocument.hpp" #include #include -#include "../BlocksController.hpp" -#include "../LevelController.hpp" +#include +#include #include #include #include From 5153152389edd2369adc1a9786e1de778bf6acec Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Mon, 5 Aug 2024 23:29:13 +0300 Subject: [PATCH 16/31] Flake update --- flake.lock | 6 +++--- flake.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index df79ce91e..55f50fc42 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717399147, - "narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=", + "lastModified": 1722802969, + "narHash": "sha256-bPhyAXNnVerBZusxOuPMhMm0X7hSFLFKcH+7ynfgLjs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5", + "rev": "785feb91183a50959823ff9ba9ef673105259cd5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 602e7b82d..a1c9d20b9 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ devShells.default = with nixpkgs.legacyPackages.${system}; mkShell { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glm glfw glew zlib libpng libvorbis openal luajit ]; # libglvnd - packages = [ mesa freeglut entt ]; + packages = [ glfw mesa freeglut entt ]; LD_LIBRARY_PATH = "${wayland}/lib:$LD_LIBRARY_PATH"; }; }); From 9f9b9f2d64390e30c1cf6b60b1403140c1779df7 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Mon, 5 Aug 2024 23:49:11 +0300 Subject: [PATCH 17/31] world/ --- src/engine.cpp | 2 +- src/files/WorldFiles.cpp | 2 +- src/frontend/LevelFrontend.cpp | 2 +- src/frontend/debug_panel.cpp | 4 ++-- src/frontend/hud.cpp | 4 ++-- src/frontend/screens/LevelScreen.cpp | 4 ++-- src/graphics/render/ChunksRenderer.cpp | 2 +- src/graphics/render/WorldRenderer.cpp | 6 +++--- src/graphics/ui/elements/InventoryView.cpp | 2 +- src/items/Inventories.cpp | 4 ++-- src/logic/BlocksController.cpp | 4 ++-- src/logic/ChunksController.cpp | 6 +++--- src/logic/EngineController.cpp | 4 ++-- src/logic/LevelController.cpp | 4 ++-- src/logic/PlayerController.cpp | 2 +- src/logic/scripting/lua/libblock.cpp | 2 +- src/logic/scripting/lua/libcamera.cpp | 2 +- src/logic/scripting/lua/libcore.cpp | 4 ++-- src/logic/scripting/lua/libentity.hpp | 2 +- src/logic/scripting/lua/libgui.cpp | 2 +- src/logic/scripting/lua/libhud.cpp | 2 +- src/logic/scripting/lua/libinventory.cpp | 2 +- src/logic/scripting/lua/libpack.cpp | 4 ++-- src/logic/scripting/lua/libplayer.cpp | 2 +- src/logic/scripting/lua/libworld.cpp | 4 ++-- src/logic/scripting/scripting.cpp | 2 +- src/objects/Entities.cpp | 2 +- src/objects/Player.cpp | 2 +- src/voxels/Chunks.cpp | 4 ++-- src/voxels/ChunksStorage.cpp | 4 ++-- src/world/World.cpp | 2 +- 31 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/engine.cpp b/src/engine.cpp index a1bdbad60..e9c30f746 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -36,7 +36,7 @@ #include "window/Events.hpp" #include "window/input.hpp" #include "window/Window.hpp" -#include "world/WorldGenerators.hpp" +#include #include #include diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index ede078514..b2e0f0c54 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -29,7 +29,7 @@ #include #include #include "../window/Camera.hpp" -#include "../world/World.hpp" +#include #define WORLD_FORMAT_MAGIC ".VOXWLD" diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index f761bac17..27decf50c 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "../world/Level.hpp" +#include LevelFrontend::LevelFrontend( Player* currentPlayer, LevelController* controller, Assets* assets diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index c88ae69d5..579e5dcd1 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -18,8 +18,8 @@ #include #include #include -#include "../world/Level.hpp" -#include "../world/World.hpp" +#include +#include #include #include diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 84e86c41d..e3f69da62 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -41,8 +41,8 @@ #include "../window/Events.hpp" #include "../window/input.hpp" #include "../window/Window.hpp" -#include "../world/Level.hpp" -#include "../world/World.hpp" +#include +#include #include #include diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 56c13a5b0..e461d6593 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -24,8 +24,8 @@ #include "../../window/Camera.hpp" #include "../../window/Events.hpp" #include "../../window/Window.hpp" -#include "../../world/Level.hpp" -#include "../../world/World.hpp" +#include +#include static debug::Logger logger("level-screen"); diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp index 9ad50f277..295127346 100644 --- a/src/graphics/render/ChunksRenderer.cpp +++ b/src/graphics/render/ChunksRenderer.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "../../world/Level.hpp" +#include #include #include diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index f2c81a04a..7651d393f 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -27,9 +27,9 @@ #include #include "../../window/Camera.hpp" #include "../../window/Window.hpp" -#include "../../world/Level.hpp" -#include "../../world/LevelEvents.hpp" -#include "../../world/World.hpp" +#include +#include +#include #include #include #include diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index bce128e37..24a12162c 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -15,7 +15,7 @@ #include #include "../../../window/Events.hpp" #include "../../../window/input.hpp" -#include "../../../world/Level.hpp" +#include #include #include #include diff --git a/src/items/Inventories.cpp b/src/items/Inventories.cpp index 7fbbf789c..7ae1bce9b 100644 --- a/src/items/Inventories.cpp +++ b/src/items/Inventories.cpp @@ -2,8 +2,8 @@ #include -#include "../world/Level.hpp" -#include "../world/World.hpp" +#include +#include Inventories::Inventories(Level& level) : level(level) { } diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp index 27117cf03..e20be6f27 100644 --- a/src/logic/BlocksController.cpp +++ b/src/logic/BlocksController.cpp @@ -10,8 +10,8 @@ #include #include #include -#include "../world/Level.hpp" -#include "../world/World.hpp" +#include +#include #include "scripting/scripting.hpp" BlocksController::BlocksController(Level* level, uint padding) diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index 45d9287ac..2192b7361 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -16,9 +16,9 @@ #include #include #include -#include "../world/Level.hpp" -#include "../world/World.hpp" -#include "../world/WorldGenerators.hpp" +#include +#include +#include const uint MAX_WORK_PER_FRAME = 128; const uint MIN_SURROUNDING = 9; diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index 346b1220c..3b6eec8da 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -18,8 +18,8 @@ #include #include "../interfaces/Task.hpp" #include -#include "../world/Level.hpp" -#include "../world/World.hpp" +#include +#include #include "LevelController.hpp" namespace fs = std::filesystem; diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp index 01b778ddc..7cf3a9014 100644 --- a/src/logic/LevelController.cpp +++ b/src/logic/LevelController.cpp @@ -8,8 +8,8 @@ #include #include "../physics/Hitbox.hpp" #include -#include "../world/Level.hpp" -#include "../world/World.hpp" +#include +#include #include "scripting/scripting.hpp" static debug::Logger logger("level-control"); diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index f3e364b53..33c545f5b 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -22,7 +22,7 @@ #include "../window/Events.hpp" #include "../window/Window.hpp" #include "../window/input.hpp" -#include "../world/Level.hpp" +#include #include "BlocksController.hpp" #include "scripting/scripting.hpp" diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp index 31432fb48..2ae8c628d 100644 --- a/src/logic/scripting/lua/libblock.cpp +++ b/src/logic/scripting/lua/libblock.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "../../../world/Level.hpp" +#include #include "api_lua.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libcamera.cpp b/src/logic/scripting/lua/libcamera.cpp index ffdf90a3f..70558f67b 100644 --- a/src/logic/scripting/lua/libcamera.cpp +++ b/src/logic/scripting/lua/libcamera.cpp @@ -2,7 +2,7 @@ #include #include "../../../window/Camera.hpp" -#include "../../../world/Level.hpp" +#include #include "api_lua.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp index 679fe21e3..55ef68b62 100644 --- a/src/logic/scripting/lua/libcore.cpp +++ b/src/logic/scripting/lua/libcore.cpp @@ -11,8 +11,8 @@ #include #include "../../../window/Events.hpp" #include "../../../window/Window.hpp" -#include "../../../world/Level.hpp" -#include "../../../world/WorldGenerators.hpp" +#include +#include #include "api_lua.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libentity.hpp b/src/logic/scripting/lua/libentity.hpp index 290febbc7..0e5cba42e 100644 --- a/src/logic/scripting/lua/libentity.hpp +++ b/src/logic/scripting/lua/libentity.hpp @@ -5,7 +5,7 @@ #include "../../../frontend/hud.hpp" #include -#include "../../../world/Level.hpp" +#include #include #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp index 202d6da9c..936eec146 100644 --- a/src/logic/scripting/lua/libgui.cpp +++ b/src/logic/scripting/lua/libgui.cpp @@ -14,7 +14,7 @@ #include #include #include -#include "../../../world/Level.hpp" +#include #include "api_lua.hpp" using namespace gui; diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index 4357546f0..237cde2c5 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -14,7 +14,7 @@ #include #include #include -#include "../../../world/Level.hpp" +#include #include "api_lua.hpp" namespace scripting { diff --git a/src/logic/scripting/lua/libinventory.cpp b/src/logic/scripting/lua/libinventory.cpp index 79269bc9a..1555ee387 100644 --- a/src/logic/scripting/lua/libinventory.cpp +++ b/src/logic/scripting/lua/libinventory.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "../../../world/Level.hpp" +#include #include "api_lua.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index 827ad9d7d..5c9d26c17 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -8,8 +8,8 @@ #include #include #include -#include "../../../world/Level.hpp" -#include "../../../world/World.hpp" +#include +#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 bb22926f3..a31d46e85 100644 --- a/src/logic/scripting/lua/libplayer.cpp +++ b/src/logic/scripting/lua/libplayer.cpp @@ -6,7 +6,7 @@ #include #include "../../../physics/Hitbox.hpp" #include "../../../window/Camera.hpp" -#include "../../../world/Level.hpp" +#include #include "libentity.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp index e3bdcb005..4300aec64 100644 --- a/src/logic/scripting/lua/libworld.cpp +++ b/src/logic/scripting/lua/libworld.cpp @@ -5,8 +5,8 @@ #include #include #include -#include "../../../world/Level.hpp" -#include "../../../world/World.hpp" +#include +#include #include "api_lua.hpp" using namespace scripting; diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index be4ebf4d6..6db74905b 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "../../world/Level.hpp" +#include #include "lua/lua_engine.hpp" using namespace scripting; diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index 9e3f65d5e..9aef67b87 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -19,7 +19,7 @@ #include "rigging.hpp" #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" -#include "../world/Level.hpp" +#include static debug::Logger logger("entities"); diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index 525aa54e8..18cd2b014 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -13,7 +13,7 @@ #include #include "../window/Camera.hpp" #include "../window/Events.hpp" -#include "../world/Level.hpp" +#include const float CROUCH_SPEED_MUL = 0.35f; const float RUN_SPEED_MUL = 1.5f; diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index 34b70f1d5..314b2a8da 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -16,8 +16,8 @@ #include "../maths/rays.hpp" #include "../maths/voxmaths.hpp" #include -#include "../world/Level.hpp" -#include "../world/LevelEvents.hpp" +#include +#include #include "Block.hpp" #include "Chunk.hpp" #include "WorldGenerator.hpp" diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp index aa92d57da..f27496f84 100644 --- a/src/voxels/ChunksStorage.cpp +++ b/src/voxels/ChunksStorage.cpp @@ -8,8 +8,8 @@ #include "../maths/voxmaths.hpp" #include #include -#include "../world/Level.hpp" -#include "../world/World.hpp" +#include +#include #include "Block.hpp" #include "Chunk.hpp" #include "VoxelsVolume.hpp" diff --git a/src/world/World.cpp b/src/world/World.cpp index b9dfa9081..8945d4944 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "../world/WorldGenerators.hpp" +#include "WorldGenerators.hpp" #include "Level.hpp" static debug::Logger logger("world"); From 3b6e7d1877c81c3705a1a2555cd7bb9f9db717c8 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Mon, 5 Aug 2024 23:58:14 +0300 Subject: [PATCH 18/31] audio/ --- src/assets/assetload_funcs.cpp | 2 +- src/coders/ogg.cpp | 2 +- src/coders/wav.cpp | 2 +- src/engine.cpp | 2 +- src/frontend/LevelFrontend.cpp | 2 +- src/frontend/debug_panel.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/logic/scripting/lua/libaudio.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp index 6f61374c5..de105d403 100644 --- a/src/assets/assetload_funcs.cpp +++ b/src/assets/assetload_funcs.cpp @@ -4,7 +4,7 @@ #include #include -#include "../audio/audio.hpp" +#include