use seconds as world time unit

[blank.git] / src / world / Entity.hpp

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index eb312eee8d19417ac97995e0abdcb09afa8ece20..7e85591c89150f1c22e6a20604cca20a7c6eccca 100644 (file)
--- 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; }
 
@@ -53,7 +56,7 @@ public:
                return state.Diff(other.state);
        }
 
-       /// direction is rotation axis, magnitude is speed in rad/ms
+       /// direction is rotation axis, magnitude is speed in rad/s
        const glm::vec3 &AngularVelocity() const noexcept { return state.ang_vel; }
        void AngularVelocity(const glm::vec3 &v) noexcept { state.ang_vel = 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;