X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fchunk.cpp;h=c30e2cd83aa047b90646e96e769f92df3daa487b;hb=eca1fdcc8e34a4918418b2de122c6200aeb7ceaf;hp=483a4e5cd78ccea1f4722deb31ead2f3cfff0e4a;hpb=1a7bbd64b1fef1f4e2f9303f820d6f3ce76cebf1;p=blank.git diff --git a/src/chunk.cpp b/src/chunk.cpp index 483a4e5..c30e2cd 100644 --- a/src/chunk.cpp +++ b/src/chunk.cpp @@ -71,7 +71,7 @@ bool Chunk::Intersection( } float cur_dist; glm::vec3 cur_norm; - glm::vec3 pos(float(x) + 0.5f, float(y) + 0.5f, float(z) + 0.5f); + Block::Pos pos(float(x) + 0.5f, float(y) + 0.5f, float(z) + 0.5f); if (blocks[id].type->shape->Intersects(ray, glm::translate(M, pos), cur_dist, cur_norm)) { if (cur_dist < closest_dist) { closest_id = id; @@ -99,11 +99,11 @@ bool Chunk::Intersection( return true; } -void Chunk::Position(const glm::tvec3 &pos) { +void Chunk::Position(const Pos &pos) { position = pos; } -glm::mat4 Chunk::Transform(const glm::tvec3 &offset) const { +glm::mat4 Chunk::Transform(const Pos &offset) const { return glm::translate((position - offset) * Extent()); }