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

diff --git a/src/blobs.cpp b/src/blobs.cpp
index 9a94b96..f5cc988 100644
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -13,7 +13,6 @@
 #include <cstdint>
 #include <iostream>
 
-
 using namespace blobs;
 
 namespace {
@@ -24,7 +23,7 @@ struct SwitchPanel {
 
 	void operator ()(creature::Creature &c) {
 		if (planet.Creatures().empty()) {
-			std::cout << "no more creatures, game over" << std::endl;
+			planet.GetSimulation().Log() << "no more creatures, game over" << std::endl;
 			state.GetCreaturePanel().Hide();
 			while (app.HasState()) {
 				app.PopState();
@@ -33,7 +32,7 @@ struct SwitchPanel {
 			for (auto a : planet.Creatures()) {
 				if (a != &c) {
 					state.GetCreaturePanel().Show(*a);
-					a->OnDeath([&](creature::Creature &b) { (*this)(b); });
+					a->WhenDead([&](creature::Creature &b) { (*this)(b); });
 					break;
 				}
 			}
@@ -98,27 +97,12 @@ int main(int argc, char *argv[]) {
 	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, 30.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); });
+	blob->WhenDead([&](creature::Creature &c) { swp(c); });
 	app.PushState(&state);
 	app.Run();