X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2Fshapes.hpp;h=48205305954ba3c03da6cb3b41bf0c329c2b7737;hb=7bb75960dbf9bfdee9ac865384aca81791b3da5c;hp=b5e965a1c8f1e2e302f2ae656397b631bac02c08;hpb=b7d09e1e35ef90282c97509e0020b20db3c7ea9f;p=blank.git diff --git a/src/model/shapes.hpp b/src/model/shapes.hpp index b5e965a..4820530 100644 --- a/src/model/shapes.hpp +++ b/src/model/shapes.hpp @@ -17,6 +17,7 @@ public: NullShape(); bool Intersects(const Ray &, const glm::mat4 &, float &, glm::vec3 &) const noexcept override; + bool Intersects(const glm::mat4 &, const AABB &, const glm::mat4 &, float &, glm::vec3 &) const noexcept override; }; @@ -28,6 +29,7 @@ public: CuboidShape(const AABB &bounds); bool Intersects(const Ray &, const glm::mat4 &, float &, glm::vec3 &) const noexcept override; + bool Intersects(const glm::mat4 &, const AABB &, const glm::mat4 &, float &, glm::vec3 &) const noexcept override; private: AABB bb; @@ -42,6 +44,7 @@ public: StairShape(const AABB &bounds, const glm::vec2 &clip); bool Intersects(const Ray &, const glm::mat4 &, float &, glm::vec3 &) const noexcept override; + bool Intersects(const glm::mat4 &, const AABB &, const glm::mat4 &, float &, glm::vec3 &) const noexcept override; private: AABB top, bot;