X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=1cd3f9fad69cb6b01c60d67cf34264ab5cdd833f;hb=200f9da6241613a1c19431896b09d1715c262c6d;hp=9a94b96e0f55b87a4855efff5d1d434e0300fa92;hpb=f5fc0c2bd1c0d1e2737d2b4ed49c3de16aa67c67;p=blobs.git diff --git a/src/blobs.cpp b/src/blobs.cpp index 9a94b96..1cd3f9f 100644 --- a/src/blobs.cpp +++ b/src/blobs.cpp @@ -13,39 +13,8 @@ #include #include - using namespace blobs; -namespace { - -struct SwitchPanel { - SwitchPanel(world::Planet &p, app::Application &app, app::MasterState &state) - : planet(p), app(app), state(state) { } - - 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(); - } - } else { - for (auto a : planet.Creatures()) { - if (a != &c) { - state.GetCreaturePanel().Show(*a); - a->OnDeath([&](creature::Creature &b) { (*this)(b); }); - break; - } - } - } - } - - world::Planet &planet; - app::Application &app; - app::MasterState &state; -}; -} - int main(int argc, char *argv[]) { app::Init init(true, 8); app::Assets assets; @@ -98,27 +67,10 @@ int main(int argc, char *argv[]) { blob->BuildVAO(); 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, 30.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.GetTimePanel().SetBody(planet); app::Application app(init.window, init.viewport); - SwitchPanel swp(planet, app, state); - blob->OnDeath([&](creature::Creature &c) { swp(c); }); app.PushState(&state); app.Run();