From 3d682d8955daabb1854a7a24639c1de27979a4be Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Sun, 3 Jul 2022 10:15:57 +0100
Subject: [PATCH] ensure that add state follows naming conventions
---
demo/demo/main.cpp | 6 +++---
include/fggl/app.hpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/demo/demo/main.cpp b/demo/demo/main.cpp
index e7e79b3..3bc9aff 100644
--- a/demo/demo/main.cpp
+++ b/demo/demo/main.cpp
@@ -43,7 +43,7 @@
#include "rollball.hpp"
static void setup_menu(fggl::App& app) {
- auto *menu = app.add_state<fggl::scenes::BasicMenu>("menu");
+ auto *menu = app.addState<fggl::scenes::BasicMenu>("menu");
// add some menu items for the game states
menu->add("terrain", [&app]() {
@@ -98,8 +98,8 @@ int main(int argc, const char* argv[]) {
// our test states
setup_menu(app);
- app.add_state<GameScene>("game");
- app.add_state<demo::RollBall>("rollball");
+ app.addState<GameScene>("game");
+ app.addState<demo::RollBall>("rollball");
return app.run(argc, argv);
}
diff --git a/include/fggl/app.hpp b/include/fggl/app.hpp
index 62175b2..e89b254 100644
--- a/include/fggl/app.hpp
+++ b/include/fggl/app.hpp
@@ -103,7 +103,7 @@ namespace fggl {
int run(int argc, const char **argv);
template<typename T>
- T *add_state(const Identifer &name) {
+ T *addState(const Identifer &name) {
static_assert(std::is_base_of<AppState, T>::value, "States must be AppStates");
return m_states.put<T>(name, *this);
}
--
GitLab