content/

src/assets/AssetsLoader.cpp

@@ -6,8 +6,8 @@
 
 #include <coders/imageio.hpp>
 #include <constants.hpp>
-#include "../content/Content.hpp"
-#include "../content/ContentPack.hpp"
+#include <content/Content.hpp>
+#include <content/ContentPack.hpp>
 #include "../data/dynamic.hpp"
 #include "../debug/Logger.hpp"
 #include "../files/engine_paths.hpp"

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 <content/Content.hpp>
+#include <content/ContentBuilder.hpp>
 #include "files/files.hpp"
 #include "files/engine_paths.hpp"
 #include "window/Window.hpp"

src/engine.cpp

@@ -9,9 +9,9 @@
 #include <coders/imageio.hpp>
 #include <coders/json.hpp>
 #include <coders/toml.hpp>
-#include "content/Content.hpp"
-#include "content/ContentBuilder.hpp"
-#include "content/ContentLoader.hpp"
+#include <content/Content.hpp>
+#include <content/ContentBuilder.hpp>
+#include <content/ContentLoader.hpp>
 #include <core_defs.hpp>
 #include "files/files.hpp"
 #include "files/settings_io.hpp"

src/engine.hpp

@@ -5,9 +5,9 @@
 #include <typedefs.hpp>
 
 #include <assets/Assets.hpp>
-#include "content/content_fwd.hpp"
-#include "content/ContentPack.hpp"
-#include "content/PacksManager.hpp"
+#include <content/content_fwd.hpp>
+#include <content/ContentPack.hpp>
+#include <content/PacksManager.hpp>
 #include "files/engine_paths.hpp"
 #include "util/ObjectsKeeper.hpp"
 

src/files/WorldConverter.cpp

@@ -5,7 +5,7 @@
 #include <stdexcept>
 #include <utility>
 
-#include "../content/ContentLUT.hpp"
+#include <content/ContentLUT.hpp>
 #include "../data/dynamic.hpp"
 #include "../debug/Logger.hpp"
 #include "../files/files.hpp"

src/files/WorldFiles.cpp

@@ -11,7 +11,7 @@
 #include <coders/byte_utils.hpp>
 #include <coders/json.hpp>
 #include <constants.hpp>
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include <core_defs.hpp>
 #include "../data/dynamic.hpp"
 #include "../debug/Logger.hpp"

src/files/WorldFiles.hpp

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "../content/ContentPack.hpp"
+#include <content/ContentPack.hpp>
 #include <typedefs.hpp>
 #include "../voxels/Chunk.hpp"
 #include "WorldRegions.hpp"

src/files/engine_paths.hpp

@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "../content/ContentPack.hpp"
+#include <content/ContentPack.hpp>
 
 namespace fs = std::filesystem;
 

src/frontend/ContentGfxCache.cpp

@@ -3,8 +3,8 @@
 #include "UiDocument.hpp"
 
 #include <assets/Assets.hpp>
-#include "../content/Content.hpp"
-#include "../content/ContentPack.hpp"
+#include <content/Content.hpp>
+#include <content/ContentPack.hpp>
 #include <core_defs.hpp>
 #include "../graphics/core/Atlas.hpp"
 #include "../maths/UVRegion.hpp"

src/frontend/LevelFrontend.cpp

@@ -4,7 +4,7 @@
 
 #include <assets/Assets.hpp>
 #include "../audio/audio.hpp"
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../graphics/core/Atlas.hpp"
 #include "../graphics/render/BlocksPreview.hpp"
 #include "../logic/LevelController.hpp"

src/frontend/debug_panel.cpp

@@ -2,7 +2,7 @@
 #include <delegates.hpp>
 #include <engine.hpp>
 #include <settings.hpp>
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../graphics/core/Mesh.hpp"
 #include "../graphics/ui/elements/CheckBox.hpp"
 #include "../graphics/ui/elements/TextBox.hpp"

src/frontend/hud.cpp

@@ -5,7 +5,7 @@
 #include "UiDocument.hpp"
 
 #include <assets/Assets.hpp>
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include <core_defs.hpp>
 #include <delegates.hpp>
 #include <engine.hpp>

src/frontend/locale.cpp

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

src/frontend/screens/LevelScreen.cpp

@@ -8,7 +8,7 @@
 #include "../../debug/Logger.hpp"
 #include <engine.hpp>
 #include "../../files/files.hpp"
