diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index eadd7a75..93257dcd 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -5,10 +5,10 @@ #include "../assets/Assets.h" #include "../content/Content.h" #include "../content/ContentPack.h" -#include "../graphics/core/Atlas.h" -#include "../graphics/core/UVRegion.h" -#include "../voxels/Block.h" #include "../core_defs.h" +#include "../graphics/core/Atlas.h" +#include "../maths/UVRegion.h" +#include "../voxels/Block.h" #include "UiDocument.h" ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets) : content(content) { diff --git a/src/graphics/core/Atlas.h b/src/graphics/core/Atlas.h index 6fae5396..72e407fc 100644 --- a/src/graphics/core/Atlas.h +++ b/src/graphics/core/Atlas.h @@ -6,7 +6,7 @@ #include #include #include -#include "UVRegion.h" +#include "../../maths/UVRegion.h" #include "../../typedefs.h" class ImageData; diff --git a/src/graphics/core/Batch2D.h b/src/graphics/core/Batch2D.h index 03fd495f..482bdb12 100644 --- a/src/graphics/core/Batch2D.h +++ b/src/graphics/core/Batch2D.h @@ -5,7 +5,7 @@ #include #include -#include "UVRegion.h" +#include "../../maths/UVRegion.h" class Mesh; class Texture; diff --git a/src/graphics/core/Batch3D.h b/src/graphics/core/Batch3D.h index 533a5ae3..43354366 100644 --- a/src/graphics/core/Batch3D.h +++ b/src/graphics/core/Batch3D.h @@ -1,7 +1,7 @@ #ifndef GRAPHICS_CORE_BATCH3D_H_ #define GRAPHICS_CORE_BATCH3D_H_ -#include "UVRegion.h" +#include "../../maths/UVRegion.h" #include "../../typedefs.h" #include diff --git a/src/graphics/core/UVRegion.cpp b/src/graphics/core/UVRegion.cpp deleted file mode 100644 index 3f421522..00000000 --- a/src/graphics/core/UVRegion.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "UVRegion.h" diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index 6ad23edb..318ae0c3 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -3,7 +3,7 @@ #include #include "../core/Mesh.h" -#include "../core/UVRegion.h" +#include "../../maths/UVRegion.h" #include "../../constants.h" #include "../../content/Content.h" #include "../../voxels/Block.h" diff --git a/src/graphics/core/UVRegion.h b/src/maths/UVRegion.h similarity index 67% rename from src/graphics/core/UVRegion.h rename to src/maths/UVRegion.h index 1b68dbc6..a0860a66 100644 --- a/src/graphics/core/UVRegion.h +++ b/src/maths/UVRegion.h @@ -1,5 +1,5 @@ -#ifndef GRAPHICS_CORE_UVREGION_H_ -#define GRAPHICS_CORE_UVREGION_H_ +#ifndef MATHS_UVREGION_H_ +#define MATHS_UVREGION_H_ class UVRegion { public: @@ -14,4 +14,4 @@ public: UVRegion() : u1(0.0f), v1(0.0f), u2(1.0f), v2(1.0f){} }; -#endif // SRC_GRAPHICS_UVREGION_H_ +#endif // MATHS_UVREGION_H_ diff --git a/src/voxels/Block.h b/src/voxels/Block.h index fa4b03e3..a2760655 100644 --- a/src/voxels/Block.h +++ b/src/voxels/Block.h @@ -5,10 +5,8 @@ #include #include -// :< -#include "../graphics/core/UVRegion.h" - #include "../maths/aabb.h" +#include "../maths/UVRegion.h" #include "../typedefs.h" #define BLOCK_ITEM_SUFFIX ".item"