X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=9a94b96e0f55b87a4855efff5d1d434e0300fa92;hb=f5fc0c2bd1c0d1e2737d2b4ed49c3de16aa67c67;hp=b32c4ab22e31a463c2f90e250bff482cd32172f5;hpb=8f6530c75730f901efd6708e4fde7e68a178adf1;p=blobs.git

diff --git a/src/blobs.cpp b/src/blobs.cpp
index b32c4ab..9a94b96 100644
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -16,6 +16,36 @@
 
 using namespace blobs;
 
+namespace {
+
+struct SwitchPanel {
+	SwitchPanel(world::Planet &p, app::Application &app, app::MasterState &state)
+	: planet(p), app(app), state(state) { }
+
+	void operator ()(creature::Creature &c) {
+		if (planet.Creatures().empty()) {
+			std::cout << "no more creatures, game over" << std::endl;
+			state.GetCreaturePanel().Hide();
+			while (app.HasState()) {
+				app.PopState();
+			}
+		} else {
+			for (auto a : planet.Creatures()) {
+				if (a != &c) {
+					state.GetCreaturePanel().Show(*a);
+					a->OnDeath([&](creature::Creature &b) { (*this)(b); });
+					break;
+				}
+			}
+		}
+	}
+
+	world::Planet &planet;
+	app::Application &app;
+	app::MasterState &state;
+};
+}
+
 int main(int argc, char *argv[]) {
 	app::Init init(true, 8);
 	app::Assets assets;
@@ -49,7 +79,7 @@ int main(int argc, char *argv[]) {
 	second_planet.AxialTilt(glm::dvec2(PI * 0.95, 0.0));
 	second_planet.AngularMomentum(1.0e8);
 
-	world::Simulation sim(sun, assets.data.resources, assets.data.tile_types);
+	world::Simulation sim(sun, assets);
 	sim.AddSun(sun);
 	sim.AddPlanet(planet);
 	sim.AddPlanet(second_planet);
@@ -60,17 +90,12 @@ int main(int argc, char *argv[]) {
 	world::GenerateTest(assets.data.tile_types, moon);
 	world::GenerateTest(assets.data.tile_types, second_planet);
 
-	std::cout << "length of year: " << planet.OrbitalPeriod() << "s" << std::endl;
-	std::cout << "length of moon cycle: " << moon.OrbitalPeriod() << "s" << std::endl;
-	std::cout << "length of day: " << planet.RotationalPeriod() << "s" << std::endl;
-	std::cout << "days per year: " << (planet.OrbitalPeriod() / planet.RotationalPeriod()) << std::endl;
-	std::cout << "moon cycle in days: " << (moon.OrbitalPeriod() / planet.RotationalPeriod()) << std::endl;
-	std::cout << "moon cycles per year: " << (planet.OrbitalPeriod() / moon.OrbitalPeriod()) << std::endl;
-
 	auto blob = new creature::Creature(sim);
-	Spawn(*blob, planet, assets);
+	blob->Name(assets.name.Sequential());
+	Spawn(*blob, planet);
+	// decrease chances of ur-blob dying without splitting
+	blob->GetProperties().Fertility() = 1.0;
 	blob->BuildVAO();
-	blob->Name("Blob");
 
 	app::MasterState state(assets, sim);
 	state.GetCamera()
@@ -80,7 +105,7 @@ int main(int argc, char *argv[]) {
 		// sunset
 		//.FirstPerson(3, glm::vec3(0.0f, 0.0f, 0.1f), glm::vec3(1.0f, -0.75f, 0.1f))
 		// from afar
-		.MapView(0, glm::vec3(0.0f, 0.0f, 10.0f), 0.0f)
+		.MapView(0, glm::vec3(0.0f, 0.0f, 30.0f), 0.0f)
 		// from afar, rotating
 		//.Orbital(glm::vec3(-60.0f, 0.0f, 0.0f))
 	;
@@ -92,6 +117,8 @@ int main(int argc, char *argv[]) {
 	state.GetCreaturePanel().Show(*blob);
 
 	app::Application app(init.window, init.viewport);
+	SwitchPanel swp(planet, app, state);
+	blob->OnDeath([&](creature::Creature &c) { swp(c); });
 	app.PushState(&state);
 	app.Run();