X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2Fcreature.cpp;h=5bfac3cf91939e3be417a2147657391534ff337c;hb=f6c8a486a771e876a16906f482017df5e4701255;hp=92fa36795b2cea94e40f8c395c98e5cdb59c1e83;hpb=2ab70a92ae39cebc6166ef15545ebcbd31a31c38;p=blobs.git diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp index 92fa367..5bfac3c 100644 --- a/src/creature/creature.cpp +++ b/src/creature/creature.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -46,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() { @@ -57,16 +60,27 @@ glm::dvec4 Creature::HighlightColor() const noexcept { return glm::dvec4(highlight_color, AgeLerp(CurProps().highlight, NextProps().highlight)); } -void Creature::Grow(double amount) noexcept { - const double max_mass = AgeLerp(CurProps().mass, NextProps().mass); - Mass(std::min(max_mass, mass + amount)); +void Creature::Ingest(int res, double amount) noexcept { + const Genome::Composition *cmp = nullptr; + for (const auto &c : genome.composition) { + if (c.resource == res) { + cmp = &c; + break; + } + } + if (cmp) { + const double max_mass = AgeLerp(CurProps().mass, NextProps().mass); + Mass(std::min(max_mass, mass + amount)); + } else { + // foreign material. poisonous? + } } 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(); } } @@ -89,6 +103,25 @@ double Creature::Age() const noexcept { return sim.Time() - birth; } +std::string Creature::AgeName() const { + switch (cur_prop) { + case 0: + return "Newborn"; + case 1: + return "Child"; + case 2: + return "Youth"; + case 3: + return "Adult"; + case 4: + return "Elder"; + case 5: + return "Dead"; + default: + return "Unknown"; + } +} + double Creature::AgeLerp(double from, double to) const noexcept { return glm::mix(from, to, glm::smoothstep(CurProps().age, NextProps().age, Age())); } @@ -98,7 +131,6 @@ double Creature::Fertility() const noexcept { } 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)); } @@ -112,13 +144,15 @@ bool GoalCompare(const std::unique_ptr &a, const std::unique_ptr &b) } void Creature::Tick(double dt) { - if (cur_prop < 5 && Age() > properties.props[cur_prop + 1].age) { - if (cur_prop == 4) { + if (cur_prop < 5 && Age() > NextProps().age) { + ++cur_prop; + if (cur_prop == 5) { std::cout << "[" << int(sim.Time()) << "s] " << name << " died of old age" << std::endl; Die(); } else { - ++cur_prop; + std::cout << "[" << int(sim.Time()) << "s] " + << name << " grew up to " << AgeName() << std::endl; } } @@ -130,10 +164,14 @@ 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); } @@ -153,20 +191,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; @@ -178,7 +207,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 { @@ -186,6 +220,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)); } @@ -339,6 +375,12 @@ void Spawn(Creature &c, world::Planet &p) { genome.properties.Death().fertility = { 0.0, 0.0 }; genome.properties.Death().highlight = { 0.5, 0.1 }; + genome.properties.strength = { 1.0, 0.1 }; + genome.properties.stamina = { 1.0, 0.1 }; + genome.properties.dexerty = { 1.0, 0.1 }; + genome.properties.intelligence = { 1.0, 0.1 }; + genome.properties.mutability = { 1.0, 0.1 }; + glm::dvec3 color_avg(0.0); double color_divisor = 0.0; @@ -397,6 +439,7 @@ void Genome::Configure(Creature &c) const { double mass = 0.0; double volume = 0.0; for (const auto &comp : composition) { + const world::Resource &resource = c.GetSimulation().Resources()[comp.resource]; double comp_mass = comp.mass.FakeNormal(random.SNorm()); double intake = comp.intake.FakeNormal(random.SNorm()); double penalty = comp.penalty.FakeNormal(random.SNorm()); @@ -405,10 +448,12 @@ void Genome::Configure(Creature &c) const { volume += comp_mass / c.GetSimulation().Resources()[comp.resource].density; std::unique_ptr need; - if (c.GetSimulation().Resources()[comp.resource].state == world::Resource::SOLID) { + if (resource.state == world::Resource::SOLID) { + intake *= std::atan(c.GetProperties().strength); need.reset(new IngestNeed(comp.resource, intake, penalty)); need->gain = intake * 0.05; - } else if (c.GetSimulation().Resources()[comp.resource].state == world::Resource::LIQUID) { + } else if (resource.state == world::Resource::LIQUID) { + intake *= std::atan(c.GetProperties().stamina); need.reset(new IngestNeed(comp.resource, intake, penalty)); need->gain = intake * 0.1; } else { @@ -416,7 +461,6 @@ 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->inconvenient = 0.5; need->critical = 0.95; c.AddNeed(std::move(need)); @@ -437,8 +481,8 @@ void Genome::Configure(Creature &c) const { c.Mass(c.GetProperties().props[0].mass); c.Density(mass / volume); - c.GetSteering().MaxAcceleration(1.4); - c.GetSteering().MaxSpeed(4.4); + c.GetSteering().MaxAcceleration(1.4 * std::atan(c.GetProperties().strength)); + c.GetSteering().MaxSpeed(4.4 * std::atan(c.GetProperties().dexerty)); c.AddGoal(std::unique_ptr(new IdleGoal(c))); } @@ -455,6 +499,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()); @@ -464,6 +510,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(); } @@ -575,37 +623,83 @@ void Situation::SetPlanetSurface(world::Planet &p, int srf, const glm::dvec3 &po } -Steering::Steering() -: seek_target(0.0) +Steering::Steering(const Creature &c) +: c(c) +, target(0.0) , max_accel(1.0) , max_speed(1.0) -, halting(false) -, seeking(false) { +, min_dist(0.0) +, max_look(0.0) +, separating(false) +, halting(true) +, seeking(false) +, arriving(false) { } 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; + arriving = false; } -void Steering::GoTo(const glm::dvec3 &t) noexcept { - seek_target = t; +void Steering::Pass(const glm::dvec3 &t) noexcept { + target = t; halting = false; seeking = true; + arriving = false; +} + +void Steering::GoTo(const glm::dvec3 &t) noexcept { + target = t; + halting = false; + seeking = false; + arriving = true; } glm::dvec3 Steering::Acceleration(const Situation::State &s) const noexcept { glm::dvec3 acc(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(acc, repulse); + } if (halting) { SumForce(acc, s.vel * -max_accel); } if (seeking) { - glm::dvec3 diff = seek_target - s.pos; + glm::dvec3 diff = target - s.pos; if (!allzero(diff)) { - SumForce(acc, ((normalize(diff) * max_speed) - s.vel) * max_accel); + SumForce(acc, TargetVelocity(s, (normalize(diff) * max_speed))); + } + } + 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)); } } return acc; @@ -632,5 +726,9 @@ 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; +} + } }