X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fworld.hpp;h=67ee355ccbc386d5d8fb08f75ec5c0b7d7fb27df;hb=8881c507009521d08648560984c0f50166224542;hp=b7ed84bd5a71fbfa60415b70c9e84b74b72d8739;hpb=4d0ef1687987a0801469c7262f81efd36636605a;p=blank.git diff --git a/src/world.hpp b/src/world.hpp index b7ed84b..67ee355 100644 --- a/src/world.hpp +++ b/src/world.hpp @@ -93,10 +93,17 @@ public: void Invalidate() { dirty = true; } - Block &BlockAt(const glm::vec3 &pos) { return blocks[ToIndex(pos)]; } - const Block &BlockAt(const glm::vec3 &pos) const { return blocks[ToIndex(pos)]; } - - bool Intersection(const Ray &, const glm::mat4 &M, int *blkid = nullptr, float *dist = nullptr) const; + Block &BlockAt(int index) { return blocks[index]; } + const Block &BlockAt(int index) const { return blocks[index]; } + Block &BlockAt(const glm::vec3 &pos) { return BlockAt(ToIndex(pos)); } + const Block &BlockAt(const glm::vec3 &pos) const { return BlockAt(ToIndex(pos)); } + + bool Intersection( + const Ray &, + const glm::mat4 &M, + int *blkid = nullptr, + float *dist = nullptr, + glm::vec3 *normal = nullptr) const; void Draw();