X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2Fcreature.cpp;h=085d70f000554bec57537f0b419b62f474ccb3eb;hb=3989da924c4e33c52f500aead5ae62bb40294781;hp=eebd4f6f51313ba0e6a9fd7ac4155be1513f4914;hpb=d05324febdb9f67d66a03a2f716c406289a047e1;p=blobs.git

diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp
index eebd4f6..085d70f 100644
--- a/src/creature/creature.cpp
+++ b/src/creature/creature.cpp
@@ -29,9 +29,11 @@
 namespace blobs {
 namespace creature {
 
-Composition::Composition()
-: components()
-, total_mass(0.0) {
+Composition::Composition(const world::Set<world::Resource> &resources)
+: resources(resources)
+, components()
+, total_mass(0.0)
+, state_mass{0.0} {
 }
 
 Composition::~Composition() {
@@ -49,6 +51,7 @@ void Composition::Add(int res, double amount) {
 		if (c->resource == res) {
 			c->value += amount;
 			if (c->value <= 0.0) {
+				amount += c->value;
 				components.erase(c);
 			}
 			found = true;
@@ -59,6 +62,7 @@ void Composition::Add(int res, double amount) {
 		components.emplace_back(res, amount);
 	}
 	std::sort(components.begin(), components.end(), CompositionCompare);
+	state_mass[resources[res].state] += amount;
 	total_mass += amount;
 }
 
@@ -80,13 +84,46 @@ double Composition::Get(int res) const noexcept {
 	return 0.0;
 }
 
+double Composition::Proportion(int res) const noexcept {
+	return Get(res) / TotalMass();
+}
+
+double Composition::StateProportion(int res) const noexcept {
+	return Get(res) / StateMass(resources[res].state);
+}
+
+double Composition::Compatibility(int res) const noexcept {
+	if (Has(res)) {
+		return StateProportion(res);
+	}
+	double max_compat = -1.0;
+	double min_compat = 1.0;
+	for (const auto &c : components) {
+		double prop = c.value / StateMass(resources[res].state);
+		for (const auto &compat : resources[c.resource].compatibility) {
+			double value = compat.second * prop;
+			if (value > max_compat) {
+				max_compat = value;
+			}
+			if (value < min_compat) {
+				min_compat = value;
+			}
+		}
+	}
+	if (min_compat < 0.0) {
+		return min_compat;
+	} else {
+		return max_compat;
+	}
+}
+
 
 Creature::Creature(world::Simulation &sim)
 : sim(sim)
 , name()
 , genome()
 , properties()
-, composition()
+, composition(sim.Resources())
 , base_color(1.0)
 , highlight_color(0.0, 0.0, 0.0, 1.0)
 , mass(1.0)
@@ -116,8 +153,8 @@ void Creature::AddMass(int res, double amount) {
 	double nonsolid = 0.0;
 	double volume = 0.0;
 	for (const auto &c : composition) {
-		volume += c.value / sim.Assets().data.resources[c.resource].density;
-		if (sim.Assets().data.resources[c.resource].state != world::Resource::SOLID) {
+		volume += c.value / sim.Resources()[c.resource].density;
+		if (sim.Resources()[c.resource].state != world::Resource::SOLID) {
 			nonsolid += c.value;
 		}
 	}
@@ -131,13 +168,12 @@ void Creature::HighlightColor(const glm::dvec3 &c) noexcept {
 }
 
 void Creature::Ingest(int res, double amount) noexcept {
-	// TODO: check foreign materials
 	if (sim.Resources()[res].state == world::Resource::SOLID) {
-		// 15% of solids stays in body
-		AddMass(res, amount * 0.15);
+		// 30% of solids stays in body
+		AddMass(res, amount * 0.3 * composition.Compatibility(res));
 	} else {
-		// 10% of fluids stays in body
-		AddMass(res, amount * 0.05);
+		// 5% of fluids stays in body
+		AddMass(res, amount * 0.05 * composition.Compatibility(res));
 	}
 	math::GaloisLFSR &random = sim.Assets().random;
 	if (random.UNorm() < AdaptChance()) {
@@ -266,7 +302,7 @@ void Creature::AddParent(Creature &p) {
 }
 
 double Creature::Age() const noexcept {
-	return sim.Time() - birth;
+	return Dead() ? death - birth : sim.Time() - birth;
 }
 
 double Creature::AgeFactor(double peak) const noexcept {
@@ -436,14 +472,13 @@ Situation::Derivative Creature::Step(const Situation::Derivative &ds, double dt)
 	s.vel += ds.acc * dt;
 	glm::dvec3 force(steering.Force(s));
 	// gravity = antinormal * mass * Gm / r²
-	double elevation = situation.GetPlanet().DistanceAt(s.pos);
 	glm::dvec3 normal(situation.GetPlanet().NormalAt(s.pos));
 	force += glm::dvec3(
 		-normal
 		* Mass() * situation.GetPlanet().GravitationalParameter()
-		/ (elevation * elevation));
+		/ glm::length2(s.pos));
 	// if net force is applied and in contact with surface
-	if (!allzero(force) && std::abs(std::abs(elevation) - situation.GetPlanet().Radius()) < 0.001) {
+	if (!allzero(force) && glm::length2(s.pos) < (situation.GetPlanet().Radius() + 0.01) * (situation.GetPlanet().Radius() + 0.01)) {
 		// apply friction = -|normal force| * tangential force * coefficient
 		glm::dvec3 fn(normal * glm::dot(force, normal));
 		glm::dvec3 ft(force - fn);
@@ -514,7 +549,7 @@ void Creature::TickBrain(double dt) {
 	}
 }
 
-math::AABB Creature::CollisionBox() const noexcept {
+math::AABB Creature::CollisionBounds() const noexcept {
 	return { glm::dvec3(size * -0.5), glm::dvec3(size * 0.5) };
 }
 
@@ -891,6 +926,10 @@ bool Situation::OnSurface() const noexcept {
 	return type == PLANET_SURFACE;
 }
 
+bool Situation::OnGround() const noexcept {
+	return OnSurface() && glm::length2(state.pos) < (planet->Radius() + 0.05) * (planet->Radius() + 0.05);
+}
+
 glm::dvec3 Situation::SurfaceNormal() const noexcept {
 	return planet->NormalAt(state.pos);
 }
@@ -1007,8 +1046,8 @@ glm::dvec3 Steering::Force(const Situation::State &s) const noexcept {
 		result += repulse;
 	}
 	if (halting) {
-		// break twice as hard
-		result += -2.0 * s.vel * force;
+		// brake hard
+		result += -5.0 * s.vel * force;
 	}
 	if (seeking) {
 		glm::dvec3 diff = target - s.pos;
@@ -1023,6 +1062,10 @@ glm::dvec3 Steering::Force(const Situation::State &s) const noexcept {
 			result += TargetVelocity(s, diff * std::min(dist * force, speed) / dist, force);
 		}
 	}
+	// remove vertical component, if any
+	const glm::dvec3 normal(c.GetSituation().GetPlanet().NormalAt(s.pos));
+	result += normal * glm::dot(normal, result);
+	// clamp to max
 	if (glm::length2(result) > max_force * max_force) {
 		result = glm::normalize(result) * max_force;
 	}