maths/

src/files/WorldFiles.cpp

@@ -18,7 +18,7 @@
 #include <items/Inventory.hpp>
 #include <items/ItemDef.hpp>
 #include <lighting/Lightmap.hpp>
-#include "../maths/voxmaths.hpp"
+#include <maths/voxmaths.hpp>
 #include <objects/EntityDef.hpp>
 #include <objects/Player.hpp>
 #include "../physics/Hitbox.hpp"

src/files/WorldRegions.cpp

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

src/frontend/ContentGfxCache.cpp

@@ -7,7 +7,7 @@
 #include <content/ContentPack.hpp>
 #include <core_defs.hpp>
 #include <graphics/core/Atlas.hpp>
-#include "../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 #include <voxels/Block.hpp>
 
 #include <string>

src/frontend/hud.cpp

@@ -29,7 +29,7 @@
 #include <items/Inventory.hpp>
 #include <items/ItemDef.hpp>
 #include <logic/scripting/scripting.hpp>
-#include "../maths/voxmaths.hpp"
+#include <maths/voxmaths.hpp>
 #include <objects/Player.hpp>
 #include "../physics/Hitbox.hpp"
 #include <typedefs.hpp>

src/frontend/screens/MenuScreen.cpp

@@ -5,7 +5,7 @@
 #include <graphics/core/Batch2D.hpp>
 #include <graphics/core/Shader.hpp>
 #include <graphics/core/Texture.hpp>
-#include "../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 #include "../../window/Window.hpp"
 #include "../../window/Camera.hpp"
 #include <engine.hpp>

src/graphics/core/Atlas.cpp

@@ -2,7 +2,7 @@
 
 #include "Texture.hpp"
 #include "ImageData.hpp"
-#include "../../maths/LMPacker.hpp"
+#include <maths/LMPacker.hpp>
 
 #include <stdexcept>
 

src/graphics/core/Atlas.hpp

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

src/graphics/core/Batch2D.cpp

@@ -2,7 +2,7 @@
 #include "Mesh.hpp"
 #include "Texture.hpp"
 #include "gl_util.hpp"
-#include "../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 
 #include <GL/glew.h>
 

src/graphics/core/Batch2D.hpp

@@ -6,7 +6,7 @@
 #include <glm/glm.hpp>
 
 #include "commons.hpp"
-#include "../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 
 class Mesh;
 class Texture;

src/graphics/core/Batch3D.cpp

@@ -5,7 +5,7 @@
 
 #include <GL/glew.h>
 #include <typedefs.hpp>
-#include "../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 
 /// xyz, uv, rgba
 inline constexpr uint B3D_VERTEX_SIZE = 9;

src/graphics/core/Texture.hpp

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

src/graphics/render/BlocksRenderer.cpp

@@ -1,7 +1,7 @@
 #include "BlocksRenderer.hpp"
 
 #include <graphics/core/Mesh.hpp>
-#include "../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 #include <constants.hpp>
 #include <content/Content.hpp>
 #include <voxels/Block.hpp>

src/graphics/render/ModelBatch.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_RENDER_MODEL_BATCH_HPP_
 #define GRAPHICS_RENDER_MODEL_BATCH_HPP_
 
-#include "../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 
 #include <memory>
 #include <vector>

src/graphics/render/Skybox.cpp

@@ -9,7 +9,7 @@
 #include <graphics/core/DrawContext.hpp>
 #include "../../window/Window.hpp"
 #include "../../window/Camera.hpp"
-#include "../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 
 #include <cmath>
 #include <iostream>

src/graphics/render/Skybox.hpp

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

src/graphics/render/WorldRenderer.cpp

@@ -17,8 +17,8 @@
 #include <items/ItemStack.hpp>
 #include <logic/PlayerController.hpp>
 #include <logic/scripting/scripting_hud.hpp>
-#include "../../maths/FrustumCulling.hpp"
-#include "../../maths/voxmaths.hpp"
+#include <maths/FrustumCulling.hpp>
+#include <maths/voxmaths.hpp>
 #include <objects/Entities.hpp>
 #include <objects/Player.hpp>
 #include <settings.hpp>

src/graphics/ui/elements/Image.cpp

@@ -7,7 +7,7 @@
 #include <graphics/core/Texture.hpp>
 #include <graphics/core/Atlas.hpp>
 #include <assets/Assets.hpp>
-#include "../../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 
 using namespace gui;
 

src/graphics/ui/elements/InventoryView.cpp

