remove surface tilt

[blobs.git] / src / blobs.cpp

diff --git a/src/blobs.cpp b/src/blobs.cpp
index 56475029097c8f061ca5ec971d994aac68674200..475c3fac9c548494c209fd0b73164ed3e00bfe4d 100644 (file)
--- 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 "creature/Creature.hpp"
+#include "math/const.hpp"
 #include "world/Planet.hpp"
 #include "world/Set.hpp"
 #include "world/Simulation.hpp"
@@ -13,7 +13,6 @@
 #include <cstdint>
 #include <iostream>
 
-
 using namespace blobs;
 
 int main(int argc, char *argv[]) {
@@ -21,75 +20,58 @@ int main(int argc, char *argv[]) {
        app::Assets assets;
 
        world::Sun sun;
-       sun.Mass(1.0e14);
-       sun.Radius(20.0);
-       sun.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
-       sun.AngularMomentum(1.0e13);
+       sun.Name("Sun");
+       sun.Mass(1.0e17);
+       sun.Radius(200.0);
+       sun.Color(glm::dvec3(1.0));
+       sun.Luminosity(1.0e8);
+       sun.AxialTilt(glm::dvec2(PI * 0.25, PI * 0.25));
+       sun.AngularMomentum(1.0e18);
 
        world::Planet planet(25);
+       planet.Name("Planet");
        planet.SetParent(sun);
-       planet.Mass(1.0e10);
-       planet.GetOrbit().SemiMajorAxis(941.7);
-       planet.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
+       planet.Mass(1.0e13);
+       planet.GetOrbit().SemiMajorAxis(8184.0);
        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.SurfaceTilt(glm::dvec2(PI * 0.125, PI * 0.25));
+       second_planet.Mass(1.0e12);
+       second_planet.GetOrbit().SemiMajorAxis(4350.0);
        second_planet.AxialTilt(glm::dvec2(PI * 0.95, 0.0));
-       second_planet.AngularMomentum(1.0e8);
+       second_planet.AngularMomentum(1.0e12);
 
-       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);
-
-       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::GenerateTest(assets.data.tile_types, moon);
+       world::GenerateTest(assets.data.tile_types, second_planet);
 
-       auto blob = new creature::Creature;
-       Spawn(*blob, planet, assets);
+       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();
-       blob->Name("Blob");
 
        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, 60.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.Show(*blob);
 
        app::Application app(init.window, init.viewport);
        app.PushState(&state);