X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2Fcreature.cpp;h=9ef8dd9d3148f691160f5effaf5e80974133d68f;hb=a1b5d6dbc13d185b9ac459e421ae44b3ef8ce133;hp=ccd174db221548dfb9a7def3825d54d4b5d13792;hpb=fbbee4cf7bd6f41139c2298c41d29b87401e6cf6;p=blobs.git diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp index ccd174d..9ef8dd9 100644 --- a/src/creature/creature.cpp +++ b/src/creature/creature.cpp @@ -11,6 +11,7 @@ #include "IdleGoal.hpp" #include "../app/Assets.hpp" #include "../math/const.hpp" +#include "../ui/string.hpp" #include "../world/Body.hpp" #include "../world/Planet.hpp" #include "../world/Simulation.hpp" @@ -29,7 +30,8 @@ namespace blobs { namespace creature { Composition::Composition() -: components() { +: components() +, total_mass(0.0) { } Composition::~Composition() { @@ -43,17 +45,21 @@ bool CompositionCompare(const Composition::Component &a, const Composition::Comp void Composition::Add(int res, double amount) { bool found = false; - for (auto &c : components) { - if (c.resource == res) { - c.value += amount; + for (auto c = components.begin(); c != components.end(); ++c) { + if (c->resource == res) { + c->value += amount; + if (c->value <= 0.0) { + components.erase(c); + } found = true; break; } } - if (!found) { + if (!found && amount > 0.0) { components.emplace_back(res, amount); } std::sort(components.begin(), components.end(), CompositionCompare); + total_mass += amount; } bool Composition::Has(int res) const noexcept { @@ -86,8 +92,10 @@ Creature::Creature(world::Simulation &sim) , mass(1.0) , size(1.0) , birth(sim.Time()) +, death(0.0) , on_death() , removable(false) +, parents() , stats() , memory(*this) , bg_task() @@ -95,6 +103,7 @@ Creature::Creature(world::Simulation &sim) , situation() , steering(*this) , vao() { + sim.SetAlive(this); // all creatures avoid each other for now steering.Separate(0.1, 1.5); } @@ -104,19 +113,17 @@ Creature::~Creature() { void Creature::AddMass(int res, double amount) { composition.Add(res, amount); - double mass = 0.0; double nonsolid = 0.0; double volume = 0.0; for (const auto &c : composition) { - mass += c.value; volume += c.value / sim.Assets().data.resources[c.resource].density; if (sim.Assets().data.resources[c.resource].state != world::Resource::SOLID) { nonsolid += c.value; } } - Mass(mass); + Mass(composition.TotalMass()); Size(std::cbrt(volume)); - highlight_color.a = nonsolid / mass; + highlight_color.a = nonsolid / composition.TotalMass(); } void Creature::HighlightColor(const glm::dvec3 &c) noexcept { @@ -125,14 +132,33 @@ void Creature::HighlightColor(const glm::dvec3 &c) noexcept { void Creature::Ingest(int res, double amount) noexcept { // TODO: check foreign materials - // 10% stays in body - AddMass(res, amount * 0.1); + if (sim.Resources()[res].state == world::Resource::SOLID) { + // 15% of solids stays in body + AddMass(res, amount * 0.15); + } else { + // 10% of fluids stays in body + AddMass(res, amount * 0.05); + } +} + +void Creature::DoWork(double amount) noexcept { + stats.Exhaustion().Add(amount / Stamina()); + // burn resources proportional to composition + // factor = 1/total * 1/efficiency * amount * -1 + double factor = -amount / (composition.TotalMass() * EnergyEfficiency()); + // make a copy to total remains constant and + // no entries disappear during iteration + Composition comp(composition); + for (auto &cmp : comp) { + double value = cmp.value * factor * sim.Resources()[cmp.resource].inverse_energy; + AddMass(cmp.resource, value); + } } void Creature::Hurt(double amount) noexcept { stats.Damage().Add(amount); if (stats.Damage().Full()) { - std::cout << "[" << int(sim.Time()) << "s] " << name << " "; + std::cout << "[" << ui::TimeString(sim.Time()) << "] " << name << " "; if (stats.Exhaustion().Full()) { std::cout << "died of exhaustion"; } else if (stats.Breath().Full()) { @@ -144,40 +170,17 @@ void Creature::Hurt(double amount) noexcept { } else { std::cout << "succumed to wounds"; } - std::cout << " at an age of "; - { - int age = int(Age()); - if (age >= 3600) { - std::cout << (age / 3600) << "h "; - age %= 3600; - } - if (age >= 60) { - std::cout << (age / 60) << "m "; - age %= 60; - } - std::cout << age << 's'; - } - std::cout << " (" << int(Age() / properties.Lifetime() * 100) - << "% of life expectancy of "; - { - int lt = int(properties.Lifetime()); - if (lt >= 3600) { - std::cout << (lt / 3600) << "h "; - lt %= 3600; - } - if (lt >= 60) { - std::cout << (lt / 60) << "m "; - lt %= 60; - } - std::cout << lt << 's'; - } - std::cout << ")" << std::endl; + std::cout << " at an age of " << ui::TimeString(Age()) + << " (" << ui::PercentageString(Age() / properties.Lifetime()) + << "% of life expectancy of " << ui::TimeString(properties.Lifetime()) + << ")" << std::endl; Die(); } } void Creature::Die() noexcept { - goals.clear(); + sim.SetDead(this); + death = sim.Time(); steering.Halt(); if (on_death) { on_death(*this); @@ -185,6 +188,21 @@ void Creature::Die() noexcept { Remove(); } +void Creature::Remove() noexcept { + removable = true; +} + +void Creature::Removed() noexcept { + bg_task.reset(); + goals.clear(); + memory.Erase(); + KillVAO(); +} + +void Creature::AddParent(Creature &p) { + parents.push_back(&p); +} + double Creature::Age() const noexcept { return sim.Time() - birth; } @@ -193,7 +211,12 @@ double Creature::AgeFactor(double peak) const noexcept { // shifted inverse hermite, y = 1 - (3t² - 2t³) with t = normalized age - peak // goes negative below -0.5 and starts to rise again above 1.0 double t = glm::clamp((Age() / properties.Lifetime()) - peak, -0.5, 1.0); - return 1.0 - (3.0 * t * t) + (2.0 * t * t * t); + // guarantee at least 1% + return std::max(0.01, 1.0 - (3.0 * t * t) + (2.0 * t * t * t)); +} + +double Creature::EnergyEfficiency() const noexcept { + return 0.25 * AgeFactor(0.05); } double Creature::ExhaustionFactor() const noexcept { @@ -278,10 +301,11 @@ void Creature::TickState(double dt) { ); state.pos += f.vel * dt; state.vel += f.acc * dt; + situation.EnforceConstraints(state); if (length2(state.vel) > 0.000001) { glm::dvec3 nvel(normalize(state.vel)); double ang = angle(nvel, state.dir); - double turn_rate = PI * 0.5 * dt; + double turn_rate = PI * 0.75 * dt; if (ang < turn_rate) { state.dir = normalize(state.vel); } else if (std::abs(ang - PI) < 0.001) { @@ -291,16 +315,34 @@ void Creature::TickState(double dt) { } } situation.SetState(state); - stats.Exhaustion().Add(length(f.acc) * Mass() / Stamina() * dt); + // work is force times distance + DoWork(length(f.acc) * Mass() * length(f.vel) * dt); } Situation::Derivative Creature::Step(const Situation::Derivative &ds, double dt) const noexcept { Situation::State s = situation.GetState(); s.pos += ds.vel * dt; s.vel += ds.acc * dt; + glm::dvec3 force(steering.Force(s)); + // gravity = antinormal * mass * Gm / r² + double elevation = s.pos[(situation.Surface() + 2) % 3]; + glm::dvec3 normal(world::Planet::SurfaceNormal(situation.Surface())); + force += glm::dvec3( + -normal + * Mass() * situation.GetPlanet().GravitationalParameter() + / (elevation * elevation)); + // if net force is applied and in contact with surface + if (!allzero(force) && std::abs(std::abs(elevation) - situation.GetPlanet().Radius()) < 0.001) { + // apply friction = -|normal force| * tangential force * coefficient + glm::dvec3 fn(normal * dot(force, normal)); + glm::dvec3 ft(force - fn); + double u = 0.4; + glm::dvec3 friction(-length(fn) * ft * u); + force += friction; + } return { s.vel, - steering.Force(s) / Mass() + force / Mass() }; } @@ -322,6 +364,10 @@ void Creature::TickStats(double dt) { constexpr double dps = 1.0 / 128.0; Hurt(dps * dt); } + if (!situation.Moving()) { + // double exhaustion recovery when standing still + stats.Exhaustion().Add(stats.Exhaustion().gain * dt); + } } void Creature::TickBrain(double dt) { @@ -349,28 +395,38 @@ void Creature::TickBrain(double dt) { } } -glm::dmat4 Creature::LocalTransform() noexcept { +math::AABB Creature::CollisionBox() const noexcept { + return { glm::dvec3(size * -0.5), glm::dvec3(size * 0.5) }; +} + +glm::dmat4 Creature::CollisionTransform() const noexcept { const double half_size = size * 0.5; const glm::dvec3 &pos = situation.Position(); const glm::dmat3 srf(world::Planet::SurfaceOrientation(situation.Surface())); return glm::translate(glm::dvec3(pos.x, pos.y, pos.z + half_size)) * glm::rotate(glm::orientedAngle(-srf[2], situation.Heading(), srf[1]), srf[1]) - * glm::dmat4(srf) + * glm::dmat4(srf); +} + +glm::dmat4 Creature::LocalTransform() noexcept { + const double half_size = size * 0.5; + return CollisionTransform() * glm::scale(glm::dvec3(half_size, half_size, half_size)); } void Creature::BuildVAO() { - vao.Bind(); - vao.BindAttributes(); - vao.EnableAttribute(0); - vao.EnableAttribute(1); - vao.EnableAttribute(2); - vao.AttributePointer(0, false, offsetof(Attributes, position)); - vao.AttributePointer(1, false, offsetof(Attributes, normal)); - vao.AttributePointer(2, false, offsetof(Attributes, texture)); - vao.ReserveAttributes(6 * 4, GL_STATIC_DRAW); + vao.reset(new graphics::SimpleVAO); + vao->Bind(); + vao->BindAttributes(); + vao->EnableAttribute(0); + vao->EnableAttribute(1); + vao->EnableAttribute(2); + vao->AttributePointer(0, false, offsetof(Attributes, position)); + vao->AttributePointer(1, false, offsetof(Attributes, normal)); + vao->AttributePointer(2, false, offsetof(Attributes, texture)); + vao->ReserveAttributes(6 * 4, GL_STATIC_DRAW); { - auto attrib = vao.MapAttributes(GL_WRITE_ONLY); + auto attrib = vao->MapAttributes(GL_WRITE_ONLY); const float offset = 1.0f; for (int surface = 0; surface < 6; ++surface) { const float tex_u_begin = surface < 3 ? 1.0f : 0.0f; @@ -417,10 +473,10 @@ void Creature::BuildVAO() { attrib[4 * surface + 3].texture.z = surface; } } - vao.BindElements(); - vao.ReserveElements(6 * 6, GL_STATIC_DRAW); + vao->BindElements(); + vao->ReserveElements(6 * 6, GL_STATIC_DRAW); { - auto element = vao.MapElements(GL_WRITE_ONLY); + auto element = vao->MapElements(GL_WRITE_ONLY); for (int surface = 0; surface < 3; ++surface) { element[6 * surface + 0] = 4 * surface + 0; element[6 * surface + 1] = 4 * surface + 2; @@ -438,12 +494,17 @@ void Creature::BuildVAO() { element[6 * surface + 5] = 4 * surface + 3; } } - vao.Unbind(); + vao->Unbind(); +} + +void Creature::KillVAO() { + vao.reset(); } void Creature::Draw(graphics::Viewport &viewport) { - vao.Bind(); - vao.DrawTriangles(6 * 6); + if (!vao) return; + vao->Bind(); + vao->DrawTriangles(6 * 6); } @@ -480,7 +541,7 @@ void Spawn(Creature &c, world::Planet &p) { Genome genome; genome.properties.Strength() = { 2.0, 0.1 }; - genome.properties.Stamina() = { 4.0, 0.1 }; + genome.properties.Stamina() = { 2.0, 0.1 }; genome.properties.Dexerty() = { 2.0, 0.1 }; genome.properties.Intelligence() = { 1.0, 0.1 }; genome.properties.Lifetime() = { 480.0, 60.0 }; @@ -554,6 +615,7 @@ void Genome::Configure(Creature &c) const { void Split(Creature &c) { Creature *a = new Creature(c.GetSimulation()); const Situation &s = c.GetSituation(); + a->AddParent(c); a->Name(c.GetSimulation().Assets().name.Sequential()); c.GetGenome().Configure(*a); for (const auto &cmp : c.GetComposition()) { @@ -563,12 +625,13 @@ void Split(Creature &c) { // TODO: duplicate situation somehow a->GetSituation().SetPlanetSurface( s.GetPlanet(), s.Surface(), - s.Position() + glm::dvec3(0.0, a->Size() + 0.1, 0.0)); + s.Position() + glm::dvec3(0.0, 0.55 * a->Size(), 0.0)); a->BuildVAO(); - std::cout << "[" << int(c.GetSimulation().Time()) << "s] " + std::cout << "[" << ui::TimeString(c.GetSimulation().Time()) << "] " << a->Name() << " was born" << std::endl; Creature *b = new Creature(c.GetSimulation()); + b->AddParent(c); b->Name(c.GetSimulation().Assets().name.Sequential()); c.GetGenome().Configure(*b); for (const auto &cmp : c.GetComposition()) { @@ -577,9 +640,9 @@ void Split(Creature &c) { s.GetPlanet().AddCreature(b); b->GetSituation().SetPlanetSurface( s.GetPlanet(), s.Surface(), - s.Position() + glm::dvec3(0.0, b->Size() - 0.1, 0.0)); + s.Position() - glm::dvec3(0.0, 0.55 * b->Size(), 0.0)); b->BuildVAO(); - std::cout << "[" << int(c.GetSimulation().Time()) << "s] " + std::cout << "[" << ui::TimeString(c.GetSimulation().Time()) << "] " << b->Name() << " was born" << std::endl; c.Die(); @@ -593,6 +656,10 @@ Memory::Memory(Creature &c) Memory::~Memory() { } +void Memory::Erase() { + known_types.clear(); +} + void Memory::Tick(double dt) { Situation &s = c.GetSituation(); if (s.OnTile()) { @@ -687,12 +754,26 @@ const world::TileType &Situation::GetTileType() const noexcept { void Situation::Move(const glm::dvec3 &dp) noexcept { state.pos += dp; + EnforceConstraints(state); +} + +void Situation::Accelerate(const glm::dvec3 &dv) noexcept { + state.vel += dv; + EnforceConstraints(state); +} + +void Situation::EnforceConstraints(State &s) noexcept { if (OnSurface()) { - // enforce ground constraint if (Surface() < 3) { - state.pos[(Surface() + 2) % 3] = std::max(0.0, state.pos[(Surface() + 2) % 3]); + if (s.pos[(Surface() + 2) % 3] < GetPlanet().Radius()) { + s.pos[(Surface() + 2) % 3] = GetPlanet().Radius(); + s.vel[(Surface() + 2) % 3] = std::max(0.0, s.vel[(Surface() + 2) % 3]); + } } else { - state.pos[(Surface() + 2) % 3] = std::min(0.0, state.pos[(Surface() + 2) % 3]); + if (s.pos[(Surface() + 2) % 3] > -GetPlanet().Radius()) { + s.pos[(Surface() + 2) % 3] = -GetPlanet().Radius(); + s.vel[(Surface() + 2) % 3] = std::min(0.0, s.vel[(Surface() + 2) % 3]); + } } } } @@ -702,6 +783,7 @@ void Situation::SetPlanetSurface(world::Planet &p, int srf, const glm::dvec3 &po planet = &p; surface = srf; state.pos = pos; + EnforceConstraints(state); } @@ -733,7 +815,7 @@ void Steering::DontSeparate() noexcept { } void Steering::ResumeSeparate() noexcept { - separating = false; + separating = true; } void Steering::Halt() noexcept { @@ -776,7 +858,8 @@ glm::dvec3 Steering::Force(const Situation::State &s) const noexcept { SumForce(result, repulse, force); } if (halting) { - SumForce(result, s.vel * -force, force); + // break twice as hard + SumForce(result, s.vel * force * -2.0, force); } if (seeking) { glm::dvec3 diff = target - s.pos;