allow clicking celestial bodies

[blobs.git] / src / blobs.cpp

diff --git a/src/blobs.cpp b/src/blobs.cpp
index 836c51d335845b0f79e74caf891c6bc3f9ae4732..d032d9de33502e86d4fe9aa6998103bd2ea84c30 100644 (file)
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -13,49 +13,21 @@
 #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;
 
        world::Sun sun;
+       sun.Name("Sun");
        sun.Mass(1.0e14);
        sun.Radius(20.0);
        sun.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
        sun.AngularMomentum(1.0e13);
 
        world::Planet planet(25);
+       planet.Name("Planet");
        planet.SetParent(sun);
        planet.Mass(1.0e10);
        planet.GetOrbit().SemiMajorAxis(941.7);
@@ -64,6 +36,7 @@ int main(int argc, char *argv[]) {
        planet.AngularMomentum(6.0e10);
 
        world::Planet moon(3);
+       moon.Name("Moon");
        moon.SetParent(planet);
        moon.Mass(1.0e6);
        moon.GetOrbit().SemiMajorAxis(37.0);
@@ -71,6 +44,7 @@ int main(int argc, char *argv[]) {
        moon.AngularMomentum(1.0e4);
 
        world::Planet second_planet(9);
+       second_planet.Name("Second planet");
        second_planet.SetParent(sun);
        second_planet.Mass(1.0e9);
        second_planet.GetOrbit().SemiMajorAxis(350.0);
@@ -89,40 +63,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(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, 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); });
        app.PushState(&state);
        app.Run();