X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.hpp;h=ebdfdf423414eafa6cb7ad74a17ecd28156a4d00;hb=22319eadfc50e31d434b124117c7791103764410;hp=738e6f0eac8401f1149081a93a8171fe73607046;hpb=5588a6a9b1e2fb6fee8f1166f855ef497e551a09;p=blank.git diff --git a/src/world.hpp b/src/world.hpp index 738e6f0..ebdfdf4 100644 --- a/src/world.hpp +++ b/src/world.hpp @@ -113,16 +113,16 @@ public: pos.z >= 0 && pos.z < Depth(); } static constexpr int ToIndex(const glm::vec3 &pos) { - return pos.x + pos.y * Width() + pos.z * Width() * Height(); + return int(pos.x) + int(pos.y) * Width() + int(pos.z) * Width() * Height(); } static constexpr bool InBounds(int idx) { return idx >= 0 && idx < Size(); } static glm::vec3 ToCoords(int idx) { return glm::vec3( - idx % Width(), - (idx / Width()) % Height(), - idx / (Width() * Height()) + 0.5f + idx % Width(), + 0.5f + (idx / Width()) % Height(), + 0.5f + idx / (Width() * Height()) ); }