some tweaks

[blobs.git] / src / creature / creature.cpp

diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp
index 3066331b13b76db3019a4ca59afe5da44cb2f3b8..57c1f53f720ca6804647fdf42fa4a1bea4423602 100644 (file)
--- a/src/creature/creature.cpp
+++ b/src/creature/creature.cpp
@@ -47,8 +47,10 @@ Creature::Creature(world::Simulation &sim)
 , needs()
 , goals()
 , situation()
-, steering()
+, steering(*this)
 , vao() {
+       // all creatures avoid each other for now
+       steering.Separate(0.1, 1.5);
 }
 
 Creature::~Creature() {
@@ -78,7 +80,7 @@ void Creature::Hurt(double dt) noexcept {
        health = std::max(0.0, health - dt);
        if (health == 0.0) {
                std::cout << "[" << int(sim.Time()) << "s] "
-               << name << " died" << std::endl;
+                       << name << " died" << std::endl;
                Die();
        }
 }
@@ -129,7 +131,6 @@ double Creature::Fertility() const noexcept {
 }
 
 void Creature::AddGoal(std::unique_ptr<Goal> &&g) {
-       std::cout << "[" << int(sim.Time()) << "s] " << name << " new goal: " << g->Describe() << std::endl;
        g->Enable();
        goals.emplace_back(std::move(g));
 }
@@ -149,6 +150,9 @@ void Creature::Tick(double dt) {
                        std::cout << "[" << int(sim.Time()) << "s] "
                                << name << " died of old age" << std::endl;
                        Die();
+               } else {
+                       std::cout << "[" << int(sim.Time()) << "s] "
+                               << name << " grew up to " << AgeName() << std::endl;
                }
        }
 
@@ -166,6 +170,7 @@ void Creature::Tick(double dt) {
                state.pos += f.vel * dt;
                state.vel += f.acc * dt;
                constexpr double turn_speed = 10.0;
+               // TODO: this is crap
                state.dir = glm::normalize(state.dir + f.turn * turn_speed * dt);
                situation.SetState(state);
        }
@@ -356,7 +361,7 @@ void Spawn(Creature &c, world::Planet &p) {
        genome.properties.Youth().highlight = { 0.9, 0.1 };
 
        genome.properties.Adult().age = { 120.0, 10.0 };
-       genome.properties.Adult().mass = { 1.2, 0.1 };
+       genome.properties.Adult().mass = { 1.3, 0.1 };
        genome.properties.Adult().fertility = { 0.4, 0.01 };
        genome.properties.Adult().highlight = { 0.7, 0.1 };
 
@@ -456,6 +461,8 @@ void Genome::Configure(Creature &c) const {
                        need->gain = intake * 0.5;
                }
                need->name = c.GetSimulation().Resources()[comp.resource].label;
+               need->growth = comp.growth.FakeNormal(random.SNorm());
+               need->value = 0.4;
                need->inconvenient = 0.5;
                need->critical = 0.95;
                c.AddNeed(std::move(need));
@@ -494,6 +501,8 @@ void Split(Creature &c) {
                s.GetPlanet(), s.Surface(),
                s.Position() + glm::dvec3(0.0, a->Size() * 0.51, 0.0));
        a->BuildVAO();
+       std::cout << "[" << int(c.GetSimulation().Time()) << "s] "
+               << a->Name() << " was born" << std::endl;
 
        Creature *b = new Creature(c.GetSimulation());
        b->Name(c.GetSimulation().Assets().name.Sequential());
@@ -503,6 +512,8 @@ void Split(Creature &c) {
                s.GetPlanet(), s.Surface(),
                s.Position() + glm::dvec3(0.0, b->Size() * -0.51, 0.0));
        b->BuildVAO();
+       std::cout << "[" << int(c.GetSimulation().Time()) << "s] "
+               << b->Name() << " was born" << std::endl;
 
        c.Die();
 }
@@ -614,11 +625,16 @@ void Situation::SetPlanetSurface(world::Planet &p, int srf, const glm::dvec3 &po
 }
 
 
