X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorldCollision.hpp;h=8b0f5a17b89ce72e3ebe76ccf036ec2b29387830;hb=04b035d837668eb6444ec34e59c018d0c25983fd;hp=dd3f332c8f94854c405a02ccb8803a62e4fe179c;hpb=ee77b8cf96525f0db007b170b6e96f055cba4d33;p=blank.git diff --git a/src/world/WorldCollision.hpp b/src/world/WorldCollision.hpp index dd3f332..8b0f5a1 100644 --- a/src/world/WorldCollision.hpp +++ b/src/world/WorldCollision.hpp @@ -3,8 +3,7 @@ #include "BlockType.hpp" #include "Chunk.hpp" - -#include +#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); } };