From b03c2f42ba325ab909b159a4bc8e7568defdc4c5 Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Thu, 30 Nov 2017 12:30:45 +0100 Subject: [PATCH] some tweaks --- src/creature/Steering.hpp | 9 +++++++-- src/creature/creature.cpp | 26 +++++++++++++++----------- src/creature/goal.cpp | 19 ++++++++++++------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/creature/Steering.hpp b/src/creature/Steering.hpp index 470031d..d8f2ceb 100644 --- a/src/creature/Steering.hpp +++ b/src/creature/Steering.hpp @@ -17,6 +17,10 @@ public: ~Steering(); public: + /// factor in [0,1] of how fast you need to get there + void Haste(double h) noexcept { haste = h; } + double Haste() const noexcept { return haste; } + void MaxAcceleration(double a) noexcept { max_accel = a; } double MaxAcceleration() const noexcept { return max_accel; } @@ -33,13 +37,14 @@ public: glm::dvec3 Acceleration(const Situation::State &) const noexcept; private: - bool SumForce(glm::dvec3 &out, const glm::dvec3 &in) const noexcept; - glm::dvec3 TargetVelocity(const Situation::State &, const glm::dvec3 &) const noexcept; + bool SumForce(glm::dvec3 &out, const glm::dvec3 &in, double max) const noexcept; + glm::dvec3 TargetVelocity(const Situation::State &, const glm::dvec3 &, double acc) const noexcept; private: const Creature &c; glm::dvec3 target; + double haste; double max_accel; double max_speed; double min_dist; diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp index e736d52..57c1f53 100644 --- a/src/creature/creature.cpp +++ b/src/creature/creature.cpp @@ -361,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 }; @@ -461,6 +461,7 @@ 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; @@ -627,6 +628,7 @@ void Situation::SetPlanetSurface(world::Planet &p, int srf, const glm::dvec3 &po Steering::Steering(const Creature &c) : c(c) , target(0.0) +, haste(0.0) , max_accel(1.0) , max_speed(1.0) , min_dist(0.0) @@ -671,7 +673,9 @@ 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); @@ -685,33 +689,33 @@ glm::dvec3 Steering::Acceleration(const Situation::State &s) const noexcept { repulse += normalize(diff) * (1.0 - sep / min_dist); } } - SumForce(acc, repulse); + 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::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; } @@ -727,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; } } diff --git a/src/creature/goal.cpp b/src/creature/goal.cpp index 95a3426..daf8f90 100644 --- a/src/creature/goal.cpp +++ b/src/creature/goal.cpp @@ -88,12 +88,15 @@ void IdleGoal::Tick(double dt) { } void IdleGoal::Action() { - double fert = GetCreature().Fertility(); - double rand = Assets().random.UNorm(); - if (fert > rand) { - std::cout << "[" << int(GetCreature().GetSimulation().Time()) - << "s] " << GetCreature().Name() << " split" << std::endl; - Split(GetCreature()); + // check if eligible to split + if (GetCreature().Mass() > GetCreature().GetProperties().Birth().mass * 1.8) { + double fert = GetCreature().Fertility(); + double rand = Assets().random.UNorm(); + if (fert > rand) { + std::cout << "[" << int(GetCreature().GetSimulation().Time()) + << "s] " << GetCreature().Name() << " split" << std::endl; + Split(GetCreature()); + } } } @@ -147,6 +150,7 @@ void LocateResourceGoal::Action() { } else { GetSteering().GoTo(target_pos); } + GetSteering().Haste(Urgency()); } void LocateResourceGoal::LocateResource() { @@ -190,7 +194,7 @@ void LocateResourceGoal::SearchVicinity() { if (yield != type.resources.cend()) { // TODO: subtract minimum yield rating[y - begin.y][x - begin.x] = yield->ubiquity; - double dist = 1.0 - 0.25 * glm::length2(planet.TileCenter(srf, x, y) - pos); + double dist = std::max(0.125, 0.25 * glm::length(planet.TileCenter(srf, x, y) - pos)); rating[y - begin.y][x - begin.x] /= dist; } } @@ -233,6 +237,7 @@ void LocateResourceGoal::SearchVicinity() { target_pos[(srf + 1) % 3] += Assets().random.SNorm(); // bias towards current direction target_pos += glm::normalize(GetSituation().Velocity()) * 0.5; + target_pos = clamp(target_pos, -planet.Radius(), planet.Radius()); GetSteering().GoTo(target_pos); } } -- 2.39.2