@@ -9,7 +9,7 @@
 #include <items/ItemDef.hpp>
 #include <items/ItemStack.hpp>
 #include <logic/scripting/scripting.hpp>
-#include "../../../maths/voxmaths.hpp"
+#include <maths/voxmaths.hpp>
 #include <objects/Player.hpp>
 #include <util/stringutil.hpp>
 #include <voxels/Block.hpp>

src/graphics/ui/gui_xml.cpp

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

src/items/Inventories.hpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "../maths/util.hpp"
+#include <maths/util.hpp>
 #include "Inventory.hpp"
 
 class Level;

src/logic/BlocksController.cpp

@@ -4,7 +4,7 @@
 #include <items/Inventories.hpp>
 #include <items/Inventory.hpp>
 #include <lighting/Lighting.hpp>
-#include "../maths/fastmaths.hpp"
+#include <maths/fastmaths.hpp>
 #include <util/timeutil.hpp>
 #include <voxels/Block.hpp>
 #include <voxels/Chunk.hpp>

src/logic/BlocksController.hpp

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

src/logic/ChunksController.cpp

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

src/objects/Entities.cpp

@@ -13,8 +13,8 @@
 #include <graphics/core/Model.hpp>
 #include <graphics/render/ModelBatch.hpp>
 #include <logic/scripting/scripting.hpp>
-#include "../maths/FrustumCulling.hpp"
-#include "../maths/rays.hpp"
+#include <maths/FrustumCulling.hpp>
+#include <maths/rays.hpp>
 #include "EntityDef.hpp"
 #include "rigging.hpp"
 #include "../physics/Hitbox.hpp"

src/objects/EntityDef.hpp

@@ -6,7 +6,7 @@
 #include <glm/glm.hpp>
 
 #include <typedefs.hpp>
-#include "../maths/aabb.hpp"
+#include <maths/aabb.hpp>
 #include "../physics/Hitbox.hpp"
 
 namespace rigging {

src/physics/Hitbox.hpp

@@ -1,7 +1,7 @@
 #ifndef PHYSICS_HITBOX_HPP_
 #define PHYSICS_HITBOX_HPP_
 
-#include "../maths/aabb.hpp"
+#include <maths/aabb.hpp>
 #include <typedefs.hpp>
 
 #include <set>

src/physics/PhysicsSolver.cpp

@@ -1,7 +1,7 @@
 #include "PhysicsSolver.hpp"
 #include "Hitbox.hpp"
 
-#include "../maths/aabb.hpp"
+#include <maths/aabb.hpp>
 #include <voxels/Block.hpp>
 #include <voxels/Chunks.hpp>
 #include <voxels/voxel.hpp>

src/voxels/Block.hpp

@@ -6,8 +6,8 @@
 #include <string>
 #include <vector>
 
-#include "../maths/UVRegion.hpp"
-#include "../maths/aabb.hpp"
+#include <maths/UVRegion.hpp>
+#include <maths/aabb.hpp>
 #include <typedefs.hpp>
 
 inline std::string BLOCK_ITEM_SUFFIX = ".item";

src/voxels/Chunks.cpp

@@ -12,9 +12,9 @@
 #include <files/WorldFiles.hpp>
 #include <graphics/core/Mesh.hpp>
 #include <lighting/Lightmap.hpp>
-#include "../maths/aabb.hpp"
-#include "../maths/rays.hpp"
-#include "../maths/voxmaths.hpp"
+#include <maths/aabb.hpp>
+#include <maths/rays.hpp>
+#include <maths/voxmaths.hpp>
 #include <objects/Entities.hpp>
 #include <world/Level.hpp>
 #include <world/LevelEvents.hpp>

src/voxels/ChunksStorage.cpp

@@ -5,7 +5,7 @@
 #include <files/WorldFiles.hpp>
 #include <items/Inventories.hpp>
 #include <lighting/Lightmap.hpp>
-#include "../maths/voxmaths.hpp"
+#include <maths/voxmaths.hpp>
 #include <objects/Entities.hpp>
 #include <typedefs.hpp>
 #include <world/Level.hpp>

src/voxels/DefaultWorldGenerator.cpp

@@ -17,8 +17,8 @@
 #include <content/Content.hpp>
 #include <core_defs.hpp>
 #include "../maths/FastNoiseLite.h"
-#include "../maths/util.hpp"
-#include "../maths/voxmaths.hpp"
+#include <maths/util.hpp>
+#include <maths/voxmaths.hpp>
 
 // will be refactored in generators update