allow clicking celestial bodies

[blobs.git] / src / blobs.cpp

diff --git a/src/blobs.cpp b/src/blobs.cpp
index c09aea6b21279d6802fc518dab089532286f9577..d032d9de33502e86d4fe9aa6998103bd2ea84c30 100644 (file)
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -1,58 +1,50 @@
-#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"
 #include "world/Sun.hpp"
-#include "world/TileSet.hpp"
 #include "world/TileType.hpp"
 
 #include <cstdint>
 #include <iostream>
 
-
 using namespace blobs;
 
 int main(int argc, char *argv[]) {
        app::Init init(true, 8);
        app::Assets assets;
 
-       world::TileSet tiles;
-       tiles.Add({ "ice",     "Ice",     0, 0 });
-       tiles.Add({ "black",   "Black",   0, 1 });
-       tiles.Add({ "red",     "Red",     0, 2 });
-       tiles.Add({ "grass",   "Grass",   0, 3 });
-       tiles.Add({ "water",   "Water",   0, 4 });
-       tiles.Add({ "sand",    "Sand",    0, 5 });
-       tiles.Add({ "tundra",  "Tundra",  0, 6 });
-       tiles.Add({ "magenta", "Magenta", 0, 7 });
-       tiles.Add({ "rock",    "Rock",    0, 8 });
-
        world::Sun sun;
-       sun.Mass(1.0e12);
-       sun.Radius(10.0);
+       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(11);
+       world::Planet planet(25);
+       planet.Name("Planet");
        planet.SetParent(sun);
-       planet.Mass(1.0e9);
+       planet.Mass(1.0e10);
        planet.GetOrbit().SemiMajorAxis(941.7);
        planet.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
        planet.AxialTilt(glm::dvec2(PI * 0.127, 0.0));
-       planet.AngularMomentum(1.25e9);
+       planet.AngularMomentum(6.0e10);
 
        world::Planet moon(3);
+       moon.Name("Moon");
        moon.SetParent(planet);
        moon.Mass(1.0e6);
-       moon.GetOrbit().SemiMajorAxis(25.0);
+       moon.GetOrbit().SemiMajorAxis(37.0);
        moon.Rotation(PI * 0.25);
        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);
@@ -60,46 +52,27 @@ 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(tiles, planet);
-       world::GenerateTest(tiles, moon);
-       world::GenerateTest(tiles, 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;
+       world::GenerateEarthlike(assets.data.tile_types, planet);
+       planet.Atmosphere(assets.data.resources["air"].id);
+       world::GenerateTest(assets.data.tile_types, moon);
+       world::GenerateTest(assets.data.tile_types, second_planet);
 
-       auto blob = new world::Creature;
+       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();
-       planet.AddCreature(blob);
-       blob->Surface(0);
-       blob->Position(glm::dvec3(0.0, 0.0, 0.0));
 
        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, 25.0f), 0.0f)
-               // from afar, rotating
-               .Orbital(glm::vec3(-25.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);
        app.PushState(&state);