From d364d8a9203138be1c569cdc31144f51883ec79f Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Mon, 4 Dec 2017 00:27:11 +0100 Subject: [PATCH] color mutation I don't see it --- src/creature/Creature.hpp | 5 ++- src/creature/Genome.hpp | 20 +++++++---- src/creature/creature.cpp | 76 +++++++++++++++++++++++++++++++++++---- src/creature/goal.cpp | 2 +- src/math/GaloisLFSR.hpp | 4 +++ src/ui/CreaturePanel.hpp | 2 +- src/ui/ui.cpp | 12 ++++--- 7 files changed, 101 insertions(+), 20 deletions(-) diff --git a/src/creature/Creature.hpp b/src/creature/Creature.hpp index 4d16f99..498ebea 100644 --- a/src/creature/Creature.hpp +++ b/src/creature/Creature.hpp @@ -127,12 +127,15 @@ public: double Lifetime() const noexcept; double Fertility() const noexcept; double Mutability() const noexcept; + double Adaptability() const noexcept; double OffspringMass() const noexcept; /// chance of giving birth per tick double OffspringChance() const noexcept; - /// chance of random genetic mutation per tick + /// chance of arbitrary genetic mutation per tick double MutateChance() const noexcept; + /// chance of environmental genetic mutation per tick + double AdaptChance() const noexcept; void Hurt(double d) noexcept; void Die() noexcept; diff --git a/src/creature/Genome.hpp b/src/creature/Genome.hpp index 75ca79c..1fc5c2a 100644 --- a/src/creature/Genome.hpp +++ b/src/creature/Genome.hpp @@ -22,7 +22,7 @@ struct Genome { struct Properties { /// every one of these should have at least one /// negative impact to prevent super-beings evolving - T props[8]; + T props[9]; /// power at the cost of higher solid intake T &Strength() noexcept { return props[0]; } const T &Strength() const noexcept { return props[0]; } @@ -44,9 +44,12 @@ struct Genome { /// how likely to mutate T &Mutability() noexcept { return props[6]; } const T &Mutability() const noexcept { return props[6]; } + /// how likely to adapt to new environments + T &Adaptability() noexcept { return props[7]; } + const T &Adaptability() const noexcept { return props[7]; } /// mass of offspring - T &OffspringMass() noexcept { return props[7]; } - const T &OffspringMass() const noexcept { return props[7]; } + T &OffspringMass() noexcept { return props[8]; } + const T &OffspringMass() const noexcept { return props[8]; } }; Properties properties; @@ -54,6 +57,10 @@ struct Genome { math::Distribution base_saturation; math::Distribution base_lightness; + math::Distribution highlight_hue; + math::Distribution highlight_saturation; + math::Distribution highlight_lightness; + void Configure(Creature &) const; static Properties Instantiate( @@ -66,9 +73,10 @@ struct Genome { p.props[2].FakeNormal(rand.SNorm()), p.props[3].FakeNormal(rand.SNorm()), p.props[4].FakeNormal(rand.SNorm()), - p.props[5].FakeNormal(rand.SNorm()), - p.props[6].FakeNormal(rand.SNorm()), - p.props[7].FakeNormal(rand.SNorm()) + glm::clamp(p.props[5].FakeNormal(rand.SNorm()), 0.0, 1.0), + glm::clamp(p.props[6].FakeNormal(rand.SNorm()), 0.0, 1.0), + glm::clamp(p.props[7].FakeNormal(rand.SNorm()), 0.0, 1.0), + p.props[8].FakeNormal(rand.SNorm()) }; } diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp index 9ef8dd9..de82f86 100644 --- a/src/creature/creature.cpp +++ b/src/creature/creature.cpp @@ -139,6 +139,57 @@ void Creature::Ingest(int res, double amount) noexcept { // 10% of fluids stays in body AddMass(res, amount * 0.05); } + math::GaloisLFSR &random = sim.Assets().random; + if (random.UNorm() < AdaptChance()) { + // change color to be slightly more like resource + glm::dvec3 color(rgb2hsl(sim.Resources()[res].base_color)); + // solids affect base color, others highlight + double p = sim.Resources()[res].state == world::Resource::SOLID ? 0 : 1; + double q = random.UInt(3); // hue, sat, or val + double r = random.UInt(2); // mean or deviation + math::Distribution *d = nullptr; + double ref = 0.0; + if (p == 0) { + if (q == 0) { + d = &genome.base_hue; + ref = color.x; + } else if (q == 1) { + d = &genome.base_saturation; + ref = color.y; + } else { + d = &genome.base_lightness; + ref = color.z; + } + } else { + if (q == 0) { + d = &genome.highlight_hue; + ref = color.x; + } else if (q == 1) { + d = &genome.highlight_saturation; + ref = color.y; + } else { + d = &genome.highlight_lightness; + ref = color.z; + } + } + if (r == 0) { + double diff = ref - d->Mean(); + if (q == 0) { + if (diff < -0.5) { + diff += 1.0; + } else if (diff > 0.5) { + diff -= 1.0; + } + // move ±15% of distance + d->Mean(std::fmod(d->Mean() + diff * random.SNorm() * 0.15, 1.0)); + } else { + d->Mean(glm::clamp(d->Mean() + diff * random.SNorm() * 0.15, 0.0, 1.0)); + } + } else { + // scale by ±15%, enforce bounds + d->StandardDeviation(glm::clamp(d->StandardDeviation() * (1.0 + random.SNorm() * 0.15), 0.0001, 0.5)); + } + } } void Creature::DoWork(double amount) noexcept { @@ -256,6 +307,10 @@ double Creature::Mutability() const noexcept { return properties.Mutability(); } +double Creature::Adaptability() const noexcept { + return properties.Adaptability(); +} + double Creature::OffspringMass() const noexcept { return properties.OffspringMass(); } @@ -268,6 +323,10 @@ double Creature::MutateChance() const noexcept { return GetProperties().Mutability() * (1.0 / 3600.0); } +double Creature::AdaptChance() const noexcept { + return GetProperties().Adaptability() * (1.0 / 120.0); +} + void Creature::AddGoal(std::unique_ptr &&g) { g->Enable(); goals.emplace_back(std::move(g)); @@ -546,7 +605,8 @@ void Spawn(Creature &c, world::Planet &p) { genome.properties.Intelligence() = { 1.0, 0.1 }; genome.properties.Lifetime() = { 480.0, 60.0 }; genome.properties.Fertility() = { 0.5, 0.03 }; - genome.properties.Mutability() = { 1.0, 0.1 }; + genome.properties.Mutability() = { 0.9, 0.1 }; + genome.properties.Adaptability() = { 0.9, 0.1 }; genome.properties.OffspringMass() = { 0.3, 0.02 }; glm::dvec3 color_avg(0.0); @@ -575,6 +635,10 @@ void Spawn(Creature &c, world::Planet &p) { genome.base_hue = { hsl.x, 0.01 }; genome.base_saturation = { hsl.y, 0.01 }; genome.base_lightness = { hsl.z, 0.01 }; + // use opposite color as start highlight + genome.highlight_hue = { std::fmod(hsl.x + 0.5, 1.0), 0.01 }; + genome.highlight_saturation = { 1.0 - hsl.y, 0.01 }; + genome.highlight_lightness = { 1.0 - hsl.z, 0.01 }; genome.Configure(c); } @@ -601,9 +665,9 @@ void Genome::Configure(Creature &c) const { glm::clamp(base_lightness.FakeNormal(random.SNorm()), 0.0, 1.0) ); glm::dvec3 highlight_color( - std::fmod(base_color.x + 0.5, 1.0), - 1.0 - base_color.y, - 1.0 - base_color.z + std::fmod(highlight_hue.FakeNormal(random.SNorm()) + 1.0, 1.0), + glm::clamp(highlight_saturation.FakeNormal(random.SNorm()), 0.0, 1.0), + glm::clamp(highlight_lightness.FakeNormal(random.SNorm()), 0.0, 1.0) ); c.BaseColor(hsl2rgb(base_color)); c.HighlightColor(hsl2rgb(highlight_color)); @@ -732,9 +796,9 @@ bool Situation::OnSurface() const noexcept { } bool Situation::OnTile() const noexcept { + if (type != PLANET_SURFACE) return false; glm::ivec2 t(planet->SurfacePosition(surface, state.pos)); - return type == PLANET_SURFACE - && t.x >= 0 && t.x < planet->SideLength() + return t.x >= 0 && t.x < planet->SideLength() && t.y >= 0 && t.y < planet->SideLength(); } diff --git a/src/creature/goal.cpp b/src/creature/goal.cpp index 82ec757..a4f3330 100644 --- a/src/creature/goal.cpp +++ b/src/creature/goal.cpp @@ -111,7 +111,7 @@ void BlobBackgroundTask::CheckMutate() { // check for random property mutation if (GetCreature().MutateChance() > Assets().random.UNorm()) { double amount = 1.0 + (Assets().random.SNorm() * 0.05); - math::Distribution &d = GetCreature().GetGenome().properties.props[(int(Assets().random.UNorm() * 8.0) % 8)]; + math::Distribution &d = GetCreature().GetGenome().properties.props[Assets().random.UInt(9)]; if (Assets().random.UNorm() < 0.5) { d.Mean(d.Mean() * amount); } else { diff --git a/src/math/GaloisLFSR.hpp b/src/math/GaloisLFSR.hpp index d380e24..e2f39eb 100644 --- a/src/math/GaloisLFSR.hpp +++ b/src/math/GaloisLFSR.hpp @@ -63,6 +63,10 @@ public: return double(Next()) * (1.0 / double(std::numeric_limits::max())); } + unsigned int UInt(unsigned int below) noexcept { + return ((unsigned int)(UNorm() * double(below))) % below; + } + template typename Container::reference From(Container &c) { assert(c.size() > 0); diff --git a/src/ui/CreaturePanel.hpp b/src/ui/CreaturePanel.hpp index 573804d..92e81be 100644 --- a/src/ui/CreaturePanel.hpp +++ b/src/ui/CreaturePanel.hpp @@ -55,7 +55,7 @@ private: Panel *composition; std::vector