X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=836c51d335845b0f79e74caf891c6bc3f9ae4732;hb=e0180e01f4c659c97973f585fea5eb3344254ce0;hp=e0a4769ba2eadd965fadca11b81d26613fdaee2c;hpb=b795a1df619349d45c3b0ca73e61e68ff483221c;p=blobs.git

diff --git a/src/blobs.cpp b/src/blobs.cpp
index e0a4769..836c51d 100644
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -1,9 +1,9 @@
-#include "const.hpp"
 #include "app/Application.hpp"
 #include "app/Assets.hpp"
 #include "app/init.hpp"
 #include "app/MasterState.hpp"
-#include "world/Creature.hpp"
+#include "creature/Creature.hpp"
+#include "math/const.hpp"
 #include "world/Planet.hpp"
 #include "world/Set.hpp"
 #include "world/Simulation.hpp"
@@ -16,6 +16,35 @@
 
 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;
@@ -49,16 +78,16 @@ 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);
+	world::Simulation sim(sun, assets);
 	sim.AddSun(sun);
 	sim.AddPlanet(planet);
 	sim.AddPlanet(second_planet);
 	sim.AddPlanet(moon);
 
-	world::GenerateEarthlike(assets.data.tiles, planet);
+	world::GenerateEarthlike(assets.data.tile_types, planet);
 	planet.Atmosphere(assets.data.resources["air"].id);
-	world::GenerateTest(assets.data.tiles, moon);
-	world::GenerateTest(assets.data.tiles, second_planet);
+	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;
@@ -67,9 +96,10 @@ int main(int argc, char *argv[]) {
 	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 world::Creature;
+	auto blob = new creature::Creature(sim);
+	blob->Name(assets.name.Sequential());
+	Spawn(*blob, planet);
 	blob->BuildVAO();
-	Spawn(*blob, planet, assets);
 
 	app::MasterState state(assets, sim);
 	state.GetCamera()
@@ -79,17 +109,20 @@ 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, 60.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))
+		//.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);
 
 	app::Application app(init.window, init.viewport);
+	SwitchPanel swp(planet, app, state);
+	blob->OnDeath([&](creature::Creature &c) { swp(c); });
 	app.PushState(&state);
 	app.Run();