update entity model on state change

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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 848f801e24ffd30bfb5d95cbe50c46f18278c159..4755b18bcdea3cad24dc797c748691239d7f617f 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -17,6 +17,7 @@ namespace blank {
 
 class BlockTypeRegistry;
 class EntityCollision;
+struct EntityDerivative;
 class Viewport;
 class WorldCollision;
 
@@ -61,8 +62,10 @@ public:
                EntityCollision &);
 
        /// check if given entity intersects with the world
-       bool Intersection(const Entity &e, std::vector<WorldCollision> &);
-       void Resolve(Entity &e, std::vector<WorldCollision> &);
+//     bool Intersection(const Entity &e, std::vector<WorldCollision> &col) {
+//             return Intersection(e, e.GetState(), col);
+//     }
+       bool Intersection(const Entity &e, const EntityState &, std::vector<WorldCollision> &);
 
        const BlockTypeRegistry &BlockTypes() noexcept { return block_type; }
        ChunkStore &Chunks() noexcept { return chunks; }
@@ -86,7 +89,10 @@ public:
        std::list<Entity> &Entities() noexcept { return entities; }
        const std::list<Entity> &Entities() const noexcept { return entities; }
 
+       // dt in ms
        void Update(int dt);
+       // dt in s
+       void Update(Entity &, float dt);
 
        void Render(Viewport &);
 
@@ -94,6 +100,29 @@ private:
        using EntityHandle = std::list<Entity>::iterator;
        EntityHandle RemoveEntity(EntityHandle &);
 
+       EntityDerivative CalculateStep(
+               const Entity &,
+               const EntityState &cur,
+               float dt,
+               const EntityDerivative &prev
+       );
+       glm::vec3 CalculateForce(
+               const Entity &,
+               const EntityState &cur
+       );
+       glm::vec3 ControlForce(
+               const Entity &,
+               const EntityState &
+       );
+       glm::vec3 CollisionForce(
+               const Entity &,
+               const EntityState &
+       );
+       glm::vec3 Gravity(
+               const Entity &,
+               const EntityState &
+       );
+
 private:
        Config config;