X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=f5cc98842b0c13280761b8004c176277a847625a;hb=75398ab9230c15215e7a378a26d2d55de67b47f0;hp=01bfb2a8ed7c1fd8c8aa99207c752a2966b49f45;hpb=631f0cfd6b421f5be68d60375db2ce91176d923d;p=blobs.git diff --git a/src/blobs.cpp b/src/blobs.cpp index 01bfb2a..f5cc988 100644 --- a/src/blobs.cpp +++ b/src/blobs.cpp @@ -13,7 +13,6 @@ #include #include - using namespace blobs; namespace { @@ -33,7 +32,7 @@ struct SwitchPanel { for (auto a : planet.Creatures()) { if (a != &c) { state.GetCreaturePanel().Show(*a); - a->OnDeath([&](creature::Creature &b) { (*this)(b); }); + a->WhenDead([&](creature::Creature &b) { (*this)(b); }); break; } } @@ -98,28 +97,12 @@ 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); }); + blob->WhenDead([&](creature::Creature &c) { swp(c); }); app.PushState(&state); app.Run();