X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2Fcreature.cpp;h=74d5751bce5f9f413a9f111cbdd17e8a42862807;hb=27cbcf62c4608f9d3a408e903863f3f5e7e47ff0;hp=456e08102ebbb2d5cd45a7337a7f02ea508dd27f;hpb=6c1097479fd1ea41f0f76b91e67613822acf2e90;p=blobs.git diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp index 456e081..74d5751 100644 --- a/src/creature/creature.cpp +++ b/src/creature/creature.cpp @@ -5,6 +5,7 @@ #include "Situation.hpp" #include "Steering.hpp" +#include "BlobBackgroundTask.hpp" #include "Goal.hpp" #include "IdleGoal.hpp" #include "InhaleNeed.hpp" @@ -19,6 +20,7 @@ #include #include #include +#include #include #include @@ -43,11 +45,14 @@ Creature::Creature(world::Simulation &sim) , on_death() , removable(false) , memory(*this) +, bg_task() , needs() , goals() , situation() -, steering() +, steering(*this) , vao() { + // all creatures avoid each other for now + steering.Separate(0.1, 1.5); } Creature::~Creature() { @@ -77,7 +82,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(); } } @@ -124,11 +129,14 @@ double Creature::AgeLerp(double from, double to) const noexcept { } double Creature::Fertility() const noexcept { - return AgeLerp(CurProps().fertility, NextProps().fertility) / 3600.0; + return AgeLerp(CurProps().fertility, NextProps().fertility) * (1.0 / 3600.0); +} + +double Creature::Mutability() const noexcept { + return GetProperties().mutability * (1.0 / 3600.0); } void Creature::AddGoal(std::unique_ptr &&g) { - std::cout << "[" << int(sim.Time()) << "s] " << name << " new goal: " << g->Describe() << std::endl; g->Enable(); goals.emplace_back(std::move(g)); } @@ -148,6 +156,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; } } @@ -159,13 +170,19 @@ void Creature::Tick(double dt) { Situation::Derivative d(Step(c, dt)); Situation::Derivative f( (1.0 / 6.0) * (a.vel + 2.0 * (b.vel + c.vel) + d.vel), - (1.0 / 6.0) * (a.acc + 2.0 * (b.acc + c.acc) + d.acc) + (1.0 / 6.0) * (a.acc + 2.0 * (b.acc + c.acc) + d.acc), + (1.0 / 6.0) * (a.turn + 2.0 * (b.turn + c.turn) + d.turn) ); 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); } + bg_task->Tick(dt); + bg_task->Action(); memory.Tick(dt); for (auto &need : needs) { need->Tick(dt); @@ -182,20 +199,11 @@ void Creature::Tick(double dt) { } // if active goal can be interrupted, check priorities if (goals.size() > 1 && goals[0]->Interruptible()) { - Goal *old_top = &*goals[0]; std::sort(goals.begin(), goals.end(), GoalCompare); - Goal *new_top = &*goals[0]; - if (new_top != old_top) { - std::cout << "[" << int(sim.Time()) << "s] " << name - << " changing goal from " << old_top->Describe() - << " to " << new_top->Describe() << std::endl; - } } goals[0]->Action(); for (auto goal = goals.begin(); goal != goals.end();) { if ((*goal)->Complete()) { - std::cout << "[" << int(sim.Time()) << "s] " << name - << " complete goal: " << (*goal)->Describe() << std::endl; goals.erase(goal); } else { ++goal; @@ -207,7 +215,12 @@ Situation::Derivative Creature::Step(const Situation::Derivative &ds, double dt) Situation::State s = situation.GetState(); s.pos += ds.vel * dt; s.vel += ds.acc * dt; - return { s.vel, steering.Acceleration(s) }; + s.dir = normalize(s.dir + ds.turn * dt); + return { + s.vel, + steering.Acceleration(s), + allzero(s.vel) ? glm::dvec3(0.0) : normalize(s.vel) - s.dir + }; } glm::dmat4 Creature::LocalTransform() noexcept { @@ -215,6 +228,8 @@ glm::dmat4 Creature::LocalTransform() noexcept { const double half_size = size * 0.5; const glm::dvec3 &pos = situation.Position(); return glm::translate(glm::dvec3(pos.x, pos.y, pos.z + half_size)) + * glm::dmat4(world::Planet::SurfaceOrientation(situation.Surface())) + * glm::rotate(glm::orientedAngle(glm::dvec3(0.0, 0.0, -1.0), situation.Heading(), glm::dvec3(0.0, 1.0, 0.0)), glm::dvec3(0.0, 1.0, 0.0)) * glm::scale(glm::dvec3(half_size, half_size, half_size)); } @@ -354,7 +369,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 }; @@ -454,6 +469,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)); @@ -476,6 +493,7 @@ void Genome::Configure(Creature &c) const { c.Density(mass / volume); c.GetSteering().MaxAcceleration(1.4 * std::atan(c.GetProperties().strength)); c.GetSteering().MaxSpeed(4.4 * std::atan(c.GetProperties().dexerty)); + c.SetBackgroundTask(std::unique_ptr(new BlobBackgroundTask(c))); c.AddGoal(std::unique_ptr(new IdleGoal(c))); } @@ -492,6 +510,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()); @@ -501,6 +521,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(); } @@ -612,11 +634,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) { } @@ -624,6 +651,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; @@ -645,32 +682,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::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; } @@ -686,8 +740,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; } }