X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2Fshapes.hpp;fp=src%2Fmodel%2Fshapes.hpp;h=8ead23d7cfea66ebd061cb22f663b57dd3fef54e;hb=bc1cefd505bf1f34639b8839cb337b08310ceb8e;hp=b5e965a1c8f1e2e302f2ae656397b631bac02c08;hpb=0580ff3941fe5f5ea25c96e737edba1541d9271f;p=blank.git diff --git a/src/model/shapes.hpp b/src/model/shapes.hpp index b5e965a..8ead23d 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 &) 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 &) 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 &) const noexcept override; private: AABB top, bot;