From aa716b19c3097021eb819558aa585e31e7512c56 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Sat, 23 Apr 2022 11:21:45 +0100
Subject: [PATCH] rename terrain test in the menu
---
demo/demo/main.cpp | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/demo/demo/main.cpp b/demo/demo/main.cpp
index 30aadf5..8d025d8 100644
--- a/demo/demo/main.cpp
+++ b/demo/demo/main.cpp
@@ -79,13 +79,15 @@ static void setupServiceLocators(fggl::util::ServiceLocator& locator) {
}
int main(int argc, const char* argv[]) {
- fggl::App app( "fggl-demo" );
auto& locator = fggl::util::ServiceLocator::instance();
setupServiceLocators(locator);
- // Would be nice to not take args like this, it messes with lifetimes
- auto& windowing = app.use<fggl::gfx::ecsGlfwModule>(locator.get<fggl::input::Input>());
+ // create the application
+ fggl::App app( "fggl-demo" );
+
+ // Would be nice to not take args like this, it messes with lifetimes
+ auto& windowing = app.use<fggl::gfx::ecsGlfwModule>(locator.get<fggl::input::Input>());
// -- should not be our problem - this is a broken api
auto window = windowing.createWindow("Demo Game");
@@ -101,11 +103,13 @@ int main(int argc, const char* argv[]) {
// Add a basic main menu
auto *menu = app.add_state<fggl::scenes::BasicMenu>("menu");
- menu->add("start", [&app]() { app.change_state("game"); });
+
+ // add some menu items for the game states
+ menu->add("terrain", [&app]() { app.change_state("game"); });
menu->add("rollball", [&app]() { app.change_state("rollball"); });
menu->add("quit", [&app]() { app.running(false); });
- // the game state itself
+ // the game states themselves
app.add_state<GameScene>("game");
app.add_state<demo::RollBall>("rollball");
--
GitLab