X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;h=1ac92235a9401f3c63675500a27b7ffcde977534;hb=8639a90bcbcd045c57cd489f02a25e0df4236deb;hp=eb312eee8d19417ac97995e0abdcb09afa8ece20;hpb=eba29c8ad489194cd1e3cd64b5f23424ad4384ef;p=blank.git diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp index eb312ee..1ac9223 100644 --- a/src/world/Entity.hpp +++ b/src/world/Entity.hpp @@ -37,6 +37,9 @@ public: bool WorldCollidable() const noexcept { return world_collision; } void WorldCollidable(bool b) noexcept { world_collision = b; } + const glm::vec3 &TargetVelocity() const noexcept { return tgt_vel; } + void TargetVelocity(const glm::vec3 &v) noexcept { tgt_vel = v; } + const glm::vec3 &Velocity() const noexcept { return state.velocity; } void Velocity(const glm::vec3 &v) noexcept { state.velocity = v; } @@ -76,8 +79,6 @@ public: bool Dead() const noexcept { return dead; } bool CanRemove() const noexcept { return dead && ref_count <= 0; } - void Update(int dt) noexcept; - void Render(const glm::mat4 &M, DirectionalLighting &prog) noexcept { if (model) model.Render(M, prog); } @@ -90,6 +91,7 @@ private: AABB bounds; EntityState state; + glm::vec3 tgt_vel; int ref_count;