penalty force collision response

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

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index dcfb4189a3199a210c2056768fcd34eb8176d16a..1ac92235a9401f3c63675500a27b7ffcde977534 100644 (file)
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -3,7 +3,7 @@
 
 #include "Chunk.hpp"
 #include "EntityState.hpp"
-#include "../model/CompositeInstance.hpp"
+#include "../model/Instance.hpp"
 #include "../model/geometry.hpp"
 
 #include <cstdint>
@@ -22,8 +22,8 @@ class Entity {
 public:
        Entity() noexcept;
 
-       CompositeInstance &GetModel() noexcept { return model; }
-       const CompositeInstance &GetModel() const noexcept { return model; }
+       Instance &GetModel() noexcept { return model; }
+       const Instance &GetModel() const noexcept { return model; }
 
        std::uint32_t ID() const noexcept { return id; }
        void ID(std::uint32_t i) noexcept { id = i; }
@@ -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; }
 
@@ -76,20 +79,19 @@ 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);
        }
 
 private:
-       CompositeInstance model;
+       Instance model;
 
        std::uint32_t id;
        std::string name;
 
        AABB bounds;
        EntityState state;
+       glm::vec3 tgt_vel;
 
        int ref_count;