aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-11-07 13:32:48 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-11-07 13:32:48 +0100
commitb4834c99c1afced63ee0c266b38925b95782bdf6 (patch)
tree9647f4edd978e067a6c01dfdacc376865ed10bf7
parent41c0ea36b025f0c15c7d14db8d88eb9558085b74 (diff)
merge #20
-rw-r--r--src/crepe/ComponentManager.hpp3
-rw-r--r--src/crepe/api/SceneManager.cpp21
2 files changed, 9 insertions, 15 deletions
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index 489e188..cf9f65a 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -31,8 +31,7 @@ T & ComponentManager::add_component(uint32_t id, Args &&... args) {
// Create a new component of type T (arguments directly forwarded). The
// constructor must be called by ComponentManager.
T * instance_ptr = new T(id, forward<Args>(args)...);
- if (instance_ptr == nullptr)
- throw std::bad_alloc();
+ if (instance_ptr == nullptr) throw std::bad_alloc();
T & instance_ref = *instance_ptr;
unique_ptr<T> instance = unique_ptr<T>(instance_ptr);
diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp
index 57ec302..dfed6ee 100644
--- a/src/crepe/api/SceneManager.cpp
+++ b/src/crepe/api/SceneManager.cpp
@@ -13,24 +13,20 @@ SceneManager & SceneManager::get_instance() {
return instance;
}
-void SceneManager::set_next_scene(const string & name) {
- next_scene = name;
-}
+void SceneManager::set_next_scene(const string & name) { next_scene = name; }
void SceneManager::load_next_scene() {
// next scene not set
- if (this->next_scene.empty())
- return;
+ if (this->next_scene.empty()) return;
- auto it = find_if(this->scenes.begin(), this->scenes.end(),
- [&next_scene = this->next_scene] (unique_ptr<Scene> & scene) {
- return scene->name == next_scene;
- }
- );
+ auto it
+ = find_if(this->scenes.begin(), this->scenes.end(),
+ [&next_scene = this->next_scene](unique_ptr<Scene> & scene) {
+ return scene->name == next_scene;
+ });
// next scene not found
- if (it == this->scenes.end())
- return;
+ if (it == this->scenes.end()) return;
unique_ptr<Scene> & scene = *it;
// Delete all components of the current scene
@@ -40,4 +36,3 @@ void SceneManager::load_next_scene() {
// Load the new scene
scene->load_scene();
}
-