-#include "../../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../../graphics/core/DrawContext.hpp"
 #include "../../graphics/core/ImageData.hpp"
 #include "../../graphics/core/PostProcessing.hpp"

src/graphics/render/BlocksPreview.cpp

@@ -2,7 +2,7 @@
 
 #include <assets/Assets.hpp>
 #include <constants.hpp>
-#include "../../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../../frontend/ContentGfxCache.hpp"
 #include "../../voxels/Block.hpp"
 #include "../../window/Camera.hpp"

src/graphics/render/BlocksRenderer.cpp

@@ -3,7 +3,7 @@
 #include "../core/Mesh.hpp"
 #include "../../maths/UVRegion.hpp"
 #include <constants.hpp>
-#include "../../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../../voxels/Block.hpp"
 #include "../../voxels/Chunk.hpp"
 #include "../../voxels/VoxelsVolume.hpp"

src/graphics/render/WorldRenderer.cpp

@@ -9,7 +9,7 @@
 #include <memory>
 
 #include <assets/Assets.hpp>
-#include "../../content/Content.hpp"
+#include <content/Content.hpp>
 #include <engine.hpp>
 #include "../../frontend/LevelFrontend.hpp"
 #include "../../items/Inventory.hpp"

src/graphics/ui/elements/InventoryView.cpp

@@ -1,7 +1,7 @@
 #include "InventoryView.hpp"
 
 #include <assets/Assets.hpp>
-#include "../../../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../../../frontend/LevelFrontend.hpp"
 #include "../../../frontend/locale.hpp"
 #include "../../../items/Inventories.hpp"

src/items/Inventory.cpp

@@ -1,6 +1,6 @@
 #include "Inventory.hpp"
 
