UVRegion moved to 'maths'

MihailRis · Mar 20, 2024 · f64a851 · f64a851
1 parent 521efe5
commit f64a851
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 13 deletions.
diff --git 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 "../core_defs.h"
 #include "../graphics/core/Atlas.h"
-#include "../graphics/core/UVRegion.h"
+#include "../maths/UVRegion.h"
 #include "../voxels/Block.h"
-#include "../core_defs.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
@@ -6,7 +6,7 @@
 #include <memory>
 #include <vector>
 #include <unordered_map>
-#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
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <glm/glm.hpp>
 
-#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
@@ -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 <memory>

diff --git a/src/graphics/core/UVRegion.cpp b/src/graphics/core/UVRegion.cpp
diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
@@ -3,7 +3,7 @@
 #include <glm/glm.hpp>
 
 #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 → src/maths/UVRegion.h b/src/graphics/core/UVRegion.h → 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 @@ class UVRegion {
 	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
@@ -5,10 +5,8 @@
 #include <vector>
 #include <glm/glm.hpp>
 
-// :<
-#include "../graphics/core/UVRegion.h"
-
 #include "../maths/aabb.h"
+#include "../maths/UVRegion.h"
 #include "../typedefs.h"
 
 #define BLOCK_ITEM_SUFFIX ".item"