glm backwards compatibility

[blank.git] / src / world / WorldCollision.hpp

diff --git a/src/world/WorldCollision.hpp b/src/world/WorldCollision.hpp
index dd3f332c8f94854c405a02ccb8803a62e4fe179c..8b0f5a17b89ce72e3ebe76ccf036ec2b29387830 100644 (file)
--- a/src/world/WorldCollision.hpp
+++ b/src/world/WorldCollision.hpp
@@ -3,8 +3,7 @@
 
 #include "BlockType.hpp"
 #include "Chunk.hpp"
-
-#include <glm/glm.hpp>
+#include "../graphics/glm.hpp"
 
 
 namespace blank {
@@ -35,8 +34,10 @@ struct WorldCollision {
 
        bool Blocks() const noexcept { return chunk->Type(block).collide_block; }
 
-       glm::ivec3 BlockPos() const noexcept { return Chunk::ToPos(block); }
-       glm::vec3 BlockCoords() const noexcept { return Chunk::ToCoords(block); }
+       const ExactLocation::Coarse &ChunkPos() const noexcept { return GetChunk().Position(); }
+
+       RoughLocation::Fine BlockPos() const noexcept { return Chunk::ToPos(block); }
+       ExactLocation::Fine BlockCoords() const noexcept { return Chunk::ToCoords(block); }
        glm::mat4 BlockTransform() const noexcept { return GetChunk().ToTransform(BlockPos(), block); }
 
 };