-#include "../content/ContentLUT.hpp"
+#include <content/ContentLUT.hpp>
 #include "../data/dynamic.hpp"
 
 Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) {

src/items/ItemStack.cpp

@@ -1,6 +1,6 @@
 #include "ItemStack.hpp"
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "ItemDef.hpp"
 
 ItemStack::ItemStack() : item(ITEM_EMPTY), count(0) {

src/lighting/LightSolver.cpp

@@ -2,7 +2,7 @@
 #include <assert.h>
 #include "LightSolver.hpp"
 #include "Lightmap.hpp"
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../voxels/Chunks.hpp"
 #include "../voxels/Chunk.hpp"
 #include "../voxels/voxel.hpp"

src/lighting/Lighting.cpp

@@ -1,7 +1,7 @@
 #include "Lighting.hpp"
 #include "LightSolver.hpp"
 #include "Lightmap.hpp"
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../voxels/Chunks.hpp"
 #include "../voxels/Chunk.hpp"
 #include "../voxels/voxel.hpp"

src/logic/BlocksController.cpp

@@ -1,6 +1,6 @@
 #include "BlocksController.hpp"
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../items/Inventories.hpp"
 #include "../items/Inventory.hpp"
 #include "../lighting/Lighting.hpp"

src/logic/ChunksController.cpp

@@ -5,7 +5,7 @@
 #include <iostream>
 #include <memory>
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../files/WorldFiles.hpp"
 #include "../graphics/core/Mesh.hpp"
 #include "../lighting/Lighting.hpp"

src/logic/EngineController.cpp

@@ -5,7 +5,7 @@
 #include <memory>
 
 #include <coders/commons.hpp>
-#include "../content/ContentLUT.hpp"
+#include <content/ContentLUT.hpp>
 #include "../debug/Logger.hpp"
 #include <engine.hpp>
 #include "../files/WorldConverter.hpp"

src/logic/PlayerController.cpp

@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include <core_defs.hpp>
 #include "../items/Inventory.hpp"
 #include "../items/ItemDef.hpp"

src/logic/scripting/lua/libblock.cpp

@@ -1,4 +1,4 @@
-#include "../../../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../../../lighting/Lighting.hpp"
 #include "../../../logic/BlocksController.hpp"
 #include "../../../logic/LevelController.hpp"

src/logic/scripting/lua/libcamera.cpp

@@ -1,6 +1,6 @@
 #include <glm/ext.hpp>
 
-#include "../../../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../../../window/Camera.hpp"
 #include "../../../world/Level.hpp"
 #include "api_lua.hpp"

src/logic/scripting/lua/libentity.cpp

@@ -1,6 +1,6 @@
 #include "libentity.hpp"
 
-#include "../../../content/Content.hpp"
+#include <content/Content.hpp>
 #include <engine.hpp>
 #include "../../../objects/Entities.hpp"
 #include "../../../objects/EntityDef.hpp"

src/logic/scripting/lua/libhud.cpp

@@ -2,7 +2,7 @@
 #include <iostream>
 
 #include <assets/Assets.hpp>
-#include "../../../content/Content.hpp"
+#include <content/Content.hpp>
 #include <engine.hpp>
 #include "../../../frontend/UiDocument.hpp"
 #include "../../../frontend/hud.hpp"

src/logic/scripting/lua/libinventory.cpp

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

src/logic/scripting/lua/libitem.cpp

@@ -1,4 +1,4 @@
-#include "../../../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../../../items/ItemDef.hpp"
 #include "api_lua.hpp"
 

src/logic/scripting/lua/libpack.cpp

@@ -4,7 +4,7 @@
 #include <string>
 
 #include <assets/AssetsLoader.hpp>
-#include "../../../content/Content.hpp"
+#include <content/Content.hpp>
 #include <engine.hpp>
 #include "../../../files/WorldFiles.hpp"
 #include "../../../files/engine_paths.hpp"

src/logic/scripting/scripting.cpp

@@ -3,8 +3,8 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "../../content/Content.hpp"
-#include "../../content/ContentPack.hpp"
+#include <content/Content.hpp>
+#include <content/ContentPack.hpp>
 #include "../../debug/Logger.hpp"
 #include <engine.hpp>
 #include "../../files/engine_paths.hpp"

src/objects/Entities.cpp

@@ -4,7 +4,7 @@
 #include <sstream>
 
 #include <assets/Assets.hpp>
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../data/dynamic_util.hpp"
 #include "../debug/Logger.hpp"
 #include <engine.hpp>

src/objects/Player.cpp

@@ -4,7 +4,7 @@
 #include <glm/glm.hpp>
 #include <utility>
 
-#include "../content/ContentLUT.hpp"
+#include <content/ContentLUT.hpp>
 #include "../items/Inventory.hpp"
 #include "../objects/Entities.hpp"
 #include "../objects/rigging.hpp"

src/voxels/Chunk.cpp

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

src/voxels/Chunks.cpp

@@ -8,7 +8,7 @@
 
 #include <coders/byte_utils.hpp>
 #include <coders/json.hpp>
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../files/WorldFiles.hpp"
 #include "../graphics/core/Mesh.hpp"
 #include "../lighting/Lightmap.hpp"

src/voxels/ChunksStorage.cpp

@@ -1,6 +1,6 @@
 #include "ChunksStorage.hpp"
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../debug/Logger.hpp"
 #include "../files/WorldFiles.hpp"
 #include "../items/Inventories.hpp"

src/voxels/DefaultWorldGenerator.cpp

@@ -14,7 +14,7 @@
 #include <stdexcept>
 #include <vector>
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include <core_defs.hpp>
 #include "../maths/FastNoiseLite.h"
 #include "../maths/util.hpp"

src/voxels/FlatWorldGenerator.cpp

@@ -1,6 +1,6 @@
 #include "FlatWorldGenerator.hpp"
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include <core_defs.hpp>
 #include "Chunk.hpp"
 #include "voxel.hpp"

src/voxels/WorldGenerator.cpp

@@ -1,6 +1,6 @@
 #include "WorldGenerator.hpp"
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "Block.hpp"
 #include "Chunk.hpp"
 #include "voxel.hpp"

src/world/Level.cpp

@@ -1,6 +1,6 @@
 #include "Level.hpp"
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../data/dynamic_util.hpp"
 #include "../items/Inventories.hpp"
 #include "../items/Inventory.hpp"

src/world/World.cpp

@@ -4,8 +4,8 @@
 #include <memory>
 #include <utility>
 
-#include "../content/Content.hpp"
-#include "../content/ContentLUT.hpp"
+#include <content/Content.hpp>
+#include <content/ContentLUT.hpp>
 #include "../debug/Logger.hpp"
 #include "../files/WorldFiles.hpp"
 #include "../items/Inventories.hpp"

src/world/World.hpp

@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "../content/ContentPack.hpp"
+#include <content/ContentPack.hpp>
 #include "../data/dynamic.hpp"
 #include "../interfaces/Serializable.hpp"
 #include <typedefs.hpp>

src/world/WorldGenerators.cpp

@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "../voxels/FlatWorldGenerator.hpp"
 #include "../voxels/WorldGenerator.hpp"