X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=d6a6fede8469f0b81518b291316d6def3356a9bc;hb=392826deaf802ac0960ed3924a3f98b9d18d381b;hp=ec143763a029e6b504294b8dcbad1e1165b2b718;hpb=42db7d9d2286e50896ad172e2e4a8fbe65c8a4a9;p=blobs.git diff --git a/src/blobs.cpp b/src/blobs.cpp index ec14376..d6a6fed 100644 --- a/src/blobs.cpp +++ b/src/blobs.cpp @@ -25,6 +25,7 @@ struct SwitchPanel { void operator ()(creature::Creature &c) { if (planet.Creatures().empty()) { std::cout << "no more creatures, game over" << std::endl; + state.GetCreaturePanel().Hide(); while (app.HasState()) { app.PopState(); } @@ -89,16 +90,11 @@ 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("Blob"); + 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); @@ -109,7 +105,7 @@ 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, 10.0f), 0.0f) + .MapView(0, glm::vec3(0.0f, 0.0f, 30.0f), 0.0f) // from afar, rotating //.Orbital(glm::vec3(-60.0f, 0.0f, 0.0f)) ; @@ -119,6 +115,7 @@ int main(int argc, char *argv[]) { // .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);