more variety over age

[blobs.git] / src / creature / Creature.hpp

diff --git a/src/creature/Creature.hpp b/src/creature/Creature.hpp
index 6c918270e540594bc18d0e19bd0240f80af50c80..f443e48940d2caa20da318c706f196f939a667fd 100644 (file)
--- a/src/creature/Creature.hpp
+++ b/src/creature/Creature.hpp
@@ -3,6 +3,7 @@
 
 #include "Genome.hpp"
 #include "Goal.hpp"
+#include "Memory.hpp"
 #include "Need.hpp"
 #include "Situation.hpp"
 #include "Steering.hpp"
@@ -76,6 +77,9 @@ public:
        void Remove() noexcept { removable = true; }
        bool Removable() const noexcept { return removable; }
 
+       Memory &GetMemory() noexcept { return memory; }
+       const Memory &GetMemory() const noexcept { return memory; }
+
        void AddNeed(std::unique_ptr<Need> &&n) { needs.emplace_back(std::move(n)); }
        const std::vector<std::unique_ptr<Need>> &Needs() const noexcept { return needs; }
 
@@ -90,21 +94,21 @@ public:
        Steering &GetSteering() noexcept { return steering; }
        const Steering &GetSteering() const noexcept { return steering; }
 
-       void Velocity(const glm::dvec3 &v) noexcept { vel = v; }
-       const glm::dvec3 &Velocity() const noexcept { return vel; }
-       bool Moving() const noexcept { return glm::length2(vel) < 0.00000001; }
-
        glm::dmat4 LocalTransform() noexcept;
 
        void BuildVAO();
        void Draw(graphics::Viewport &);
 
+private:
+       Situation::Derivative Step(const Situation::Derivative &ds, double dt) const noexcept;
+
 private:
        world::Simulation &sim;
        std::string name;
 
        Genome genome;
        Genome::Properties<double> properties;
+       int cur_prop;
 
        double mass;
        double density;
@@ -115,14 +119,14 @@ private:
        Callback on_death;
        bool removable;
 
+       Memory memory;
+
        std::vector<std::unique_ptr<Need>> needs;
        std::vector<std::unique_ptr<Goal>> goals;
 
        Situation situation;
        Steering steering;
 
-       glm::dvec3 vel;
-
        struct Attributes {
                glm::vec3 position;
                glm::vec3 normal;