X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=1cd3f9fad69cb6b01c60d67cf34264ab5cdd833f;hb=200f9da6241613a1c19431896b09d1715c262c6d;hp=ee5e427293ddadc5d794c1c5135de7da3a813110;hpb=cd9cee86b336b5ec531028ac2deebb391e48ed21;p=blobs.git

diff --git a/src/blobs.cpp b/src/blobs.cpp
index ee5e427..1cd3f9f 100644
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -13,38 +13,8 @@
 #include <cstdint>
 #include <iostream>
 
-
 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;
-			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;
@@ -89,40 +59,18 @@ 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);
-	blob->Name("Blob");
+	blob->Name(assets.name.Sequential());
 	Spawn(*blob, planet);
+	// decrease chances of ur-blob dying without splitting
+	blob->GetProperties().Fertility() = 1.0;
 	blob->BuildVAO();
 
 	app::MasterState state(assets, sim);
-	state.GetCamera()
-		.Reference(planet)
-		// sunrise
-		//.FirstPerson(0, glm::vec3(0.0f, 0.0f, 0.1f), glm::vec3(1.0f, -0.75f, 0.1f))
-		// 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, 15.0f), 0.0f)
-		// from afar, rotating
-		//.Orbital(glm::vec3(-60.0f, 0.0f, 0.0f))
-	;
-	// system view
-	//state.GetCamera()
-	//	.Reference(sun)
-	//	.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);
-	blob->OnDeath([&](creature::Creature &c) { swp(c); });
 	app.PushState(&state);
 	app.Run();