X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2FShape.hpp;h=80dc4a33ba6d28803f9de4b603e1cf83b2b00b9f;hb=dcd54cacda98c2c0f7cf0c7a9131fb858d8ee10a;hp=2f79f82b941459592cb0affbb44734191055f2e9;hpb=ba55bf4293f3abc742eef710545a4b207ba2c820;p=blank.git diff --git a/src/model/Shape.hpp b/src/model/Shape.hpp index 2f79f82..80dc4a3 100644 --- a/src/model/Shape.hpp +++ b/src/model/Shape.hpp @@ -2,14 +2,14 @@ #define BLANK_MODEL_SHAPE_HPP_ #include "CollisionBounds.hpp" -#include "geometry.hpp" +#include "../geometry/primitive.hpp" #include "../graphics/BlockMesh.hpp" #include "../graphics/EntityMesh.hpp" +#include "../graphics/glm.hpp" #include "../world/Block.hpp" #include #include -#include namespace blank { @@ -70,7 +70,7 @@ public: size_t OutlineCount() const noexcept; size_t OutlineIndexCount() const noexcept; - void Outline(OutlineMesh::Buffer &out) const; + void Outline(PrimitiveMesh::Buffer &out) const; bool Intersects( const Ray &,