X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2FCreature.hpp;h=f22f3da2e9cf461d5caabde8468046133dfcc65a;hb=cead4f0686af352cdbac1f2c2df9b6a21ad9faec;hp=44107bea32dd62b3f390b1e1b0575cb39d232fdf;hpb=475f28f06c9e14912bab8119264e247ef466513d;p=blobs.git

diff --git a/src/creature/Creature.hpp b/src/creature/Creature.hpp
index 44107be..f22f3da 100644
--- a/src/creature/Creature.hpp
+++ b/src/creature/Creature.hpp
@@ -8,6 +8,7 @@
 #include "Situation.hpp"
 #include "Steering.hpp"
 #include "../graphics/SimpleVAO.hpp"
+#include "../math/geometry.hpp"
 #include "../math/glm.hpp"
 
 #include <memory>
@@ -104,6 +105,8 @@ public:
 	double Mass() const noexcept { return mass; }
 	void Ingest(int res, double amount) noexcept;
 
+	void DoWork(double amount) noexcept;
+
 	void Size(double s) noexcept { size = s; }
 	double Size() const noexcept { return size; }
 
@@ -112,29 +115,46 @@ public:
 	/// age-depended multiplier, peak being the maximum in lifetime [0,1]
 	double AgeFactor(double peak) const noexcept;
 
+	double EnergyEfficiency() const noexcept;
 	double ExhaustionFactor() const noexcept;
 	double FatigueFactor() const noexcept;
 
 	// stats with effects applied
 	double Strength() const noexcept;
+	double StrengthFactor() const noexcept;
 	double Stamina() const noexcept;
+	double StaminaFactor() const noexcept;
 	double Dexerty() const noexcept;
+	double DexertyFactor() const noexcept;
 	double Intelligence() const noexcept;
+	double IntelligenceFactor() const noexcept;
 	double Lifetime() const noexcept;
 	double Fertility() const noexcept;
 	double Mutability() const noexcept;
+	double Adaptability() const noexcept;
 	double OffspringMass() const noexcept;
 
+	double PerceptionRange() const noexcept;
+	double PerceptionOmniRange() const noexcept;
+	double PerceptionField() const noexcept;
+	bool PerceptionTest(const glm::dvec3 &) const noexcept;
 	/// chance of giving birth per tick
 	double OffspringChance() const noexcept;
-	/// chance of random genetic mutation per tick
+	/// chance of arbitrary genetic mutation per tick
 	double MutateChance() const noexcept;
+	/// chance of environmental genetic mutation per tick
+	double AdaptChance() const noexcept;
 
 	void Hurt(double d) noexcept;
 	void Die() noexcept;
-	void OnDeath(Callback cb) noexcept { on_death = cb; }
-	void Remove() noexcept { removable = true; }
+	bool Dead() const noexcept;
+	void WhenDead(Callback cb) noexcept { on_death = cb; }
+	void Remove() noexcept;
 	bool Removable() const noexcept { return removable; }
+	void Removed() noexcept;
+
+	void AddParent(Creature &);
+	const std::vector<Creature *> &Parents() const noexcept { return parents; }
 
 	Stats &GetStats() noexcept { return stats; }
 	const Stats &GetStats() const noexcept { return stats; }
@@ -157,12 +177,19 @@ public:
 	Steering &GetSteering() noexcept { return steering; }
 	const Steering &GetSteering() const noexcept { return steering; }
 
+	math::AABB CollisionBounds() const noexcept;
+	glm::dmat4 CollisionTransform() const noexcept;
+
+	void OnCollide(Creature &other);
+
 	glm::dmat4 LocalTransform() noexcept;
 
 	void BuildVAO();
+	void KillVAO();
 	void Draw(graphics::Viewport &);
 
 private:
+	void Cache() noexcept;
 	void TickState(double dt);
 	void TickStats(double dt);
 	void TickBrain(double dt);
@@ -183,9 +210,12 @@ private:
 	double size;
 
 	double birth;
+	double death;
 	Callback on_death;
 	bool removable;
 
+	std::vector<Creature *> parents;
+
 	Stats stats;
 	Memory memory;
 
@@ -195,12 +225,19 @@ private:
 	Situation situation;
 	Steering steering;
 
+	// cached because steering makes heavy use of this
+	double perception_range;
+	double perception_range_squared;
+	double perception_omni_range;
+	double perception_omni_range_squared;
+	double perception_field;
+
 	struct Attributes {
 		glm::vec3 position;
 		glm::vec3 normal;
 		glm::vec3 texture;
 	};
-	graphics::SimpleVAO<Attributes, unsigned short> vao;
+	std::unique_ptr<graphics::SimpleVAO<Attributes, unsigned short>> vao;
 
 };