creature skin overhaul

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

diff --git a/src/creature/Creature.hpp b/src/creature/Creature.hpp
index 7c06cc81d876a1c1464552c4c38e1807db4bf221..f36a2db1f1172770855a9eebdfc6554202689b6f 100644 (file)
--- a/src/creature/Creature.hpp
+++ b/src/creature/Creature.hpp
@@ -57,6 +57,15 @@ public:
        Genome::Properties<double> &GetProperties() noexcept { return properties; }
        const Genome::Properties<double> &GetProperties() const noexcept { return properties; }
 
+       const Genome::PropertySet<double> &CurProps() const noexcept { return properties.props[cur_prop]; }
+       const Genome::PropertySet<double> &NextProps() const noexcept { return properties.props[cur_prop + 1]; }
+
+       void BaseColor(const glm::dvec3 &c) noexcept { base_color = c; }
+       const glm::dvec3 &BaseColor() const noexcept { return base_color; }
+
+       void HighlightColor(const glm::dvec3 &c) noexcept { highlight_color = c; }
+       glm::dvec4 HighlightColor() const noexcept;
+
        void Mass(double m) noexcept { mass = m; size = std::cbrt(mass / density); }
        double Mass() const noexcept { return mass; }
        void Grow(double amount) noexcept;
@@ -66,6 +75,7 @@ public:
 
        double Size() const noexcept;
        double Age() const noexcept;
+       double AgeLerp(double from, double to) const noexcept;
        // change of giving birth per tick
        double Fertility() const noexcept;
 
@@ -94,21 +104,24 @@ 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;
+
+       glm::dvec3 base_color;
+       glm::dvec3 highlight_color;
 
        double mass;
        double density;
@@ -127,8 +140,6 @@ private:
        Situation situation;
        Steering steering;
 
-       glm::dvec3 vel;
-
        struct Attributes {
                glm::vec3 position;
                glm::vec3 normal;