X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorldCollision.hpp;h=8b0f5a17b89ce72e3ebe76ccf036ec2b29387830;hb=b3c37033944671429f8db22c3754caef7add1695;hp=3c81595b714d9bd94104048633950a98da9a4a1a;hpb=d2fa8ca97d291508ce3812fb052a8255d3190d00;p=blank.git diff --git a/src/world/WorldCollision.hpp b/src/world/WorldCollision.hpp index 3c81595..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::vec3 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); } };