X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fentity.hpp;h=5ef8fbedd420f5eb244abf0f6b84405be92ba9e5;hb=46509f82dcea114b004c53a7f3a9608f2518077f;hp=423cb88d3a18bb5877b50d5d18e518b4089bc7c9;hpb=9eb7fb38870c6324580683752d49d62b7a431bce;p=blank.git diff --git a/src/entity.hpp b/src/entity.hpp index 423cb88..5ef8fbe 100644 --- a/src/entity.hpp +++ b/src/entity.hpp @@ -3,9 +3,7 @@ #include "block.hpp" #include "chunk.hpp" -#include "geometry.hpp" #include "model.hpp" -#include "shape.hpp" #include #include @@ -13,6 +11,7 @@ namespace blank { +class Ray; class Shape; class Entity { @@ -22,7 +21,7 @@ public: bool HasShape() const { return shape; } const Shape *GetShape() const { return shape; } - void SetShape(Shape *, const glm::vec3 &color); + void SetShape(const Shape *, const glm::vec3 &color); void SetShapeless(); const glm::vec3 &Velocity() const { return velocity; } @@ -49,7 +48,7 @@ public: void Draw(); private: - Shape *shape; + const Shape *shape; Model model; glm::vec3 velocity;