X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;h=bf5fbe9db56bac383afcdcdac74c1e105120f99d;hb=d38be21d103052761505d58a6d13e30a896dde01;hp=dcfb4189a3199a210c2056768fcd34eb8176d16a;hpb=cf5ce8220483bb062740eeaedde6474928fd5e0e;p=blank.git

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index dcfb418..bf5fbe9 100644
--- 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>
@@ -15,6 +15,7 @@
 namespace blank {
 
 class DirectionalLighting;
+struct EntityDerivative;
 class Shape;
 
 class Entity {
@@ -22,8 +23,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 +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; }
 
@@ -83,13 +87,22 @@ public:
 	}
 
 private:
-	CompositeInstance model;
+	EntityDerivative CalculateStep(
+		const EntityState &cur,
+		float dt,
+		const EntityDerivative &prev
+	) const noexcept;
+	glm::vec3 ControlForce(const EntityState &) const noexcept;
+
+private:
+	Instance model;
 
 	std::uint32_t id;
 	std::string name;
 
 	AABB bounds;
 	EntityState state;
+	glm::vec3 tgt_vel;
 
 	int ref_count;