X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorldCollision.hpp;h=8b0f5a17b89ce72e3ebe76ccf036ec2b29387830;hb=78e56cf8a2029981502dd632a8fbc08da558fe01;hp=ac7dbbf9f8982d0d7eed51f38113c84588d53c7f;hpb=8639a90bcbcd045c57cd489f02a25e0df4236deb;p=blank.git

diff --git a/src/world/WorldCollision.hpp b/src/world/WorldCollision.hpp
index ac7dbbf..8b0f5a1 100644
--- 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,10 +34,10 @@ struct WorldCollision {
 
 	bool Blocks() const noexcept { return chunk->Type(block).collide_block; }
 
-	const Chunk::Pos &ChunkPos() const noexcept { return GetChunk().Position(); }
+	const ExactLocation::Coarse &ChunkPos() const noexcept { return GetChunk().Position(); }
 
-	glm::ivec3 BlockPos() const noexcept { return Chunk::ToPos(block); }
-	glm::vec3 BlockCoords() const noexcept { return Chunk::ToCoords(block); }
+	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); }
 
 };