X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fworld.cpp;h=1b2e058f90d666dfd79d52474ad12ad0fe652686;hb=475f28f06c9e14912bab8119264e247ef466513d;hp=0b1260f8673d8a0eb1b054bec81847b61602d711;hpb=3b0a4ba59825b2d6a47e9d997736742edf55240c;p=blobs.git

diff --git a/src/world/world.cpp b/src/world/world.cpp
index 0b1260f..1b2e058 100644
--- a/src/world/world.cpp
+++ b/src/world/world.cpp
@@ -8,12 +8,13 @@
 #include "Tile.hpp"
 #include "TileType.hpp"
 
-#include "../const.hpp"
 #include "../app/Assets.hpp"
+#include "../creature/Composition.hpp"
 #include "../creature/Creature.hpp"
 #include "../graphics/Viewport.hpp"
-#include "../rand/OctaveNoise.hpp"
-#include "../rand/SimplexNoise.hpp"
+#include "../math/const.hpp"
+#include "../math/OctaveNoise.hpp"
+#include "../math/SimplexNoise.hpp"
 
 #include <algorithm>
 #include <cmath>
@@ -138,12 +139,25 @@ glm::dmat4 Body::FromUniverse() const noexcept {
 	return m;
 }
 
+namespace {
+std::vector<creature::Creature *> ccache;
+}
+
 void Body::Tick(double dt) {
 	rotation += dt * AngularMomentum() / Inertia();
 	Cache();
-	for (creature::Creature *c : Creatures()) {
+	ccache = Creatures();
+	for (creature::Creature *c : ccache) {
 		c->Tick(dt);
 	}
+	for (auto c = Creatures().begin(); c != Creatures().end();) {
+		if ((*c)->Removable()) {
+			delete *c;
+			c = Creatures().erase(c);
+		} else {
+			++c;
+		}
+	}
 }
 
 void Body::Cache() noexcept {
@@ -334,34 +348,34 @@ void Planet::BuildVAO(const Set<TileType> &ts) {
 			for (int y = 0; y < sidelength; ++y) {
 				for (int x = 0; x < sidelength; ++x, ++index) {
 					float tex = ts[TileAt(surface, x, y).type].texture;
-					const float tex_u_begin = surface < 3 ? 1.0f : 0.0f;
-					const float tex_u_end = surface < 3 ? 0.0f : 1.0f;
+					const float tex_v_begin = surface < 3 ? 1.0f : 0.0f;
+					const float tex_v_end = surface < 3 ? 0.0f : 1.0f;
 					attrib[4 * index + 0].position[(surface + 0) % 3] = x + 0 - offset;
 					attrib[4 * index + 0].position[(surface + 1) % 3] = y + 0 - offset;
 					attrib[4 * index + 0].position[(surface + 2) % 3] = surface < 3 ? offset : -offset;
-					attrib[4 * index + 0].tex_coord[0] = tex_u_begin;
-					attrib[4 * index + 0].tex_coord[1] = 1.0f;
+					attrib[4 * index + 0].tex_coord[0] = 0.0f;
+					attrib[4 * index + 0].tex_coord[1] = tex_v_begin;
 					attrib[4 * index + 0].tex_coord[2] = tex;
 
 					attrib[4 * index + 1].position[(surface + 0) % 3] = x + 0 - offset;
 					attrib[4 * index + 1].position[(surface + 1) % 3] = y + 1 - offset;
 					attrib[4 * index + 1].position[(surface + 2) % 3] = surface < 3 ? offset : -offset;
-					attrib[4 * index + 1].tex_coord[0] = tex_u_end;
-					attrib[4 * index + 1].tex_coord[1] = 1.0f;
+					attrib[4 * index + 1].tex_coord[0] = 0.0f;
+					attrib[4 * index + 1].tex_coord[1] = tex_v_end;
 					attrib[4 * index + 1].tex_coord[2] = tex;
 
 					attrib[4 * index + 2].position[(surface + 0) % 3] = x + 1 - offset;
 					attrib[4 * index + 2].position[(surface + 1) % 3] = y + 0 - offset;
 					attrib[4 * index + 2].position[(surface + 2) % 3] = surface < 3 ? offset : -offset;
-					attrib[4 * index + 2].tex_coord[0] = tex_u_begin;
-					attrib[4 * index + 2].tex_coord[1] = 0.0f;
+					attrib[4 * index + 2].tex_coord[0] = 1.0f;
+					attrib[4 * index + 2].tex_coord[1] = tex_v_begin;
 					attrib[4 * index + 2].tex_coord[2] = tex;
 
 					attrib[4 * index + 3].position[(surface + 0) % 3] = x + 1 - offset;
 					attrib[4 * index + 3].position[(surface + 1) % 3] = y + 1 - offset;
 					attrib[4 * index + 3].position[(surface + 2) % 3] = surface < 3 ? offset : -offset;
-					attrib[4 * index + 3].tex_coord[0] = tex_u_end;
-					attrib[4 * index + 3].tex_coord[1] = 0.0f;
+					attrib[4 * index + 3].tex_coord[0] = 1.0f;
+					attrib[4 * index + 3].tex_coord[1] = tex_v_end;
 					attrib[4 * index + 3].tex_coord[2] = tex;
 				}
 			}
@@ -421,8 +435,8 @@ void Planet::Draw(app::Assets &assets, graphics::Viewport &viewport) {
 
 
 void GenerateEarthlike(const Set<TileType> &tiles, Planet &p) noexcept {
-	rand::SimplexNoise elevation_gen(0);
-	rand::SimplexNoise variation_gen(45623752346);
+	math::SimplexNoise elevation_gen(0);
+	math::SimplexNoise variation_gen(45623752346);
 
 	const int ice = tiles["ice"].id;
 	const int ocean = tiles["ocean"].id;
@@ -460,7 +474,7 @@ void GenerateEarthlike(const Set<TileType> &tiles, Planet &p) noexcept {
 					p.TileAt(surface, x, y).type = ice;
 					continue;
 				}
-				float elevation = rand::OctaveNoise(
+				float elevation = math::OctaveNoise(
 					elevation_gen,
 					to_tile / p.Radius(),
 					3,   // octaves
@@ -469,7 +483,7 @@ void GenerateEarthlike(const Set<TileType> &tiles, Planet &p) noexcept {
 					2,   // amplitude
 					2    // growth
 				);
-				float variation = rand::OctaveNoise(
+				float variation = math::OctaveNoise(
 					variation_gen,
 					to_tile / p.Radius(),
 					3,   // octaves
@@ -561,5 +575,18 @@ std::vector<TileType::Yield>::const_iterator TileType::FindResource(int r) const
 	return yield;
 }
 
+std::vector<TileType::Yield>::const_iterator TileType::FindBestResource(const creature::Composition &comp) const {
+	auto best = resources.cend();
+	double best_value = 0.0;
+	for (auto yield = resources.cbegin(); yield != resources.cend(); ++yield) {
+		double value = comp.Get(yield->resource);
+		if (value > best_value) {
+			best = yield;
+			best_value = value;
+		}
+	}
+	return best;
+}
+
 }
 }