items/ + objects/ + util/

src/assets/AssetsLoader.cpp

@@ -14,8 +14,8 @@
 #include <files/files.hpp>
 #include <graphics/core/Texture.hpp>
 #include "../logic/scripting/scripting.hpp"
-#include "../objects/rigging.hpp"
-#include "../util/ThreadPool.hpp"
+#include <objects/rigging.hpp>
+#include <util/ThreadPool.hpp>
 #include "../voxels/Block.hpp"
 #include "Assets.hpp"
 #include "assetload_funcs.hpp"

src/assets/assetload_funcs.cpp

@@ -22,7 +22,7 @@
 #include <graphics/core/Shader.hpp>
 #include <graphics/core/Texture.hpp>
 #include <graphics/core/TextureAnimation.hpp>
-#include "../objects/rigging.hpp"
+#include <objects/rigging.hpp>
 #include "Assets.hpp"
 #include "AssetsLoader.hpp"
 

src/coders/GLSLExtension.cpp

@@ -8,7 +8,7 @@
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>
 #include <typedefs.hpp>
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 namespace fs = std::filesystem;
 

src/coders/commons.cpp

@@ -5,7 +5,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 inline double power(double base, int64_t power) {
     double result = 1.0;

src/coders/json.cpp

@@ -7,7 +7,7 @@
 #include <sstream>
 
 #include "../data/dynamic.hpp"
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "commons.hpp"
 
 using namespace json;

src/coders/toml.cpp

@@ -9,7 +9,7 @@
 #include "../data/dynamic.hpp"
 #include "../data/setting.hpp"
 #include <files/settings_io.hpp>
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "commons.hpp"
 
 using namespace toml;

src/coders/xml.cpp

@@ -5,7 +5,7 @@
 #include <stdexcept>
 #include <utility>
 
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 using namespace xml;
 

src/content/Content.cpp

@@ -5,10 +5,10 @@
 #include <stdexcept>
 #include <utility>
 
-#include "../items/ItemDef.hpp"
+#include <items/ItemDef.hpp>
 #include "../logic/scripting/scripting.hpp"
-#include "../objects/EntityDef.hpp"
-#include "../objects/rigging.hpp"
+#include <objects/EntityDef.hpp>
+#include <objects/rigging.hpp>
 #include "../voxels/Block.hpp"
 #include "ContentPack.hpp"
 

src/content/ContentBuilder.cpp

@@ -1,6 +1,6 @@
 #include "ContentBuilder.hpp"
 
-#include "../objects/rigging.hpp"
+#include <objects/rigging.hpp>
 
 ContentBuilder::~ContentBuilder() = default;
 

src/content/ContentBuilder.hpp

@@ -7,8 +7,8 @@
 
 #include "Content.hpp"
 #include "ContentPack.hpp"
-#include "../items/ItemDef.hpp"
-#include "../objects/EntityDef.hpp"
+#include <items/ItemDef.hpp>
+#include <objects/EntityDef.hpp>
 #include "../voxels/Block.hpp"
 
 template <class T>

src/content/ContentLUT.cpp

@@ -5,7 +5,7 @@
 #include <coders/json.hpp>
 #include <constants.hpp>
 #include <files/files.hpp>
-#include "../items/ItemDef.hpp"
+#include <items/ItemDef.hpp>
 #include "../voxels/Block.hpp"
 #include "Content.hpp"
 

src/content/ContentLoader.cpp

@@ -11,12 +11,12 @@
 #include "../data/dynamic.hpp"
 #include <debug/Logger.hpp>
 #include <files/files.hpp>
-#include "../items/ItemDef.hpp"
+#include <items/ItemDef.hpp>
 #include "../logic/scripting/scripting.hpp"
-#include "../objects/rigging.hpp"
+#include <objects/rigging.hpp>
 #include <typedefs.hpp>
-#include "../util/listutil.hpp"
-#include "../util/stringutil.hpp"
+#include <util/listutil.hpp>
+#include <util/stringutil.hpp>
 #include "../voxels/Block.hpp"
 #include "Content.hpp"
 #include "ContentBuilder.hpp"

src/content/PacksManager.cpp

@@ -3,7 +3,7 @@
 #include <queue>
 #include <sstream>
 
-#include "../util/listutil.hpp"
+#include <util/listutil.hpp>
 
 PacksManager::PacksManager() = default;
 

src/core_defs.cpp

@@ -1,6 +1,6 @@
 #include "core_defs.hpp"
 
-#include "items/ItemDef.hpp"
+#include <items/ItemDef.hpp>
 #include <content/Content.hpp>
 #include <content/ContentBuilder.hpp>
 #include <files/files.hpp>

src/data/setting.cpp

@@ -1,6 +1,6 @@
 #include "setting.hpp"
 
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 std::string NumberSetting::toString() const {
     switch (getFormat()) {

src/engine.cpp

@@ -24,12 +24,12 @@
 #include <graphics/core/ImageData.hpp>
 #include <graphics/core/Shader.hpp>
 #include <graphics/ui/GUI.hpp>
-#include "objects/rigging.hpp"
+#include <objects/rigging.hpp>
 #include "logic/EngineController.hpp"
 #include "logic/CommandsInterpreter.hpp"
 #include "logic/scripting/scripting.hpp"
-#include "util/listutil.hpp"
-#include "util/platform.hpp"
+#include <util/listutil.hpp>
+#include <util/platform.hpp>
 #include "voxels/DefaultWorldGenerator.hpp"
 #include "voxels/FlatWorldGenerator.hpp"
 #include "window/Camera.hpp"

src/engine.hpp

@@ -9,7 +9,7 @@
 #include <content/ContentPack.hpp>
 #include <content/PacksManager.hpp>
 #include <files/engine_paths.hpp>
-#include "util/ObjectsKeeper.hpp"
+#include <util/ObjectsKeeper.hpp>
 
 #include <filesystem>
 #include <memory>

src/files/WorldConverter.cpp

@@ -9,8 +9,8 @@
 #include "../data/dynamic.hpp"
 #include <debug/Logger.hpp>
 #include <files/files.hpp>
-#include "../objects/Player.hpp"
-#include "../util/ThreadPool.hpp"
+#include <objects/Player.hpp>
+#include <util/ThreadPool.hpp>
 #include "../voxels/Chunk.hpp"
 #include "WorldFiles.hpp"
 

src/files/WorldFiles.cpp

@@ -15,16 +15,16 @@
 #include <core_defs.hpp>
 #include "../data/dynamic.hpp"
 #include <debug/Logger.hpp>
-#include "../items/Inventory.hpp"
-#include "../items/ItemDef.hpp"
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
 #include "../lighting/Lightmap.hpp"
 #include "../maths/voxmaths.hpp"
-#include "../objects/EntityDef.hpp"
-#include "../objects/Player.hpp"
+#include <objects/EntityDef.hpp>
+#include <objects/Player.hpp>
 #include "../physics/Hitbox.hpp"
 #include <settings.hpp>
 #include <typedefs.hpp>
-#include "../util/data_io.hpp"
+#include <util/data_io.hpp>
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunk.hpp"
 #include "../voxels/voxel.hpp"

src/files/WorldRegions.cpp

@@ -7,9 +7,9 @@
 #include <coders/byte_utils.hpp>
 #include <coders/rle.hpp>
 #include "../data/dynamic.hpp"
-#include "../items/Inventory.hpp"
+#include <items/Inventory.hpp>
 #include "../maths/voxmaths.hpp"
-#include "../util/data_io.hpp"
+#include <util/data_io.hpp>
 
 #define REGION_FORMAT_MAGIC ".VOXREG"
 

src/files/WorldRegions.hpp

@@ -11,7 +11,7 @@
 
 #include "../data/dynamic_fwd.hpp"
 #include <typedefs.hpp>
-#include "../util/BufferPool.hpp"
+#include <util/BufferPool.hpp>
 #include "../voxels/Chunk.hpp"
 #include "files.hpp"
 #define GLM_ENABLE_EXPERIMENTAL

src/files/engine_paths.cpp

@@ -7,7 +7,7 @@
 #include <utility>
 
 #include <typedefs.hpp>
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "WorldFiles.hpp"
 
 const fs::path SCREENSHOTS_FOLDER {"screenshots"};

src/files/files.cpp

@@ -12,7 +12,7 @@
 #include <coders/json.hpp>
 #include <coders/toml.hpp>
 #include "../data/dynamic.hpp"
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 namespace fs = std::filesystem;
 

src/frontend/LevelFrontend.cpp

@@ -9,7 +9,7 @@
 #include <graphics/render/BlocksPreview.hpp>
 #include "../logic/LevelController.hpp"
 #include "../logic/PlayerController.hpp"
-#include "../objects/Player.hpp"
+#include <objects/Player.hpp>
 #include "../voxels/Block.hpp"
 #include "../world/Level.hpp"
 

src/frontend/debug_panel.cpp

@@ -10,11 +10,11 @@
 #include <graphics/ui/elements/InputBindBox.hpp>
 #include <graphics/render/WorldRenderer.hpp>
 #include "../logic/scripting/scripting.hpp"
-#include "../objects/Player.hpp"
-#include "../objects/Entities.hpp"
-#include "../objects/EntityDef.hpp"
+#include <objects/Player.hpp>
+#include <objects/Entities.hpp>
+#include <objects/EntityDef.hpp>
 #include "../physics/Hitbox.hpp"
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunk.hpp"
 #include "../voxels/Chunks.hpp"

src/frontend/hud.cpp

@@ -25,15 +25,15 @@
 #include <graphics/ui/elements/UINode.hpp>
 #include <graphics/ui/gui_util.hpp>
 #include <graphics/ui/GUI.hpp>
-#include "../items/Inventories.hpp"
-#include "../items/Inventory.hpp"
-#include "../items/ItemDef.hpp"
+#include <items/Inventories.hpp>
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
 #include "../logic/scripting/scripting.hpp"
 #include "../maths/voxmaths.hpp"
-#include "../objects/Player.hpp"
+#include <objects/Player.hpp>
 #include "../physics/Hitbox.hpp"
 #include <typedefs.hpp>
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunk.hpp"
 #include "../voxels/Chunks.hpp"

src/frontend/hud.hpp

@@ -2,7 +2,7 @@
 #define FRONTEND_HUD_HPP_
 
 #include <typedefs.hpp>
-#include "../util/ObjectsKeeper.hpp"
+#include <util/ObjectsKeeper.hpp>
 
 #include <string>
 #include <memory>

src/frontend/locale.cpp

@@ -6,7 +6,7 @@
 #include <coders/commons.hpp>
 #include <content/ContentPack.hpp>
 #include <files/files.hpp>
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "../data/dynamic.hpp"
 #include <debug/Logger.hpp>
 

src/frontend/menu.cpp

@@ -15,7 +15,7 @@
 #include "../logic/scripting/scripting.hpp"
 #include <settings.hpp>
 #include <coders/commons.hpp>
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "../window/Window.hpp"
 
 #include <filesystem>

src/frontend/screens/LevelScreen.cpp

@@ -18,7 +18,7 @@
 #include <graphics/ui/GUI.hpp>
 #include "../../logic/LevelController.hpp"
 #include "../../logic/scripting/scripting_hud.hpp"
-#include "../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "../../physics/Hitbox.hpp"
 #include "../../voxels/Chunks.hpp"
 #include "../../window/Camera.hpp"

src/frontend/screens/Screen.hpp

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_SCREENS_SCREEN_HPP_
 #define FRONTEND_SCREENS_SCREEN_HPP_
 
-#include "../../util/ObjectsKeeper.hpp"
+#include <util/ObjectsKeeper.hpp>
 
 class Engine;
 class Batch2D;

src/graphics/render/ChunksRenderer.hpp

@@ -9,7 +9,7 @@
 
 #include "../../voxels/Block.hpp"
 #include "../../voxels/ChunksStorage.hpp"
-#include "../../util/ThreadPool.hpp"
+#include <util/ThreadPool.hpp>
 
 class Mesh;
 class Chunk;

src/graphics/render/WorldRenderer.cpp

@@ -12,15 +12,15 @@
 #include <content/Content.hpp>
 #include <engine.hpp>
 #include "../../frontend/LevelFrontend.hpp"
-#include "../../items/Inventory.hpp"
-#include "../../items/ItemDef.hpp"
-#include "../../items/ItemStack.hpp"
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
+#include <items/ItemStack.hpp>
 #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 <objects/Entities.hpp>
+#include <objects/Player.hpp>
 #include <settings.hpp>
 #include "../../voxels/Block.hpp"
 #include "../../voxels/Chunk.hpp"

src/graphics/ui/elements/InputBindBox.cpp

@@ -3,7 +3,7 @@
 #include "Label.hpp"
 #include <graphics/core/DrawContext.hpp>
 #include <graphics/core/Batch2D.hpp>
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 using namespace gui;
 

src/graphics/ui/elements/InventoryView.cpp

@@ -4,14 +4,14 @@
 #include <content/Content.hpp>
 #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 <items/Inventories.hpp>
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
+#include <items/ItemStack.hpp>
 #include "../../../logic/scripting/scripting.hpp"
 #include "../../../maths/voxmaths.hpp"
-#include "../../../objects/Player.hpp"
-#include "../../../util/stringutil.hpp"
+#include <objects/Player.hpp>
+#include <util/stringutil.hpp>
 #include "../../../voxels/Block.hpp"
 #include "../../../window/Events.hpp"
 #include "../../../window/input.hpp"

src/graphics/ui/elements/Label.cpp

@@ -5,7 +5,7 @@
 #include <graphics/core/Batch2D.hpp>
 #include <graphics/core/Font.hpp>
 #include <assets/Assets.hpp>
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 using namespace gui;
 

src/graphics/ui/elements/Plotter.cpp

@@ -4,7 +4,7 @@
 #include <graphics/core/Font.hpp>
 #include <graphics/core/DrawContext.hpp>
 #include <assets/Assets.hpp>
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 using namespace gui;
 

src/graphics/ui/elements/TextBox.cpp

@@ -8,7 +8,7 @@
 #include <graphics/core/Batch2D.hpp>
 #include <graphics/core/Font.hpp>
 #include <assets/Assets.hpp>
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "../../../window/Events.hpp"
 #include "../../../window/Window.hpp"
 

src/graphics/ui/gui_util.cpp

@@ -7,7 +7,7 @@
 
 #include "../../logic/scripting/scripting.hpp"
 #include "../../frontend/locale.hpp"
-#include "../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include <delegates.hpp>
 
 #include <glm/glm.hpp>

src/graphics/ui/gui_xml.cpp

@@ -12,10 +12,10 @@
 
 #include "../../frontend/menu.hpp"
 #include "../../frontend/locale.hpp"
-#include "../../items/Inventory.hpp"
+#include <items/Inventory.hpp>
 #include "../../logic/scripting/scripting.hpp"
 #include "../../maths/voxmaths.hpp"
-#include "../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "../../window/Events.hpp"
 
 #include <stdexcept>

src/items/ItemDef.cpp

@@ -1,6 +1,6 @@
 #include "ItemDef.hpp"
 
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 ItemDef::ItemDef(const std::string& name) : name(name) {
     caption = util::id_to_caption(name);

src/lighting/Lighting.cpp

@@ -7,7 +7,7 @@
 #include "../voxels/voxel.hpp"
 #include "../voxels/Block.hpp"
 #include <constants.hpp>
-#include "../util/timeutil.hpp"
+#include <util/timeutil.hpp>
 
 #include <memory>
 

src/lighting/Lightmap.cpp

@@ -1,6 +1,6 @@
 #include "Lightmap.hpp"
 
-#include "../util/data_io.hpp"
+#include <util/data_io.hpp>
 
 #include <assert.h>
 

src/logic/BlocksController.cpp

@@ -1,11 +1,11 @@
 #include "BlocksController.hpp"
 
 #include <content/Content.hpp>
-#include "../items/Inventories.hpp"
-#include "../items/Inventory.hpp"
+#include <items/Inventories.hpp>
+#include <items/Inventory.hpp>
 #include "../lighting/Lighting.hpp"
 #include "../maths/fastmaths.hpp"
-#include "../util/timeutil.hpp"
+#include <util/timeutil.hpp>
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunk.hpp"
 #include "../voxels/Chunks.hpp"

src/logic/BlocksController.hpp

@@ -6,7 +6,7 @@
 
 #include "../maths/fastmaths.hpp"
 #include <typedefs.hpp>
-#include "../util/Clock.hpp"
+#include <util/Clock.hpp>
 #include "../voxels/voxel.hpp"
 
 class Player;

src/logic/ChunksController.cpp

@@ -10,7 +10,7 @@
 #include <graphics/core/Mesh.hpp>
 #include "../lighting/Lighting.hpp"
 #include "../maths/voxmaths.hpp"
-#include "../util/timeutil.hpp"
+#include <util/timeutil.hpp>
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunk.hpp"
 #include "../voxels/Chunks.hpp"

src/logic/CommandsInterpreter.cpp

@@ -4,7 +4,7 @@
 #include <utility>
 
 #include <coders/commons.hpp>
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 using namespace cmd;
 

src/logic/EngineController.cpp

@@ -17,7 +17,7 @@
 #include <graphics/ui/elements/Menu.hpp>
 #include <graphics/ui/gui_util.hpp>
 #include "../interfaces/Task.hpp"
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "../world/Level.hpp"
 #include "../world/World.hpp"
 #include "LevelController.hpp"

src/logic/LevelController.cpp

@@ -5,7 +5,7 @@
 #include <debug/Logger.hpp>
 #include <files/WorldFiles.hpp>
 #include "../interfaces/Object.hpp"
-#include "../objects/Entities.hpp"
+#include <objects/Entities.hpp>
 #include "../physics/Hitbox.hpp"
 #include <settings.hpp>
 #include "../world/Level.hpp"

src/logic/PlayerController.cpp

@@ -6,12 +6,12 @@
 
 #include <content/Content.hpp>
 #include <core_defs.hpp>
-#include "../items/Inventory.hpp"
-#include "../items/ItemDef.hpp"
-#include "../items/ItemStack.hpp"
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
+#include <items/ItemStack.hpp>
 #include "../lighting/Lighting.hpp"
-#include "../objects/Entities.hpp"
-#include "../objects/Player.hpp"
+#include <objects/Entities.hpp>
+#include <objects/Player.hpp>
 #include "../physics/Hitbox.hpp"
 #include "../physics/PhysicsSolver.hpp"
 #include <settings.hpp>

src/logic/PlayerController.hpp

@@ -5,7 +5,7 @@
 #include <memory>
 #include <vector>
 
-#include "../objects/Player.hpp"
+#include <objects/Player.hpp>
 
 class Camera;
 class Level;

src/logic/scripting/lua/lib__rigidbody.cpp

@@ -1,4 +1,4 @@
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "libentity.hpp"
 
 static int l_get_vel(lua::State* L) {

src/logic/scripting/lua/lib__skeleton.cpp

@@ -1,4 +1,4 @@
-#include "../../../objects/rigging.hpp"
+#include <objects/rigging.hpp>
 #include "libentity.hpp"
 
 static int index_range_check(

src/logic/scripting/lua/libentity.cpp

@@ -2,10 +2,10 @@
 
 #include <content/Content.hpp>
 #include <engine.hpp>
-#include "../../../objects/Entities.hpp"
-#include "../../../objects/EntityDef.hpp"
-#include "../../../objects/Player.hpp"
-#include "../../../objects/rigging.hpp"
+#include <objects/Entities.hpp>
+#include <objects/EntityDef.hpp>
+#include <objects/Player.hpp>
+#include <objects/rigging.hpp>
 #include "../../../physics/Hitbox.hpp"
 #include "../../../voxels/Chunks.hpp"
 #include "../../../window/Camera.hpp"

src/logic/scripting/lua/libentity.hpp

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

src/logic/scripting/lua/libfile.cpp

@@ -5,7 +5,7 @@
 #include <engine.hpp>
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "api_lua.hpp"
 
 namespace fs = std::filesystem;

src/logic/scripting/lua/libgui.cpp

@@ -12,8 +12,8 @@
 #include <graphics/ui/elements/TrackBar.hpp>
 #include <graphics/ui/elements/UINode.hpp>
 #include <graphics/ui/gui_util.hpp>
-#include "../../../items/Inventories.hpp"
-#include "../../../util/stringutil.hpp"
+#include <items/Inventories.hpp>
+#include <util/stringutil.hpp>
 #include "../../../world/Level.hpp"
 #include "api_lua.hpp"
 

src/logic/scripting/lua/libhud.cpp

@@ -7,10 +7,10 @@
 #include "../../../frontend/UiDocument.hpp"
 #include "../../../frontend/hud.hpp"
 #include <graphics/ui/elements/InventoryView.hpp>
-#include "../../../items/Inventories.hpp"
+#include <items/Inventories.hpp>
 #include "../../../logic/BlocksController.hpp"
-#include "../../../objects/Player.hpp"
-#include "../../../util/stringutil.hpp"
+#include <objects/Player.hpp>
+#include <util/stringutil.hpp>
 #include "../../../voxels/Block.hpp"
 #include "../../../voxels/Chunks.hpp"
 #include "../../../voxels/voxel.hpp"

src/logic/scripting/lua/libinput.cpp

@@ -2,7 +2,7 @@
 #include "../../../frontend/hud.hpp"
 #include "../../../frontend/screens/Screen.hpp"
 #include <graphics/ui/GUI.hpp>
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "../../../window/Events.hpp"
 #include "../../../window/input.hpp"
 #include "api_lua.hpp"

src/logic/scripting/lua/libinventory.cpp

@@ -1,6 +1,6 @@
 #include <content/Content.hpp>
-#include "../../../items/Inventories.hpp"
-#include "../../../items/ItemStack.hpp"
+#include <items/Inventories.hpp>
+#include <items/ItemStack.hpp>
 #include "../../../logic/BlocksController.hpp"
 #include "../../../world/Level.hpp"
 #include "api_lua.hpp"

src/logic/scripting/lua/libitem.cpp

@@ -1,5 +1,5 @@
 #include <content/Content.hpp>
-#include "../../../items/ItemDef.hpp"
+#include <items/ItemDef.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;

src/logic/scripting/lua/libplayer.cpp

@@ -1,9 +1,9 @@
 #include <algorithm>
 #include <glm/glm.hpp>
 
-#include "../../../items/Inventory.hpp"
-#include "../../../objects/Entities.hpp"
-#include "../../../objects/Player.hpp"
+#include <items/Inventory.hpp>
+#include <objects/Entities.hpp>
+#include <objects/Player.hpp>
 #include "../../../physics/Hitbox.hpp"
 #include "../../../window/Camera.hpp"
 #include "../../../world/Level.hpp"

src/logic/scripting/lua/lua_engine.cpp

@@ -4,7 +4,7 @@
 #include <iostream>
 
 #include <debug/Logger.hpp>
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "api_lua.hpp"
 #include "lua_custom_types.hpp"
 

src/logic/scripting/lua/lua_util.cpp

@@ -3,7 +3,7 @@
 #include <iomanip>
 #include <iostream>
 
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 using namespace lua;
 

src/logic/scripting/scripting.cpp

@@ -10,15 +10,15 @@
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>
 #include "../../frontend/UiDocument.hpp"
-#include "../../items/Inventory.hpp"
-#include "../../items/ItemDef.hpp"
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
 #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 <objects/Entities.hpp>
+#include <objects/EntityDef.hpp>
+#include <objects/Player.hpp>
+#include <util/stringutil.hpp>
+#include <util/timeutil.hpp>
 #include "../../voxels/Block.hpp"
 #include "../../world/Level.hpp"
 #include "lua/lua_engine.hpp"

src/logic/scripting/scripting_functional.cpp

@@ -2,7 +2,7 @@
 
 #include <coders/json.hpp>
 #include <debug/Logger.hpp>
-#include "../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "lua/lua_engine.hpp"
 
 using namespace scripting;

src/logic/scripting/scripting_hud.cpp

@@ -4,7 +4,7 @@
 #include <engine.hpp>
 #include <files/files.hpp>
 #include "../../frontend/hud.hpp"
-#include "../../objects/Player.hpp"
+#include <objects/Player.hpp>
 #include "lua/api_lua.hpp"
 #include "lua/lua_engine.hpp"
 #include "scripting.hpp"

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"

src/objects/Entities.hpp

@@ -9,7 +9,7 @@
 #include "../data/dynamic.hpp"
 #include "../physics/Hitbox.hpp"
 #include <typedefs.hpp>
-#include "../util/Clock.hpp"
+#include <util/Clock.hpp>
 #define GLM_ENABLE_EXPERIMENTAL
 #include <entt/entity/registry.hpp>
 #include <glm/gtx/norm.hpp>

src/objects/Player.cpp

@@ -5,9 +5,9 @@
 #include <utility>
 
 #include <content/ContentLUT.hpp>
-#include "../items/Inventory.hpp"
-#include "../objects/Entities.hpp"
-#include "../objects/rigging.hpp"
+#include <items/Inventory.hpp>
+#include "Entities.hpp"
+#include "rigging.hpp"
 #include "../physics/Hitbox.hpp"
 #include "../physics/PhysicsSolver.hpp"
 #include "../voxels/Chunks.hpp"

src/util/listutil.cpp

@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "../util/stringutil.hpp"
+#include "stringutil.hpp"
 
 std::string util::to_string(const std::vector<std::string>& vec) {
     std::stringstream ss;

src/util/platform.cpp

@@ -11,7 +11,7 @@
 #ifdef _WIN32
 #include <Windows.h>
 
-#include "./stringutil.hpp"
+#include "stringutil.hpp"
 
 void platform::configure_encoding() {
     // set utf-8 encoding to console output

src/voxel_engine.cpp

@@ -2,8 +2,8 @@
 #include <settings.hpp>
 #include <files/settings_io.hpp>
 #include <files/engine_paths.hpp>
-#include "util/platform.hpp"
-#include "util/command_line.hpp"
+#include <util/platform.hpp>
+#include <util/command_line.hpp>
 #include <debug/Logger.hpp>
 
 #include <stdexcept>

src/voxels/Block.cpp

@@ -3,7 +3,7 @@
 #include <utility>
 
 #include <core_defs.hpp>
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 std::string to_string(BlockModel model) {
     switch (model) {

src/voxels/Chunk.cpp

@@ -3,7 +3,7 @@
 #include <utility>
 
 #include <content/ContentLUT.hpp>
-#include "../items/Inventory.hpp"
+#include <items/Inventory.hpp>
 #include "../lighting/Lightmap.hpp"
 #include "voxel.hpp"
 

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 <objects/Entities.hpp>
 #include "../world/Level.hpp"
 #include "../world/LevelEvents.hpp"
 #include "Block.hpp"

src/voxels/ChunksStorage.cpp

@@ -3,10 +3,10 @@
 #include <content/Content.hpp>
 #include <debug/Logger.hpp>
 #include <files/WorldFiles.hpp>
-#include "../items/Inventories.hpp"
+#include <items/Inventories.hpp>
 #include "../lighting/Lightmap.hpp"
 #include "../maths/voxmaths.hpp"
-#include "../objects/Entities.hpp"
+#include <objects/Entities.hpp>
 #include <typedefs.hpp>
 #include "../world/Level.hpp"
 #include "../world/World.hpp"

src/window/Events.cpp

@@ -5,7 +5,7 @@
 #include <string.h>
 
 #include <debug/Logger.hpp>
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "Window.hpp"
 
 static debug::Logger logger("events");

src/window/Window.cpp

@@ -11,7 +11,7 @@
 #include <graphics/core/ImageData.hpp>
 #include <graphics/core/Texture.hpp>
 #include <settings.hpp>
-#include "../util/ObjectsKeeper.hpp"
+#include <util/ObjectsKeeper.hpp>
 #include "Events.hpp"
 
 static debug::Logger logger("window");

src/window/input.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "../util/RunnablesList.hpp"
+#include <util/RunnablesList.hpp>
 
 /// @brief Represents glfw3 keycode values.
 enum class keycode : int {

src/world/Level.cpp

@@ -2,11 +2,11 @@
 
 #include <content/Content.hpp>
 #include "../data/dynamic_util.hpp"
-#include "../items/Inventories.hpp"
-#include "../items/Inventory.hpp"
+#include <items/Inventories.hpp>
+#include <items/Inventory.hpp>
 #include "../lighting/Lighting.hpp"
-#include "../objects/Entities.hpp"
-#include "../objects/Player.hpp"
+#include <objects/Entities.hpp>
+#include <objects/Player.hpp>
 #include "../physics/Hitbox.hpp"
 #include "../physics/PhysicsSolver.hpp"
 #include <settings.hpp>

src/world/World.cpp

@@ -8,9 +8,9 @@
 #include <content/ContentLUT.hpp>
 #include <debug/Logger.hpp>
 #include <files/WorldFiles.hpp>
-#include "../items/Inventories.hpp"
-#include "../objects/Entities.hpp"
-#include "../objects/Player.hpp"
+#include <items/Inventories.hpp>
+#include <objects/Entities.hpp>
+#include <objects/Player.hpp>
 #include <settings.hpp>
 #include "../voxels/Chunk.hpp"
 #include "../voxels/Chunks.hpp"

src/world/World.hpp

@@ -10,7 +10,7 @@
 #include "../data/dynamic.hpp"
 #include "../interfaces/Serializable.hpp"
 #include <typedefs.hpp>
-#include "../util/timeutil.hpp"
+#include <util/timeutil.hpp>
 
 class Content;
 class WorldFiles;