more fun with AI/steering

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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 8d822501bd07735d8c2448f9ec6250989d16e9aa..ab563a7fa9e1e964bb49b10dc16762f2b623a99e 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;
 
@@ -25,8 +26,8 @@ class World {
 public:
        struct Config {
                std::string name = "default";
-               // initial player position
-               glm::vec3 spawn = { 0.0f, 0.0f, 0.0f };
+               // chunk base where new players are spawned
+               glm::ivec3 spawn = { 0, 0, 0 };
                // direction facing towards(!) the light
                glm::vec3 light_direction = { -1.0f, -3.0f, -2.0f };
                // fade out reaches 1/e (0.3679) at 1/fog_density,
@@ -61,29 +62,38 @@ 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; }
 
        /// add player with given name
-       /// returns nullptr in entity if the name is already taken
-       Player AddPlayer(const std::string &name);
+       /// returns nullptr if the name is already taken
+       Player *AddPlayer(const std::string &name);
        /// add player with given name and ID
-       /// returns nullptr in entity if the name or ID is already taken
-       Player AddPlayer(const std::string &name, std::uint32_t id);
+       /// returns nullptr if the name or ID is already taken
+       Player *AddPlayer(const std::string &name, std::uint32_t id);
        /// add an entity with an autogenerated ID
        Entity &AddEntity();
        /// add entity with given ID
        /// returns nullptr if the ID is already taken
        Entity *AddEntity(std::uint32_t id);
+       /// add entity with given ID
+       /// returs an existing entity if ID is already taken
+       Entity &ForceAddEntity(std::uint32_t id);
 
-       const std::vector<Player> &Players() const noexcept { return players; }
+       std::list<Player> &Players() noexcept { return players; }
+       const std::list<Player> &Players() const noexcept { return players; }
        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 &);
 
@@ -91,15 +101,37 @@ 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;
 
        const BlockTypeRegistry &block_type;
 
        ChunkStore chunks;
-       ChunkIndex &spawn_index;
 
-       std::vector<Player> players;
+       std::list<Player> players;
        std::list<Entity> entities;
 
        glm::vec3 light_direction;