From: Daniel Karbach Date: Sun, 3 Dec 2017 18:00:02 +0000 (+0100) Subject: track a few things X-Git-Url: http://git.localhorst.tv/?p=blobs.git;a=commitdiff_plain;h=392826deaf802ac0960ed3924a3f98b9d18d381b track a few things --- diff --git a/src/app/MasterState.hpp b/src/app/MasterState.hpp index 24a29e6..8290e86 100644 --- a/src/app/MasterState.hpp +++ b/src/app/MasterState.hpp @@ -6,6 +6,8 @@ #include "Assets.hpp" #include "../graphics/Camera.hpp" #include "../ui/CreaturePanel.hpp" +#include "../ui/RecordsPanel.hpp" +#include "../ui/TimePanel.hpp" namespace blobs { @@ -35,6 +37,12 @@ public: ui::CreaturePanel &GetCreaturePanel() noexcept { return cp; } const ui::CreaturePanel &GetCreaturePanel() const noexcept { return cp; } + ui::RecordsPanel &GetRecordsPanel() noexcept { return rp; } + const ui::RecordsPanel &GetRecordsPanel() const noexcept { return rp; } + + ui::TimePanel &GetTimePanel() noexcept { return tp; } + const ui::TimePanel &GetTimePanel() const noexcept { return tp; } + private: void OnResize(int w, int h) override; @@ -61,6 +69,8 @@ private: bool cam_dragging; ui::CreaturePanel cp; + ui::RecordsPanel rp; + ui::TimePanel tp; int remain; int thirds; diff --git a/src/app/states.cpp b/src/app/states.cpp index 49ee8e2..4951c9f 100644 --- a/src/app/states.cpp +++ b/src/app/states.cpp @@ -24,6 +24,8 @@ MasterState::MasterState(Assets &assets, world::Simulation &sim) noexcept , cam_orient(PI * 0.375, PI * 0.25, 0.0) , cam_dragging(false) , cp(assets) +, rp(sim) +, tp(sim) , remain(0) , thirds(0) , paused(false) { @@ -192,7 +194,9 @@ void MasterState::OnRender(graphics::Viewport &viewport) { } viewport.ClearDepth(); - cp.Draw(assets, viewport); + cp.Draw(viewport); + rp.Draw(viewport); + tp.Draw(viewport); } } diff --git a/src/blobs.cpp b/src/blobs.cpp index 9a94b96..d6a6fed 100644 --- a/src/blobs.cpp +++ b/src/blobs.cpp @@ -115,6 +115,7 @@ int main(int argc, char *argv[]) { // .Orbital(glm::vec3(-500.0f, 500.0f, 500.0f)) //; state.GetCreaturePanel().Show(*blob); + state.GetTimePanel().SetBody(planet); app::Application app(init.window, init.viewport); SwitchPanel swp(planet, app, state); diff --git a/src/creature/Composition.hpp b/src/creature/Composition.hpp index 06b1c74..621f640 100644 --- a/src/creature/Composition.hpp +++ b/src/creature/Composition.hpp @@ -31,8 +31,10 @@ public: void Add(int res, double amount); bool Has(int res) const noexcept; double Get(int res) const noexcept; + double TotalMass() const noexcept { return total_mass; } public: + std::vector::size_type size() const noexcept { return components.size(); } std::vector::iterator begin() noexcept { return components.begin(); } std::vector::iterator end() noexcept { return components.end(); } std::vector::const_iterator begin() const noexcept { return components.begin(); } @@ -42,6 +44,7 @@ public: private: std::vector components; + double total_mass; }; diff --git a/src/creature/Creature.hpp b/src/creature/Creature.hpp index 1371687..3f86670 100644 --- a/src/creature/Creature.hpp +++ b/src/creature/Creature.hpp @@ -134,8 +134,12 @@ public: void Hurt(double d) noexcept; void Die() noexcept; void OnDeath(Callback cb) noexcept { on_death = cb; } - void Remove() noexcept { removable = true; } + void Remove() noexcept; bool Removable() const noexcept { return removable; } + void Removed() noexcept; + + void AddParent(Creature &); + const std::vector &Parents() const noexcept { return parents; } Stats &GetStats() noexcept { return stats; } const Stats &GetStats() const noexcept { return stats; } @@ -164,6 +168,7 @@ public: glm::dmat4 LocalTransform() noexcept; void BuildVAO(); + void KillVAO(); void Draw(graphics::Viewport &); private: @@ -187,9 +192,12 @@ private: double size; double birth; + double death; Callback on_death; bool removable; + std::vector parents; + Stats stats; Memory memory; @@ -204,7 +212,7 @@ private: glm::vec3 normal; glm::vec3 texture; }; - graphics::SimpleVAO vao; + std::unique_ptr> vao; }; diff --git a/src/creature/Memory.hpp b/src/creature/Memory.hpp index a6910cc..3bc3908 100644 --- a/src/creature/Memory.hpp +++ b/src/creature/Memory.hpp @@ -30,6 +30,8 @@ public: public: void Tick(double dt); + void Erase(); + private: /// track time spent on a tile void TrackStay(const Location &, double t); diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp index b95b531..fb6e9f6 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() { @@ -54,6 +56,7 @@ void Composition::Add(int res, double amount) { components.emplace_back(res, amount); } std::sort(components.begin(), components.end(), CompositionCompare); + total_mass += amount; } bool Composition::Has(int res) const noexcept { @@ -86,8 +89,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 +100,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 +110,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 +129,19 @@ 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::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 +153,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 +171,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; } @@ -391,17 +392,18 @@ glm::dmat4 Creature::LocalTransform() noexcept { } 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; @@ -448,10 +450,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; @@ -469,12 +471,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); } @@ -585,6 +592,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()) { @@ -596,10 +604,11 @@ void Split(Creature &c) { s.GetPlanet(), s.Surface(), 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()) { @@ -610,7 +619,7 @@ void Split(Creature &c) { s.GetPlanet(), s.Surface(), 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(); @@ -624,6 +633,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()) { diff --git a/src/creature/goal.cpp b/src/creature/goal.cpp index 06a689f..f3e0891 100644 --- a/src/creature/goal.cpp +++ b/src/creature/goal.cpp @@ -37,8 +37,16 @@ std::string BlobBackgroundTask::Describe() const { void BlobBackgroundTask::Tick(double dt) { if (breathing) { // TODO: derive breathing ability + int gas = Assets().data.resources["air"].id; + // TODO: check if in compatible atmosphere double amount = GetCreature().GetStats().Breath().gain * -(1.5 + 0.5 * GetCreature().ExhaustionFactor()); GetCreature().GetStats().Breath().Add(amount * dt); + // maintain ~2.5% gas composition + double gas_amount = GetCreature().GetComposition().Get(gas); + if (gas_amount < GetCreature().GetComposition().TotalMass() * 0.025) { + double add = std::min(GetCreature().GetComposition().TotalMass() * 0.025 - gas_amount, -amount * dt); + GetCreature().Ingest(gas, add); + } if (GetCreature().GetStats().Breath().Empty()) { breathing = false; } diff --git a/src/ui/CreaturePanel.hpp b/src/ui/CreaturePanel.hpp index 967e039..573804d 100644 --- a/src/ui/CreaturePanel.hpp +++ b/src/ui/CreaturePanel.hpp @@ -3,6 +3,8 @@ #include "Panel.hpp" +#include + namespace blobs { namespace app { @@ -22,7 +24,7 @@ class Meter; class CreaturePanel { public: - explicit CreaturePanel(const app::Assets &); + explicit CreaturePanel(app::Assets &); ~CreaturePanel(); CreaturePanel(const CreaturePanel &) = delete; @@ -38,24 +40,20 @@ public: bool Shown() const noexcept { return c; } const creature::Creature &GetCreature() const noexcept { return *c; } - void Draw(app::Assets &, graphics::Viewport &) noexcept; - -private: - void CreateNeeds(); + void Draw(graphics::Viewport &) noexcept; private: - const app::Assets &assets; + app::Assets &assets; creature::Creature *c; Label *name; + Label *parents; Label *born; Label *age; Label *mass; - Label *pos; - Label *vel; - Label *dir; - Label *tile; Label *goal; + Panel *composition; + std::vector