X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2Fbounds.hpp;h=df5f77f66410ef1c43e08701aae15d6883553a3c;hb=e4a1425dccd0ba9b106e415dd02809f4308a85ee;hp=05f8df16950f20860269b0fe2bccd4626486f543;hpb=b61d462707dd3d40a32a6104d88eb24f6a52df63;p=blank.git diff --git a/src/model/bounds.hpp b/src/model/bounds.hpp index 05f8df1..df5f77f 100644 --- a/src/model/bounds.hpp +++ b/src/model/bounds.hpp @@ -2,7 +2,7 @@ #define BLANK_MODEL_BOUNDS_HPP_ #include "CollisionBounds.hpp" -#include "geometry.hpp" +#include "../geometry/primitive.hpp" #include #include @@ -10,18 +10,6 @@ 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 {