extract situation from creature

[blobs.git] / src / blobs.cpp

diff --git a/src/blobs.cpp b/src/blobs.cpp
index 918925664f3d66f553685d831363e1e0110b5de0..56475029097c8f061ca5ec971d994aac68674200 100644 (file)
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -3,7 +3,7 @@
 #include "app/Assets.hpp"
 #include "app/init.hpp"
 #include "app/MasterState.hpp"
-#include "world/Creature.hpp"
+#include "creature/Creature.hpp"
 #include "world/Planet.hpp"
 #include "world/Set.hpp"
 #include "world/Simulation.hpp"
@@ -56,6 +56,7 @@ int main(int argc, char *argv[]) {
        sim.AddPlanet(moon);
 
        world::GenerateEarthlike(assets.data.tiles, planet);
+       planet.Atmosphere(assets.data.resources["air"].id);
        world::GenerateTest(assets.data.tiles, moon);
        world::GenerateTest(assets.data.tiles, second_planet);
 
@@ -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;
+       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()
@@ -89,6 +89,7 @@ int main(int argc, char *argv[]) {
        //      .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);