X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fchunk.hpp;h=19f5c07ea31f453b0b10573342c8bebe7f44dc04;hb=950adaa5bdb9bf758400f2c00df623865b6bff1d;hp=e27cf5ed09d5b3e6a9b018e5bd1b4ca927450a47;hpb=a58c4558e7d4934f4d0ee621520acfe1c8258c93;p=blank.git diff --git a/src/chunk.hpp b/src/chunk.hpp index e27cf5e..19f5c07 100644 --- a/src/chunk.hpp +++ b/src/chunk.hpp @@ -51,6 +51,7 @@ public: 0.5f + (idx / (Width() * Height())) ); } + glm::mat4 ToTransform(int idx) const; static constexpr bool IsBorder(int idx) { return @@ -73,12 +74,20 @@ public: const BlockType &Type(const Block &b) const { return *types->Get(b.type); } + bool Intersection( + const Ray &ray, + const glm::mat4 &M, + float &dist + ) const { + return blank::Intersection(ray, Bounds(), M, &dist); + } + bool Intersection( const Ray &, const glm::mat4 &M, - int *blkid = nullptr, - float *dist = nullptr, - glm::vec3 *normal = nullptr) const; + int &blkid, + float &dist, + glm::vec3 &normal) const; void Position(const Pos &); const Pos &Position() const { return position; }