glm backwards compatibility

[blank.git] / src / model / CollisionBounds.hpp

diff --git a/src/model/CollisionBounds.hpp b/src/model/CollisionBounds.hpp
index 78eb0dda77b6a8a3b55536f2e68de6eedce0e2e3..a612286e5c4280bfd8fcd1f35d010633d2216dca 100644 (file)
--- a/src/model/CollisionBounds.hpp
+++ b/src/model/CollisionBounds.hpp
@@ -1,9 +1,8 @@
 #ifndef BLANK_MODEL_COLLISIONBOUNDS_HPP_
 #define BLANK_MODEL_COLLISIONBOUNDS_HPP_
 
-#include "../graphics/OutlineMesh.hpp"
-
-#include <glm/glm.hpp>
+#include "../graphics/PrimitiveMesh.hpp"
+#include "../graphics/glm.hpp"
 
 
 namespace blank {
@@ -19,7 +18,7 @@ struct CollisionBounds {
        std::size_t OutlineIndexCount() const { return out_idx.size(); }
 
        /// fill given buffers with these bounds' outline's elements
-       void Outline(OutlineMesh::Buffer &out) const;
+       void Outline(PrimitiveMesh::Buffer &out) const;
 
        /// Check if given ray would pass though this shape if it were
        /// transformed with given matrix.
@@ -44,12 +43,12 @@ struct CollisionBounds {
 
 protected:
        void SetOutline(
-               const OutlineMesh::Positions &pos,
-               const OutlineMesh::Indices &idx);
+               const PrimitiveMesh::Positions &pos,
+               const PrimitiveMesh::Indices &idx);
 
 private:
-       OutlineMesh::Positions out_pos;
-       OutlineMesh::Indices out_idx;
+       PrimitiveMesh::Positions out_pos;
+       PrimitiveMesh::Indices out_idx;
 
 };