X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;h=36f686848e6542353e3c47d20e94fdb9af58902e;hb=2ad195d00eea2c4d48f3f1a3ccc60a8176e7da20;hp=1a6fccf26f35a563441a3972a21ddfa799b14966;hpb=e4a1425dccd0ba9b106e415dd02809f4308a85ee;p=blank.git

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index 1a6fccf..36f6868 100644
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -2,7 +2,9 @@
 #define BLANK_WORLD_ENTITY_HPP_
 
 #include "Chunk.hpp"
+#include "EntityDerivative.hpp"
 #include "EntityState.hpp"
+#include "Steering.hpp"
 #include "../geometry/primitive.hpp"
 #include "../model/Instance.hpp"
 
@@ -17,6 +19,7 @@ namespace blank {
 class DirectionalLighting;
 class EntityController;
 class Shape;
+class World;
 
 class Entity {
 
@@ -30,6 +33,9 @@ public:
 	Entity(const Entity &) noexcept;
 	Entity &operator =(const Entity &) = delete;
 
+	Steering &GetSteering() noexcept { return steering; }
+	const Steering &GetSteering() const noexcept { return steering; }
+
 	bool HasController() const noexcept { return ctrl; }
 	// entity takes over ownership of controller
 	void SetController(EntityController *c) noexcept;
@@ -114,13 +120,14 @@ public:
 	bool Dead() const noexcept { return dead; }
 	bool CanRemove() const noexcept { return dead && ref_count <= 0; }
 
-	void Update(float dt);
+	void Update(World &, float dt);
 
 	void Render(const glm::mat4 &M, DirectionalLighting &prog) noexcept {
 		if (model) model.Render(M, prog);
 	}
 
 private:
+	void UpdatePhysics(World &, float dt);
 	void UpdateTransforms() noexcept;
 	void UpdateHeading() noexcept;
 	void UpdateModel(float dt) noexcept;
@@ -130,7 +137,16 @@ public:
 private:
 	void OrientHead(float dt) noexcept;
 
+	EntityDerivative CalculateStep(
+		World &,
+		const EntityState &cur,
+		float dt,
+		const EntityDerivative &prev
+	) const;
+
+
 private:
+	Steering steering;
 	EntityController *ctrl;
 	Instance model;