diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 6c122cfd7..65f1eb20d 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -18,7 +18,7 @@ #include #include #include -#include "../maths/voxmaths.hpp" +#include #include #include #include "../physics/Hitbox.hpp" diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp index a2112f86c..c7d54edc1 100644 --- a/src/files/WorldRegions.cpp +++ b/src/files/WorldRegions.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "../maths/voxmaths.hpp" +#include #include #define REGION_FORMAT_MAGIC ".VOXREG" diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index 0a61c0231..c8bff2983 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "../maths/UVRegion.hpp" +#include #include #include diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index e3f69da62..7ae8b7687 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -29,7 +29,7 @@ #include #include #include -#include "../maths/voxmaths.hpp" +#include #include #include "../physics/Hitbox.hpp" #include diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp index 98d464f4e..560704fe4 100644 --- a/src/frontend/screens/MenuScreen.cpp +++ b/src/frontend/screens/MenuScreen.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "../../maths/UVRegion.hpp" +#include #include "../../window/Window.hpp" #include "../../window/Camera.hpp" #include diff --git a/src/graphics/core/Atlas.cpp b/src/graphics/core/Atlas.cpp index 6823757dc..00f1f5893 100644 --- a/src/graphics/core/Atlas.cpp +++ b/src/graphics/core/Atlas.cpp @@ -2,7 +2,7 @@ #include "Texture.hpp" #include "ImageData.hpp" -#include "../../maths/LMPacker.hpp" +#include #include diff --git a/src/graphics/core/Atlas.hpp b/src/graphics/core/Atlas.hpp index 8de9dc1c0..2542c771e 100644 --- a/src/graphics/core/Atlas.hpp +++ b/src/graphics/core/Atlas.hpp @@ -7,7 +7,7 @@ #include #include #include -#include "../../maths/UVRegion.hpp" +#include #include class ImageData; diff --git a/src/graphics/core/Batch2D.cpp b/src/graphics/core/Batch2D.cpp index 9531b53cc..e93f1e5a5 100644 --- a/src/graphics/core/Batch2D.cpp +++ b/src/graphics/core/Batch2D.cpp @@ -2,7 +2,7 @@ #include "Mesh.hpp" #include "Texture.hpp" #include "gl_util.hpp" -#include "../../maths/UVRegion.hpp" +#include #include diff --git a/src/graphics/core/Batch2D.hpp b/src/graphics/core/Batch2D.hpp index ed8f9f702..fbad12606 100644 --- a/src/graphics/core/Batch2D.hpp +++ b/src/graphics/core/Batch2D.hpp @@ -6,7 +6,7 @@ #include #include "commons.hpp" -#include "../../maths/UVRegion.hpp" +#include class Mesh; class Texture; diff --git a/src/graphics/core/Batch3D.cpp b/src/graphics/core/Batch3D.cpp index ae0b42820..94fe9ac40 100644 --- a/src/graphics/core/Batch3D.cpp +++ b/src/graphics/core/Batch3D.cpp @@ -5,7 +5,7 @@ #include #include -#include "../../maths/UVRegion.hpp" +#include /// xyz, uv, rgba inline constexpr uint B3D_VERTEX_SIZE = 9; diff --git a/src/graphics/core/Texture.hpp b/src/graphics/core/Texture.hpp index 16a8e1d21..1f1f83765 100644 --- a/src/graphics/core/Texture.hpp +++ b/src/graphics/core/Texture.hpp @@ -2,7 +2,7 @@ #define GRAPHICS_CORE_TEXTURE_HPP_ #include -#include "../../maths/UVRegion.hpp" +#include #include "ImageData.hpp" #include diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index 25253cec9..a734b756d 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -1,7 +1,7 @@ #include "BlocksRenderer.hpp" #include -#include "../../maths/UVRegion.hpp" +#include #include #include #include diff --git a/src/graphics/render/ModelBatch.hpp b/src/graphics/render/ModelBatch.hpp index 69608ddcc..3ff266755 100644 --- a/src/graphics/render/ModelBatch.hpp +++ b/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 #include #include diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp index 7f9d9fee9..1591e5ff4 100644 --- a/src/graphics/render/Skybox.cpp +++ b/src/graphics/render/Skybox.cpp @@ -9,7 +9,7 @@ #include #include "../../window/Window.hpp" #include "../../window/Camera.hpp" -#include "../../maths/UVRegion.hpp" +#include #include #include diff --git a/src/graphics/render/Skybox.hpp b/src/graphics/render/Skybox.hpp index e793b2347..0d929b815 100644 --- a/src/graphics/render/Skybox.hpp +++ b/src/graphics/render/Skybox.hpp @@ -5,7 +5,7 @@ #include #include #include -#include "../../maths/fastmaths.hpp" +#include class Mesh; class Shader; diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 1b814e0ba..2c2b40167 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -17,8 +17,8 @@ #include #include #include -#include "../../maths/FrustumCulling.hpp" -#include "../../maths/voxmaths.hpp" +#include +#include #include #include #include diff --git a/src/graphics/ui/elements/Image.cpp b/src/graphics/ui/elements/Image.cpp index 8927f625d..0002cab12 100644 --- a/src/graphics/ui/elements/Image.cpp +++ b/src/graphics/ui/elements/Image.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "../../../maths/UVRegion.hpp" +#include using namespace gui; diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 71779dc95..6940e5e91 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "../../../maths/voxmaths.hpp" +#include #include #include #include diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp index 6c28e0216..3a017d5c6 100644 --- a/src/graphics/ui/gui_xml.cpp +++ b/src/graphics/ui/gui_xml.cpp @@ -14,7 +14,7 @@ #include #include #include -#include "../../maths/voxmaths.hpp" +#include #include #include "../../window/Events.hpp" diff --git a/src/items/Inventories.hpp b/src/items/Inventories.hpp index e50a95b5f..3c2affa2e 100644 --- a/src/items/Inventories.hpp +++ b/src/items/Inventories.hpp @@ -5,7 +5,7 @@ #include #include -#include "../maths/util.hpp" +#include #include "Inventory.hpp" class Level; diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp index e471e16d6..cefd316ae 100644 --- a/src/logic/BlocksController.cpp +++ b/src/logic/BlocksController.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "../maths/fastmaths.hpp" +#include #include #include #include diff --git a/src/logic/BlocksController.hpp b/src/logic/BlocksController.hpp index 80971870b..83d351e68 100644 --- a/src/logic/BlocksController.hpp +++ b/src/logic/BlocksController.hpp @@ -4,7 +4,7 @@ #include #include -#include "../maths/fastmaths.hpp" +#include #include #include #include diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index ea742aef2..66403c426 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "../maths/voxmaths.hpp" +#include #include #include #include diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index 1bd6d13af..8954cbbca 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -13,8 +13,8 @@ #include #include #include -#include "../maths/FrustumCulling.hpp" -#include "../maths/rays.hpp" +#include +#include #include "EntityDef.hpp" #include "rigging.hpp" #include "../physics/Hitbox.hpp" diff --git a/src/objects/EntityDef.hpp b/src/objects/EntityDef.hpp index 9002f1aeb..56184ec72 100644 --- a/src/objects/EntityDef.hpp +++ b/src/objects/EntityDef.hpp @@ -6,7 +6,7 @@ #include #include -#include "../maths/aabb.hpp" +#include #include "../physics/Hitbox.hpp" namespace rigging { diff --git a/src/physics/Hitbox.hpp b/src/physics/Hitbox.hpp index 932bc4d43..37db8d743 100644 --- a/src/physics/Hitbox.hpp +++ b/src/physics/Hitbox.hpp @@ -1,7 +1,7 @@ #ifndef PHYSICS_HITBOX_HPP_ #define PHYSICS_HITBOX_HPP_ -#include "../maths/aabb.hpp" +#include #include #include diff --git a/src/physics/PhysicsSolver.cpp b/src/physics/PhysicsSolver.cpp index 8f24b4ccb..ddd6d6eeb 100644 --- a/src/physics/PhysicsSolver.cpp +++ b/src/physics/PhysicsSolver.cpp @@ -1,7 +1,7 @@ #include "PhysicsSolver.hpp" #include "Hitbox.hpp" -#include "../maths/aabb.hpp" +#include #include #include #include diff --git a/src/voxels/Block.hpp b/src/voxels/Block.hpp index 251fbb83d..feb7f5cf6 100644 --- a/src/voxels/Block.hpp +++ b/src/voxels/Block.hpp @@ -6,8 +6,8 @@ #include #include -#include "../maths/UVRegion.hpp" -#include "../maths/aabb.hpp" +#include +#include #include inline std::string BLOCK_ITEM_SUFFIX = ".item"; diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index ca5c2cb92..cfff7b0c1 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -12,9 +12,9 @@ #include #include #include -#include "../maths/aabb.hpp" -#include "../maths/rays.hpp" -#include "../maths/voxmaths.hpp" +#include +#include +#include #include #include #include diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp index f1fafc845..19989e52f 100644 --- a/src/voxels/ChunksStorage.cpp +++ b/src/voxels/ChunksStorage.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "../maths/voxmaths.hpp" +#include #include #include #include diff --git a/src/voxels/DefaultWorldGenerator.cpp b/src/voxels/DefaultWorldGenerator.cpp index 024877d59..0b6bec24e 100644 --- a/src/voxels/DefaultWorldGenerator.cpp +++ b/src/voxels/DefaultWorldGenerator.cpp @@ -17,8 +17,8 @@ #include #include #include "../maths/FastNoiseLite.h" -#include "../maths/util.hpp" -#include "../maths/voxmaths.hpp" +#include +#include // will be refactored in generators update