From 9f9b9f2d64390e30c1cf6b60b1403140c1779df7 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Mon, 5 Aug 2024 23:49:11 +0300 Subject: [PATCH] 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");