X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=20725100d1d6cc176dae4afa4cc02f693ed1eb4b;hb=7a0da3422f7c9b81ae529a7554f6d16e85f05e1d;hp=d6a6fede8469f0b81518b291316d6def3356a9bc;hpb=392826deaf802ac0960ed3924a3f98b9d18d381b;p=blobs.git

diff --git a/src/blobs.cpp b/src/blobs.cpp
index d6a6fed..2072510 100644
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -13,71 +13,46 @@
 #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;
-			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;
 
 	world::Sun sun;
-	sun.Mass(1.0e14);
-	sun.Radius(20.0);
+	sun.Name("Sun");
+	sun.Mass(1.0e17);
+	sun.Radius(200.0);
+	sun.Color(glm::dvec3(1.0));
+	sun.Luminosity(1.0e8);
 	sun.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
-	sun.AngularMomentum(1.0e13);
+	sun.AngularMomentum(1.0e18);
 
 	world::Planet planet(25);
+	planet.Name("Planet");
 	planet.SetParent(sun);
-	planet.Mass(1.0e10);
-	planet.GetOrbit().SemiMajorAxis(941.7);
+	planet.Mass(1.0e13);
+	planet.GetOrbit().SemiMajorAxis(8184.0);
 	planet.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
 	planet.AxialTilt(glm::dvec2(PI * 0.127, 0.0));
-	planet.AngularMomentum(6.0e10);
+	planet.AngularMomentum(6.5e13);
 
-	world::Planet moon(3);
+	world::Planet moon(5);
+	moon.Name("Moon");
 	moon.SetParent(planet);
-	moon.Mass(1.0e6);
-	moon.GetOrbit().SemiMajorAxis(37.0);
+	moon.Mass(1.0e7);
+	moon.GetOrbit().SemiMajorAxis(72.5);
 	moon.Rotation(PI * 0.25);
-	moon.AngularMomentum(1.0e4);
+	moon.AngularMomentum(5.22e5);
 
-	world::Planet second_planet(9);
+	world::Planet second_planet(14);
+	second_planet.Name("Second planet");
 	second_planet.SetParent(sun);
-	second_planet.Mass(1.0e9);
-	second_planet.GetOrbit().SemiMajorAxis(350.0);
+	second_planet.Mass(1.0e12);
+	second_planet.GetOrbit().SemiMajorAxis(4350.0);
 	second_planet.SurfaceTilt(glm::dvec2(PI * 0.125, PI * 0.25));
 	second_planet.AxialTilt(glm::dvec2(PI * 0.95, 0.0));
-	second_planet.AngularMomentum(1.0e8);
+	second_planet.AngularMomentum(1.0e12);
 
 	world::Simulation sim(sun, assets);
 	sim.AddSun(sun);
@@ -98,28 +73,9 @@ 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);
+	state.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();