--- a/src/types/boundingbox.h Sun Jan 26 01:06:27 2020 +0200 +++ b/src/types/boundingbox.h Sun Jan 26 14:29:30 2020 +0200 @@ -17,21 +17,22 @@ */ #pragma once -#include "vertex.h" +#include "basics.h" +#include "maths.h" class BoundingBox { public: - void consider(const Point3D& vertex); - Point3D minimum {math::infinity, math::infinity, math::infinity}; - Point3D maximum {-math::infinity, -math::infinity, -math::infinity}; - BoundingBox& operator<<(const Point3D& v); + void consider(const glm::vec3& vertex); + glm::vec3 minimum {math::infinity, math::infinity, math::infinity}; + glm::vec3 maximum {-math::infinity, -math::infinity, -math::infinity}; + BoundingBox& operator<<(const glm::vec3& v); }; -static constexpr BoundingBox emptyBoundingBox = {}; -Point3D boxCenter(const BoundingBox& box); -double longestMeasure(const BoundingBox& box); -double spaceDiagonal(const BoundingBox& box); +inline const BoundingBox emptyBoundingBox = {}; +glm::vec3 boxCenter(const BoundingBox& box); +float longestMeasure(const BoundingBox& box); +float spaceDiagonal(const BoundingBox& box); bool operator==(const BoundingBox& box_1, const BoundingBox& box_2); bool operator!=(const BoundingBox& box_1, const BoundingBox& box_2);