Root includes

src/assets/AssetsLoader.cpp

@@ -5,7 +5,7 @@
 #include <utility>
 
 #include "../coders/imageio.hpp"
-#include "../constants.hpp"
+#include <constants.hpp>
 #include "../content/Content.hpp"
 #include "../content/ContentPack.hpp"
 #include "../data/dynamic.hpp"

src/assets/AssetsLoader.hpp

@@ -9,9 +9,9 @@
 #include <string>
 #include <utility>
 
-#include "../delegates.hpp"
+#include <delegates.hpp>
 #include "../interfaces/Task.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "Assets.hpp"
 
 namespace dynamic {

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 <constants.hpp>
 #include "../data/dynamic.hpp"
 #include "../files/engine_paths.hpp"
 #include "../files/files.hpp"

src/audio/AL/ALAudio.hpp

@@ -7,7 +7,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../audio.hpp"
 
 #ifdef __APPLE__

src/audio/AL/alutil.hpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <type_traits>
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #ifdef __APPLE__
 #include <OpenAL/al.h>

src/audio/audio.hpp

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

src/coders/GLSLExtension.cpp

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

src/coders/byte_utils.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 /* byteorder: little-endian */
 class ByteBuilder {

src/coders/commons.hpp

@@ -5,7 +5,7 @@
 #include <string>
 
 #include "../data/dynamic.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 inline int is_box(int c) {
     switch (c) {

src/coders/gzip.hpp

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace gzip {
     const unsigned char MAGIC[] = "\x1F\x8B";

src/coders/json.hpp

@@ -4,7 +4,7 @@
 #include <string>
 
 #include "../data/dynamic.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "binary_json.hpp"
 
 namespace json {

src/coders/ogg.cpp

@@ -7,7 +7,7 @@
 
 #include "../audio/audio.hpp"
 #include "../debug/Logger.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 static debug::Logger logger("ogg");
 

src/coders/rle.hpp

@@ -1,7 +1,7 @@
 #ifndef CODERS_RLE_HPP_
 #define CODERS_RLE_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace rle {
     size_t encode(const ubyte* src, size_t length, ubyte* dst);

src/constants.hpp

@@ -1,7 +1,7 @@
 #ifndef CONSTANTS_HPP_
 #define CONSTANTS_HPP_
 
-#include "typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <limits>
 #include <string>

src/content/ContentLUT.cpp

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

src/content/ContentLUT.hpp

@@ -6,9 +6,9 @@
 #include <utility>
 #include <vector>
 
-#include "../constants.hpp"
+#include <constants.hpp>
 #include "../data/dynamic.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "Content.hpp"
 
 namespace fs = std::filesystem;

src/content/ContentLoader.cpp

@@ -7,14 +7,14 @@
 #include <string>
 
 #include "../coders/json.hpp"
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
 #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 <typedefs.hpp>
 #include "../util/listutil.hpp"
 #include "../util/stringutil.hpp"
 #include "../voxels/Block.hpp"

src/content/ContentPack.hpp

@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class EnginePaths;
 

src/content/content_fwd.hpp

@@ -1,7 +1,7 @@
 #ifndef CONTENT_CONTENT_FWD_HPP_
 #define CONTENT_CONTENT_FWD_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Content;
 class ContentPackRuntime;

src/data/dynamic_fwd.hpp

@@ -6,7 +6,7 @@
 #include <string>
 #include <variant>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace dynamic {
     class Map;

src/data/setting.hpp

@@ -6,8 +6,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../delegates.hpp"
+#include <delegates.hpp>
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 enum class setting_format { simple, percent };
 

src/engine.cpp

@@ -12,7 +12,7 @@
 #include "content/Content.hpp"
 #include "content/ContentBuilder.hpp"
 #include "content/ContentLoader.hpp"
-#include "core_defs.hpp"
+#include <core_defs.hpp>
 #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 <settings.hpp>
 
 #include <iostream>
 #include <assert.h>

src/engine.hpp

@@ -1,8 +1,8 @@
 #ifndef ENGINE_HPP_
 #define ENGINE_HPP_
 
-#include "delegates.hpp"
+#include <delegates.hpp>
-#include "typedefs.hpp"
+#include <typedefs.hpp>
 
 #include "assets/Assets.hpp"
 #include "content/content_fwd.hpp"

src/files/WorldConverter.hpp

@@ -5,9 +5,9 @@
 #include <memory>
 #include <queue>
 
-#include "../delegates.hpp"
+#include <delegates.hpp>
 #include "../interfaces/Task.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace fs = std::filesystem;
 

src/files/WorldFiles.cpp

@@ -10,9 +10,9 @@
 
 #include "../coders/byte_utils.hpp"
 #include "../coders/json.hpp"
-#include "../constants.hpp"
+#include <constants.hpp>
 #include "../content/Content.hpp"
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
 #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 <settings.hpp>
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/data_io.hpp"
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunk.hpp"

src/files/WorldFiles.hpp

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

src/files/WorldRegions.hpp

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

src/files/engine_paths.cpp

@@ -6,7 +6,7 @@
 #include <stack>
 #include <utility>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/stringutil.hpp"
 #include "WorldFiles.hpp"
 

src/files/files.hpp

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

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 <settings.hpp>
 #include "../window/Events.hpp"
 #include "../window/input.hpp"
 

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 <core_defs.hpp>
 #include "../graphics/core/Atlas.hpp"
 #include "../maths/UVRegion.hpp"
 #include "../voxels/Block.hpp"

src/frontend/ContentGfxCache.hpp

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_
 #define FRONTEND_BLOCKS_GFX_CACHE_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <memory>
 

src/frontend/UiDocument.hpp

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_UI_DOCUMENT_HPP_
 #define FRONTEND_UI_DOCUMENT_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <string>
 #include <memory>

src/frontend/debug_panel.cpp

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

src/frontend/hud.cpp

@@ -6,9 +6,9 @@
 
 #include "../assets/Assets.hpp"
 #include "../content/Content.hpp"
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
-#include "../delegates.hpp"
+#include <delegates.hpp>
-#include "../engine.hpp"
+#include <engine.hpp>
 #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 <typedefs.hpp>
 #include "../util/stringutil.hpp"
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunk.hpp"

src/frontend/hud.hpp

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

src/frontend/menu.cpp

@@ -4,8 +4,8 @@
 #include "UiDocument.hpp"
 #include "screens/MenuScreen.hpp"
 
-#include "../delegates.hpp"
+#include <delegates.hpp>
-#include "../engine.hpp"
+#include <engine.hpp>
 #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 <settings.hpp>
 #include "../coders/commons.hpp"
 #include "../util/stringutil.hpp"
 #include "../window/Window.hpp"

src/frontend/screens/LevelScreen.cpp

@@ -1,12 +1,12 @@
 #include "LevelScreen.hpp"
 
-#include "../../core_defs.hpp"
+#include <core_defs.hpp>
 #include "../hud.hpp"
 #include "../LevelFrontend.hpp"
 #include "../../audio/audio.hpp"
 #include "../../coders/imageio.hpp"
 #include "../../debug/Logger.hpp"
-#include "../../engine.hpp"
+#include <engine.hpp>
 #include "../../files/files.hpp"
 #include "../../content/Content.hpp"
 #include "../../graphics/core/DrawContext.hpp"

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 <engine.hpp>
 
 MenuScreen::MenuScreen(Engine* engine) : Screen(engine) {
     engine->resetContent();

src/frontend/screens/Screen.cpp

@@ -1,7 +1,7 @@
 #include "Screen.hpp"
 
 #include "../../graphics/core/Batch2D.hpp"
-#include "../../engine.hpp"
+#include <engine.hpp>
 
 Screen::Screen(Engine* engine)
   : engine(engine), 

src/graphics/core/Atlas.hpp

@@ -8,7 +8,7 @@
 #include <optional>
 #include <unordered_map>
 #include "../../maths/UVRegion.hpp"
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 class ImageData;
 class Texture;

src/graphics/core/Batch3D.cpp

@@ -4,7 +4,7 @@
 #include "Texture.hpp"
 
 #include <GL/glew.h>
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../../maths/UVRegion.hpp"
 
 /// xyz, uv, rgba

src/graphics/core/Batch3D.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_BATCH3D_HPP_
 #define GRAPHICS_CORE_BATCH3D_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "commons.hpp"
 
 #include <memory>

src/graphics/core/DrawContext.hpp

@@ -3,7 +3,7 @@
 
 #include "commons.hpp"
 #include "Viewport.hpp"
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Batch2D;
 class Framebuffer;

src/graphics/core/Font.hpp

@@ -4,7 +4,7 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Texture;
 class Batch2D;

src/graphics/core/Framebuffer.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_FRAMEBUFFER_HPP_
 #define GRAPHICS_CORE_FRAMEBUFFER_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <memory>
 

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 <typedefs.hpp>
 
 #include <memory>
 

src/graphics/core/Mesh.hpp

@@ -2,7 +2,7 @@
 #define GRAPHICS_CORE_MESH_HPP_
 
 #include <stdlib.h>
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 struct vattr {
     ubyte size;

src/graphics/core/Shader.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_SHADER_HPP_
 #define GRAPHICS_CORE_SHADER_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <string>
 #include <memory>

src/graphics/core/Texture.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_TEXTURE_HPP_
 #define GRAPHICS_CORE_TEXTURE_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../../maths/UVRegion.hpp"
 #include "ImageData.hpp"
 

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 <typedefs.hpp>
 
 #include <glm/glm.hpp>
 #include <vector>

src/graphics/core/Viewport.hpp

@@ -3,7 +3,7 @@
 
 #include <glm/glm.hpp>
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Viewport {
     uint width;

src/graphics/render/BlocksPreview.cpp

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

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 <typedefs.hpp>
 
 #include <glm/glm.hpp>
 #include <memory>

src/graphics/render/BlocksRenderer.cpp

@@ -2,7 +2,7 @@
 
 #include "../core/Mesh.hpp"
 #include "../../maths/UVRegion.hpp"
-#include "../../constants.hpp"
+#include <constants.hpp>
 #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 <settings.hpp>
 
 #include <glm/glm.hpp>
 

src/graphics/render/BlocksRenderer.hpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <glm/glm.hpp>
 #include "../../voxels/voxel.hpp"
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Content;
 class Mesh;

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 <settings.hpp>
 
 #include <iostream>
 #include <glm/glm.hpp>

src/graphics/render/Skybox.hpp

@@ -4,7 +4,7 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../../maths/fastmaths.hpp"
 
 class Mesh;

src/graphics/render/WorldRenderer.cpp

@@ -10,7 +10,7 @@
 
 #include "../../assets/Assets.hpp"
 #include "../../content/Content.hpp"
-#include "../../engine.hpp"
+#include <engine.hpp>
 #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 <settings.hpp>
 #include "../../voxels/Block.hpp"
 #include "../../voxels/Chunk.hpp"
 #include "../../voxels/Chunks.hpp"

src/graphics/ui/GUI.hpp

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_GUI_GUI_HPP_
 #define FRONTEND_GUI_GUI_HPP_
 
-#include "../../delegates.hpp"
+#include <delegates.hpp>
 
 #include <queue>
 #include <memory>

src/graphics/ui/elements/InventoryView.hpp

@@ -3,8 +3,8 @@
 
 #include "UINode.hpp"
 #include "Container.hpp"
-#include "../../../typedefs.hpp"
+#include <typedefs.hpp>
-#include "../../../constants.hpp"
+#include <constants.hpp>
 
 #include <vector>
 #include <functional>

src/graphics/ui/elements/Plotter.hpp

@@ -2,7 +2,7 @@
 #define GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
 
 #include "UINode.hpp"
-#include "../../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <memory>
 #include <glm/glm.hpp>

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 <delegates.hpp>
 #include "../../../window/input.hpp"
 
 #include <glm/glm.hpp>

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 <delegates.hpp>
 
 #include <glm/glm.hpp>
 

src/graphics/ui/gui_util.hpp

@@ -2,8 +2,8 @@
 #define FRONTEND_GUI_GUI_UTIL_HPP_
 
 #include "GUI.hpp"
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
-#include "../../delegates.hpp"
+#include <delegates.hpp>
 
 #include <memory>
 #include <string>

src/interfaces/Task.hpp

@@ -1,7 +1,7 @@
 #ifndef INTERFACES_TASK_HPP_
 #define INTERFACES_TASK_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 /// @brief Task is a finite process interface.
 /// 'work' is a metric of task progress/remaining work (jobs/bytes/something other)

src/items/Inventory.hpp

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "../interfaces/Serializable.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "ItemStack.hpp"
 
 namespace dynamic {

src/items/ItemDef.hpp

@@ -4,7 +4,7 @@
 #include <glm/glm.hpp>
 #include <string>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 struct item_funcs_set {
     bool init : 1;

src/items/ItemStack.hpp

@@ -1,8 +1,8 @@
 #ifndef ITEMS_ITEM_STACK_HPP_
 #define ITEMS_ITEM_STACK_HPP_
 
-#include "../constants.hpp"
+#include <constants.hpp>
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class ContentIndices;
 

src/lighting/Lighting.cpp

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

src/lighting/Lighting.hpp

@@ -1,7 +1,7 @@
 #ifndef LIGHTING_LIGHTING_HPP_
 #define LIGHTING_LIGHTING_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Content;
 class ContentIndices;

src/lighting/Lightmap.hpp

@@ -1,8 +1,8 @@
 #ifndef LIGHTING_LIGHTMAP_HPP_
 #define LIGHTING_LIGHTMAP_HPP_
 
-#include "../constants.hpp"
+#include <constants.hpp>
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <memory>
 

src/logic/BlocksController.hpp

@@ -5,7 +5,7 @@
 #include <glm/glm.hpp>
 
 #include "../maths/fastmaths.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/Clock.hpp"
 #include "../voxels/voxel.hpp"
 

src/logic/ChunksController.hpp

@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Level;
 class Chunk;

src/logic/EngineController.cpp

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

src/logic/LevelController.cpp

@@ -7,7 +7,7 @@
 #include "../interfaces/Object.hpp"
 #include "../objects/Entities.hpp"
 #include "../physics/Hitbox.hpp"
-#include "../settings.hpp"
+#include <settings.hpp>
 #include "../world/Level.hpp"
 #include "../world/World.hpp"
 #include "scripting/scripting.hpp"

src/logic/PlayerController.cpp

@@ -5,7 +5,7 @@
 #include <cmath>
 
 #include "../content/Content.hpp"
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
 #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 <settings.hpp>
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunks.hpp"
 #include "../voxels/voxel.hpp"

src/logic/scripting/lua/libaudio.cpp

@@ -1,5 +1,5 @@
 #include "../../../audio/audio.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "api_lua.hpp"
 
 inline const char* DEFAULT_CHANNEL = "regular";

src/logic/scripting/lua/libconsole.cpp

@@ -1,5 +1,5 @@
 #include "../../../coders/commons.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../CommandsInterpreter.hpp"
 #include "api_lua.hpp"
 

src/logic/scripting/lua/libcore.cpp

@@ -1,8 +1,8 @@
 #include <memory>
 #include <vector>
 
-#include "../../../constants.hpp"
+#include <constants.hpp>
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../files/engine_paths.hpp"
 #include "../../../files/settings_io.hpp"
 #include "../../../frontend/menu.hpp"

src/logic/scripting/lua/libentity.cpp

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

src/logic/scripting/lua/libfile.cpp

@@ -2,7 +2,7 @@
 #include <string>
 
 #include "../../../coders/gzip.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../files/engine_paths.hpp"
 #include "../../../files/files.hpp"
 #include "../../../util/stringutil.hpp"

src/logic/scripting/lua/libgui.cpp

@@ -1,5 +1,5 @@
 #include "../../../assets/Assets.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../frontend/UiDocument.hpp"
 #include "../../../frontend/locale.hpp"
 #include "../../../graphics/ui/elements/Button.hpp"

src/logic/scripting/lua/libhud.cpp

@@ -3,7 +3,7 @@
 
 #include "../../../assets/Assets.hpp"
 #include "../../../content/Content.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../frontend/UiDocument.hpp"
 #include "../../../frontend/hud.hpp"
 #include "../../../graphics/ui/elements/InventoryView.hpp"

src/logic/scripting/lua/libinput.cpp

@@ -1,4 +1,4 @@
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../frontend/hud.hpp"
 #include "../../../frontend/screens/Screen.hpp"
 #include "../../../graphics/ui/GUI.hpp"

src/logic/scripting/lua/libpack.cpp

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

src/logic/scripting/lua/libtime.cpp

@@ -1,4 +1,4 @@
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../window/Window.hpp"
 #include "api_lua.hpp"
 

src/logic/scripting/lua/libworld.cpp

@@ -3,7 +3,7 @@
 
 #include "../../../assets/Assets.hpp"
 #include "../../../assets/AssetsLoader.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../files/engine_paths.hpp"
 #include "../../../world/Level.hpp"
 #include "../../../world/World.hpp"

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 <delegates.hpp>
 #include "../scripting.hpp"
 
 #ifdef __linux__

src/logic/scripting/lua/lua_engine.hpp

@@ -5,7 +5,7 @@
 #include <string>
 
 #include "../../../data/dynamic.hpp"
-#include "../../../delegates.hpp"
+#include <delegates.hpp>
 #include "../scripting_functional.hpp"
 #include "lua_util.hpp"
 

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 <engine.hpp>
 #include "../../files/engine_paths.hpp"
 #include "../../files/files.hpp"
 #include "../../frontend/UiDocument.hpp"

src/logic/scripting/scripting.hpp

@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "../../data/dynamic.hpp"
-#include "../../delegates.hpp"
+#include <delegates.hpp>
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "scripting_functional.hpp"
 
 namespace fs = std::filesystem;

src/logic/scripting/scripting_functional.hpp

@@ -5,8 +5,8 @@
 #include <string>
 
 #include "../../data/dynamic.hpp"
-#include "../../delegates.hpp"
+#include <delegates.hpp>
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace scripting {
     using common_func =

src/logic/scripting/scripting_hud.cpp

@@ -1,7 +1,7 @@
 #include "scripting_hud.hpp"
 
 #include "../../debug/Logger.hpp"
-#include "../../engine.hpp"
+#include <engine.hpp>
 #include "../../files/files.hpp"
 #include "../../frontend/hud.hpp"
 #include "../../objects/Player.hpp"

src/logic/scripting/scripting_hud.hpp

@@ -4,7 +4,7 @@
 #include <filesystem>
 #include <string>
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace fs = std::filesystem;
 

src/maths/fastmaths.hpp

@@ -1,7 +1,7 @@
 #ifndef MATHS_FASTMATHS_HPP_
 #define MATHS_FASTMATHS_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class FastRandom {
     uint seed;

src/maths/voxmaths.hpp

@@ -1,7 +1,7 @@
 #ifndef VOXNATHS_HPP_
 #define VOXNATHS_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 inline int floordiv(int a, int b) {
     if (a < 0 && a % 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 <engine.hpp>
 #include "../graphics/core/DrawContext.hpp"
 #include "../graphics/core/LineBatch.hpp"
 #include "../graphics/core/Model.hpp"

src/objects/Entities.hpp

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

src/objects/EntityDef.hpp

@@ -5,7 +5,7 @@
 #include <vector>
 #include <glm/glm.hpp>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../maths/aabb.hpp"
 #include "../physics/Hitbox.hpp"