X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2Fbounds.hpp;h=72ea01f506699c19e5e42fbfb0e351324d7a9601;hb=3185bad87c06739e4ec19b456c7158437ba9621f;hp=05f8df16950f20860269b0fe2bccd4626486f543;hpb=b61d462707dd3d40a32a6104d88eb24f6a52df63;p=blank.git diff --git a/src/model/bounds.hpp b/src/model/bounds.hpp index 05f8df1..72ea01f 100644 --- a/src/model/bounds.hpp +++ b/src/model/bounds.hpp @@ -2,31 +2,19 @@ #define BLANK_MODEL_BOUNDS_HPP_ #include "CollisionBounds.hpp" -#include "geometry.hpp" +#include "../geometry/primitive.hpp" +#include "../graphics/glm.hpp" #include -#include namespace blank { -class NullBounds -: public CollisionBounds { - -public: - NullBounds(); - - 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; - -}; - - class CuboidBounds : public CollisionBounds { public: - CuboidBounds(const AABB &bounds); + explicit CuboidBounds(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;