randomize creature properties a bit

[blobs.git] / src / blobs.cpp

diff --git a/src/blobs.cpp b/src/blobs.cpp
index 918925664f3d66f553685d831363e1e0110b5de0..b32c4ab22e31a463c2f90e250bff482cd32172f5 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 "world/Creature.hpp"
+#include "creature/Creature.hpp"
+#include "math/const.hpp"
 #include "world/Planet.hpp"
 #include "world/Set.hpp"
 #include "world/Simulation.hpp"
@@ -49,15 +49,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.data.resources, assets.data.tile_types);
        sim.AddSun(sun);
        sim.AddPlanet(planet);
        sim.AddPlanet(second_planet);
        sim.AddPlanet(moon);
 
-       world::GenerateEarthlike(assets.data.tiles, planet);
-       world::GenerateTest(assets.data.tiles, moon);
-       world::GenerateTest(assets.data.tiles, second_planet);
+       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);
 
        std::cout << "length of year: " << planet.OrbitalPeriod() << "s" << std::endl;
        std::cout << "length of moon cycle: " << moon.OrbitalPeriod() << "s" << std::endl;
@@ -66,11 +67,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);
+       Spawn(*blob, planet, assets);
        blob->BuildVAO();
-       planet.AddCreature(blob);
-       blob->Surface(0);
-       blob->Position(glm::dvec3(0.0, 0.0, 0.0));
+       blob->Name("Blob");
 
        app::MasterState state(assets, sim);
        state.GetCamera()
@@ -80,15 +80,16 @@ 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, 10.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);
        app.PushState(&state);