X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2FCreature.hpp;h=59bfcb77396dc569c3e0c480c05da729e0de7ffe;hb=e6a15aa6012cf8f034f3073c3d042f9a714da011;hp=d55ab6f0c51790cebad22bc49617b7a347f630e7;hpb=7e02b21428efa3ebec14a34d0c1f81e81d362bfc;p=blobs.git

diff --git a/src/creature/Creature.hpp b/src/creature/Creature.hpp
index d55ab6f..59bfcb7 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:
@@ -101,6 +103,12 @@ public:
 	void HighlightColor(const glm::dvec3 &c) noexcept;
 	glm::dvec4 HighlightColor() const noexcept { return highlight_color; }
 
+	void BackSkin(double s) noexcept { skin_back = s; }
+	double BackSkin() const noexcept { return skin_back; }
+
+	void SideSkin(double s) noexcept { skin_side = s; }
+	double SideSkin() const noexcept { return skin_side; }
+
 	void Mass(double m) noexcept { mass = m; }
 	double Mass() const noexcept { return mass; }
 	void Ingest(int res, double amount) noexcept;
@@ -163,8 +171,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,9 +185,13 @@ 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;
 
+	void OnCollide(Creature &other);
+
 	glm::dmat4 LocalTransform() noexcept;
 
 	void BuildVAO();
@@ -203,6 +215,8 @@ private:
 
 	glm::dvec3 base_color;
 	glm::dvec4 highlight_color;
+	double skin_back;
+	double skin_side;
 
 	double mass;
 	double size;
@@ -222,6 +236,8 @@ private:
 
 	Situation situation;
 	Steering steering;
+	glm::dvec3 heading_target;
+	bool heading_manual;
 
 	// cached because steering makes heavy use of this
 	double perception_range;