-Steering::Steering()
-: target(0.0)
+Steering::Steering(const Creature &c)
+: c(c)
+, target(0.0)
+, haste(0.0)
 , max_accel(1.0)
 , max_speed(1.0)
-, halting(false)
+, min_dist(0.0)
+, max_look(0.0)
+, separating(false)
+, halting(true)
 , seeking(false)
 , arriving(false) {
 }
@@ -626,6 +642,16 @@ Steering::Steering()
 Steering::~Steering() {
 }
 
+void Steering::Separate(double min_distance, double max_lookaround) noexcept {
+       separating = true;
+       min_dist = min_distance;
+       max_look = max_lookaround;
+}
+
+void Steering::DontSeparate() noexcept {
+       separating = false;
+}
+
 void Steering::Halt() noexcept {
        halting = true;
        seeking = false;
@@ -647,32 +673,49 @@ void Steering::GoTo(const glm::dvec3 &t) noexcept {
 }
 
 glm::dvec3 Steering::Acceleration(const Situation::State &s) const noexcept {
-       glm::dvec3 acc(0.0);
+       double speed = max_speed * glm::clamp(max_speed * haste * haste, 0.25, 1.0);
+       double accel = max_speed * glm::clamp(max_accel * haste * haste, 0.5, 1.0);
+       glm::dvec3 result(0.0);
+       if (separating) {
+               // TODO: off surface situation
+               glm::dvec3 repulse(0.0);
+               const Situation &s = c.GetSituation();
+               for (auto &other : s.GetPlanet().Creatures()) {
+                       if (&*other == &c) continue;
+                       glm::dvec3 diff = s.Position() - other->GetSituation().Position();
+                       if (length2(diff) > max_look * max_look) continue;
+                       double sep = length(diff) - other->Size() * 0.707 - c.Size() * 0.707;
+                       if (sep < min_dist) {
+                               repulse += normalize(diff) * (1.0 - sep / min_dist);
+                       }
+               }
+               SumForce(result, repulse, accel);
+       }
        if (halting) {
-               SumForce(acc, s.vel * -max_accel);
+               SumForce(result, s.vel * -accel, accel);
        }
        if (seeking) {
                glm::dvec3 diff = target - s.pos;
                if (!allzero(diff)) {
-                       SumForce(acc, TargetVelocity(s, (normalize(diff) * max_speed)));
+                       SumForce(result, TargetVelocity(s, (normalize(diff) * speed), accel), accel);
                }
        }
        if (arriving) {
                glm::dvec3 diff = target - s.pos;
                double dist = length(diff);
                if (!allzero(diff) && dist > std::numeric_limits<double>::epsilon()) {
-                       SumForce(acc, TargetVelocity(s, diff * std::min(dist * max_accel, max_speed) / dist));
+                       SumForce(result, TargetVelocity(s, diff * std::min(dist * accel, speed) / dist, accel), accel);
                }
        }
-       return acc;
+       return result;
 }
 
-bool Steering::SumForce(glm::dvec3 &out, const glm::dvec3 &in) const noexcept {
+bool Steering::SumForce(glm::dvec3 &out, const glm::dvec3 &in, double max) const noexcept {
        if (allzero(in) || anynan(in)) {
                return false;
        }
        double cur = allzero(out) ? 0.0 : length(out);
-       double rem = max_accel - cur;
+       double rem = max - cur;
        if (rem < 0.0) {
                return true;
        }
@@ -688,8 +731,8 @@ bool Steering::SumForce(glm::dvec3 &out, const glm::dvec3 &in) const noexcept {
        }
 }
 
-glm::dvec3 Steering::TargetVelocity(const Situation::State &s, const glm::dvec3 &vel) const noexcept {
-       return (vel - s.vel) * max_accel;
+glm::dvec3 Steering::TargetVelocity(const Situation::State &s, const glm::dvec3 &vel, double acc) const noexcept {
+       return (vel - s.vel) * acc;
 }
 
 }