use "forces" for entity control and RK4 integrator

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

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index eb312eee8d19417ac97995e0abdcb09afa8ece20..bf5fbe9db56bac383afcdcdac74c1e105120f99d 100644 (file)
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -15,6 +15,7 @@
 namespace blank {
 
 class DirectionalLighting;
+struct EntityDerivative;
 class Shape;
 
 class Entity {
@@ -37,6 +38,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; }
 
@@ -82,6 +86,14 @@ public:
                if (model) model.Render(M, prog);
        }
 
+private:
+       EntityDerivative CalculateStep(
+               const EntityState &cur,
+               float dt,
+               const EntityDerivative &prev
+       ) const noexcept;
+       glm::vec3 ControlForce(const EntityState &) const noexcept;
+
 private:
        Instance model;
 
@@ -90,6 +102,7 @@ private:
 
        AABB bounds;
        EntityState state;
+       glm::vec3 tgt_vel;
 
        int ref_count;