fix entity/world collision

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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 848f801e24ffd30bfb5d95cbe50c46f18278c159..8754d3992e800f518dd9b5db021a8c997a80ec9b 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;
 
@@ -48,7 +49,7 @@ public:
        bool Intersection(
                const Ray &,
                const glm::mat4 &M,
-               const Chunk::Pos &reference,
+               const ExactLocation::Coarse &reference,
                WorldCollision &);
 
        /// check if this ray hits an entity
@@ -61,8 +62,15 @@ 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, const EntityState &, std::vector<WorldCollision> &);
+
+       /// check if given box (M * AABB) intersects with the world
+       /// M is assumed to be calculated in reference to given chunk coords
+       bool Intersection(
+               const AABB &box,
+               const glm::mat4 &M,
+               const glm::ivec3 &reference,
+               std::vector<WorldCollision> &);
 
        const BlockTypeRegistry &BlockTypes() noexcept { return block_type; }
        ChunkStore &Chunks() noexcept { return chunks; }
@@ -82,18 +90,54 @@ public:
        /// returs an existing entity if ID is already taken
        Entity &ForceAddEntity(std::uint32_t id);
 
+       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 &);
+       void RenderDebug(Viewport &);
 
 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 &
+       );
+
+       /// calculate light direction and intensity at entity's location
+       void GetLight(
+               const Entity &entity,
+               glm::vec3 &direction,
+               glm::vec3 &color,
+               glm::vec3 &ambient
+       );
+
 private:
        Config config;