world/

src/engine.cpp

@@ -36,7 +36,7 @@
 #include "window/Events.hpp"
 #include "window/input.hpp"
 #include "window/Window.hpp"
-#include "world/WorldGenerators.hpp"
+#include <world/WorldGenerators.hpp>
 #include <settings.hpp>
 
 #include <iostream>

src/files/WorldFiles.cpp

@@ -29,7 +29,7 @@
 #include <voxels/Chunk.hpp>
 #include <voxels/voxel.hpp>
 #include "../window/Camera.hpp"
-#include "../world/World.hpp"
+#include <world/World.hpp>
 
 #define WORLD_FORMAT_MAGIC ".VOXWLD"
 

src/frontend/LevelFrontend.cpp

@@ -11,7 +11,7 @@
 #include <logic/PlayerController.hpp>
 #include <objects/Player.hpp>
 #include <voxels/Block.hpp>
-#include "../world/Level.hpp"
+#include <world/Level.hpp>
 
 LevelFrontend::LevelFrontend(
     Player* currentPlayer, LevelController* controller, Assets* assets

src/frontend/debug_panel.cpp

@@ -18,8 +18,8 @@
 #include <voxels/Block.hpp>
 #include <voxels/Chunk.hpp>
 #include <voxels/Chunks.hpp>
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <world/Level.hpp>
+#include <world/World.hpp>
 
 #include <string>
 #include <memory>

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 <world/Level.hpp>
+#include <world/World.hpp>
 
 #include <assert.h>
 #include <memory>

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 <world/Level.hpp>
+#include <world/World.hpp>
 
 static debug::Logger logger("level-screen");
 

src/graphics/render/ChunksRenderer.cpp

@@ -3,7 +3,7 @@
 #include <debug/Logger.hpp>
 #include <graphics/core/Mesh.hpp>
 #include <voxels/Chunk.hpp>
-#include "../../world/Level.hpp"
+#include <world/Level.hpp>
 #include <settings.hpp>
 
 #include <iostream>

src/graphics/render/WorldRenderer.cpp

@@ -27,9 +27,9 @@
 #include <voxels/Chunks.hpp>
 #include "../../window/Camera.hpp"
 #include "../../window/Window.hpp"
-#include "../../world/Level.hpp"
-#include "../../world/LevelEvents.hpp"
-#include "../../world/World.hpp"
+#include <world/Level.hpp>
+#include <world/LevelEvents.hpp>
+#include <world/World.hpp>
 #include <graphics/core/Atlas.hpp>
 #include <graphics/core/Batch3D.hpp>
 #include <graphics/core/DrawContext.hpp>

src/graphics/ui/elements/InventoryView.cpp

@@ -15,7 +15,7 @@
 #include <voxels/Block.hpp>
 #include "../../../window/Events.hpp"
 #include "../../../window/input.hpp"
-#include "../../../world/Level.hpp"
+#include <world/Level.hpp>
 #include <graphics/core/Atlas.hpp>
 #include <graphics/core/Batch2D.hpp>
 #include <graphics/core/Font.hpp>

src/items/Inventories.cpp

@@ -2,8 +2,8 @@
 
 #include <algorithm>
 
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <world/Level.hpp>
+#include <world/World.hpp>
 
 Inventories::Inventories(Level& level) : level(level) {
 }

src/logic/BlocksController.cpp

@@ -10,8 +10,8 @@
 #include <voxels/Chunk.hpp>
 #include <voxels/Chunks.hpp>
 #include <voxels/voxel.hpp>
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "scripting/scripting.hpp"
 
 BlocksController::BlocksController(Level* level, uint padding)

src/logic/ChunksController.cpp

@@ -16,9 +16,9 @@
 #include <voxels/Chunks.hpp>
 #include <voxels/ChunksStorage.hpp>
 #include <voxels/WorldGenerator.hpp>
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
-#include "../world/WorldGenerators.hpp"
+#include <world/Level.hpp>
+#include <world/World.hpp>
+#include <world/WorldGenerators.hpp>
 
 const uint MAX_WORK_PER_FRAME = 128;
 const uint MIN_SURROUNDING = 9;

src/logic/EngineController.cpp

@@ -18,8 +18,8 @@
 #include <graphics/ui/gui_util.hpp>
 #include "../interfaces/Task.hpp"
 #include <util/stringutil.hpp>
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "LevelController.hpp"
 
 namespace fs = std::filesystem;

src/logic/LevelController.cpp

@@ -8,8 +8,8 @@
 #include <objects/Entities.hpp>
 #include "../physics/Hitbox.hpp"
 #include <settings.hpp>
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "scripting/scripting.hpp"
 
 static debug::Logger logger("level-control");

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 <world/Level.hpp>
 #include "BlocksController.hpp"
 #include "scripting/scripting.hpp"
 

src/logic/scripting/lua/libblock.cpp

@@ -6,7 +6,7 @@
 #include <voxels/Chunk.hpp>
 #include <voxels/Chunks.hpp>
 #include <voxels/voxel.hpp>
-#include "../../../world/Level.hpp"
+#include <world/Level.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;

src/logic/scripting/lua/libcamera.cpp

@@ -2,7 +2,7 @@
 
 #include <content/Content.hpp>
 #include "../../../window/Camera.hpp"
-#include "../../../world/Level.hpp"
+#include <world/Level.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;

src/logic/scripting/lua/libcore.cpp

@@ -11,8 +11,8 @@
 #include <logic/LevelController.hpp>
 #include "../../../window/Events.hpp"
 #include "../../../window/Window.hpp"
-#include "../../../world/Level.hpp"
-#include "../../../world/WorldGenerators.hpp"
+#include <world/Level.hpp>
+#include <world/WorldGenerators.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;

src/logic/scripting/lua/libentity.hpp

@@ -5,7 +5,7 @@
 
 #include "../../../frontend/hud.hpp"
 #include <objects/Entities.hpp>
-#include "../../../world/Level.hpp"
+#include <world/Level.hpp>
 #include <logic/LevelController.hpp>
 #include "api_lua.hpp"
 

src/logic/scripting/lua/libgui.cpp

@@ -14,7 +14,7 @@
 #include <graphics/ui/gui_util.hpp>
 #include <items/Inventories.hpp>
 #include <util/stringutil.hpp>
-#include "../../../world/Level.hpp"
+#include <world/Level.hpp>
 #include "api_lua.hpp"
 
 using namespace gui;

src/logic/scripting/lua/libhud.cpp

@@ -14,7 +14,7 @@
 #include <voxels/Block.hpp>
 #include <voxels/Chunks.hpp>
 #include <voxels/voxel.hpp>
-#include "../../../world/Level.hpp"
+#include <world/Level.hpp>
 #include "api_lua.hpp"
 
 namespace scripting {

src/logic/scripting/lua/libinventory.cpp

@@ -2,7 +2,7 @@
 #include <items/Inventories.hpp>
 #include <items/ItemStack.hpp>
 #include <logic/BlocksController.hpp>
-#include "../../../world/Level.hpp"
+#include <world/Level.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;

src/logic/scripting/lua/libpack.cpp

@@ -8,8 +8,8 @@
 #include <engine.hpp>
 #include <files/WorldFiles.hpp>
 #include <files/engine_paths.hpp>
-#include "../../../world/Level.hpp"
-#include "../../../world/World.hpp"
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;

src/logic/scripting/lua/libplayer.cpp

@@ -6,7 +6,7 @@
 #include <objects/Player.hpp>
 #include "../../../physics/Hitbox.hpp"
 #include "../../../window/Camera.hpp"
-#include "../../../world/Level.hpp"
+#include <world/Level.hpp>
 #include "libentity.hpp"
 
 using namespace scripting;

src/logic/scripting/lua/libworld.cpp

@@ -5,8 +5,8 @@
 #include <assets/AssetsLoader.hpp>
 #include <engine.hpp>
 #include <files/engine_paths.hpp>
-#include "../../../world/Level.hpp"
-#include "../../../world/World.hpp"
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;

src/logic/scripting/scripting.cpp

@@ -20,7 +20,7 @@
 #include <util/stringutil.hpp>
 #include <util/timeutil.hpp>
 #include <voxels/Block.hpp>
-#include "../../world/Level.hpp"
+#include <world/Level.hpp>
 #include "lua/lua_engine.hpp"
 
 using namespace scripting;

src/objects/Entities.cpp

@@ -19,7 +19,7 @@
 #include "rigging.hpp"
 #include "../physics/Hitbox.hpp"
 #include "../physics/PhysicsSolver.hpp"
-#include "../world/Level.hpp"
+#include <world/Level.hpp>
 
 static debug::Logger logger("entities");
 

src/objects/Player.cpp

@@ -13,7 +13,7 @@
 #include <voxels/Chunks.hpp>
 #include "../window/Camera.hpp"
 #include "../window/Events.hpp"
-#include "../world/Level.hpp"
+#include <world/Level.hpp>
 
 const float CROUCH_SPEED_MUL = 0.35f;
 const float RUN_SPEED_MUL = 1.5f;

src/voxels/Chunks.cpp

@@ -16,8 +16,8 @@
 #include "../maths/rays.hpp"
 #include "../maths/voxmaths.hpp"
 #include <objects/Entities.hpp>
-#include "../world/Level.hpp"
-#include "../world/LevelEvents.hpp"
+#include <world/Level.hpp>
+#include <world/LevelEvents.hpp>
 #include "Block.hpp"
 #include "Chunk.hpp"
 #include "WorldGenerator.hpp"

src/voxels/ChunksStorage.cpp

@@ -8,8 +8,8 @@
 #include "../maths/voxmaths.hpp"
 #include <objects/Entities.hpp>
 #include <typedefs.hpp>
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "Block.hpp"
 #include "Chunk.hpp"
 #include "VoxelsVolume.hpp"

src/world/World.cpp

@@ -15,7 +15,7 @@
 #include <voxels/Chunk.hpp>
 #include <voxels/Chunks.hpp>
 #include <voxels/ChunksStorage.hpp>
-#include "../world/WorldGenerators.hpp"
+#include "WorldGenerators.hpp"
 #include "Level.hpp"
 
 static debug::Logger logger("world");