X-Git-Url: http://git.localhorst.tv/?p=blobs.git;a=blobdiff_plain;f=src%2Fcreature%2FCreature.hpp;h=db0aa5212dc92e52014446331912b6ce5e275052;hp=f22f3da2e9cf461d5caabde8468046133dfcc65a;hb=ae4f59520574caf5054d4a19cd76fa86c4a97264;hpb=58459faea6f68654c4292e7333ba67961bfab1d6

diff --git a/src/creature/Creature.hpp b/src/creature/Creature.hpp
index f22f3da..db0aa52 100644
--- a/src/creature/Creature.hpp
+++ b/src/creature/Creature.hpp
@@ -3,7 +3,6 @@
 
 #include "Composition.hpp"
 #include "Genome.hpp"
-#include "Goal.hpp"
 #include "Memory.hpp"
 #include "Situation.hpp"
 #include "Steering.hpp"
@@ -11,6 +10,7 @@
 #include "../math/geometry.hpp"
 #include "../math/glm.hpp"
 
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -30,6 +30,8 @@ namespace world {
 }
 namespace creature {
 
+class Goal;
+
 class Creature {
 
 public:
@@ -163,8 +165,8 @@ public:
 	const Memory &GetMemory() const noexcept { return memory; }
 
 	/// constantly active goal. every creature in the simulation is required to have one
-	void SetBackgroundTask(std::unique_ptr<Goal> &&g) { bg_task = std::move(g); }
-	Goal &BackgroundTask() { return *bg_task; }
+	void SetBackgroundTask(std::unique_ptr<Goal> &&g);
+	Goal &BackgroundTask();
 
 	void AddGoal(std::unique_ptr<Goal> &&);
 	const std::vector<std::unique_ptr<Goal>> &Goals() const noexcept { return goals; }
@@ -177,6 +179,8 @@ public:
 	Steering &GetSteering() noexcept { return steering; }
 	const Steering &GetSteering() const noexcept { return steering; }
 
+	void HeadingTarget(const glm::dvec3 &t) noexcept { heading_target = t; heading_manual = true; }
+
 	math::AABB CollisionBounds() const noexcept;
 	glm::dmat4 CollisionTransform() const noexcept;
 
@@ -224,6 +228,8 @@ private:
 
 	Situation situation;
 	Steering steering;
+	glm::dvec3 heading_target;
+	bool heading_manual;
 
 	// cached because steering makes heavy use of this
 	double perception_range;