diff options
author | max-001 <maxsmits21@kpnmail.nl> | 2024-11-07 09:54:51 +0100 |
---|---|---|
committer | max-001 <maxsmits21@kpnmail.nl> | 2024-11-07 09:54:51 +0100 |
commit | 7dfaa964a5039d7c24d16038589c77032152b9f2 (patch) | |
tree | dcb2448fa697dabcb2f248326616a16e62821125 /src/crepe/api | |
parent | fd60c0280440da053948f7500657ae65b94036bf (diff) | |
parent | 3a5201961ce31d415042c6273d03e46aed7e6eb8 (diff) |
Merge remote-tracking branch 'origin/master' into max/big-cleanup
Diffstat (limited to 'src/crepe/api')
-rw-r--r-- | src/crepe/api/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/crepe/api/Scene.cpp | 5 | ||||
-rw-r--r-- | src/crepe/api/Scene.h | 17 | ||||
-rw-r--r-- | src/crepe/api/SceneManager.cpp | 43 | ||||
-rw-r--r-- | src/crepe/api/SceneManager.h | 50 | ||||
-rw-r--r-- | src/crepe/api/SceneManager.hpp | 18 |
6 files changed, 138 insertions, 0 deletions
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt index 3e0c044..dbd6bf1 100644 --- a/src/crepe/api/CMakeLists.txt +++ b/src/crepe/api/CMakeLists.txt @@ -12,6 +12,8 @@ target_sources(crepe PUBLIC AssetManager.cpp Sprite.cpp Metadata.cpp + Scene.cpp + SceneManager.cpp ) target_sources(crepe PUBLIC FILE_SET HEADERS FILES @@ -29,5 +31,8 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES Texture.h AssetManager.h AssetManager.hpp + Scene.h Metadata.h + SceneManager.h + SceneManager.hpp ) diff --git a/src/crepe/api/Scene.cpp b/src/crepe/api/Scene.cpp new file mode 100644 index 0000000..933edf4 --- /dev/null +++ b/src/crepe/api/Scene.cpp @@ -0,0 +1,5 @@ +#include "Scene.h" + +using namespace crepe; + +Scene::Scene(const std::string & name) : name(name) {} diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h new file mode 100644 index 0000000..f8bcc3d --- /dev/null +++ b/src/crepe/api/Scene.h @@ -0,0 +1,17 @@ +#pragma once + +#include <string> + +namespace crepe { + +class Scene { +public: + Scene(const std::string & name); + virtual ~Scene() = default; + virtual void load_scene() = 0; + +public: + std::string name; +}; + +} // namespace crepe diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp new file mode 100644 index 0000000..57ec302 --- /dev/null +++ b/src/crepe/api/SceneManager.cpp @@ -0,0 +1,43 @@ +#include <algorithm> +#include <memory> + +#include "../ComponentManager.h" + +#include "SceneManager.h" + +using namespace crepe; +using namespace std; + +SceneManager & SceneManager::get_instance() { + static SceneManager instance; + return instance; +} + +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; + + 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; + unique_ptr<Scene> & scene = *it; + + // Delete all components of the current scene + ComponentManager & mgr = ComponentManager::get_instance(); + mgr.delete_all_components(); + + // Load the new scene + scene->load_scene(); +} + diff --git a/src/crepe/api/SceneManager.h b/src/crepe/api/SceneManager.h new file mode 100644 index 0000000..1e0e670 --- /dev/null +++ b/src/crepe/api/SceneManager.h @@ -0,0 +1,50 @@ +#pragma once + +#include <memory> +#include <queue> +#include <vector> + +#include "Scene.h" + +namespace crepe { + +class SceneManager { +public: + // Singleton + static SceneManager & get_instance(); + SceneManager(const SceneManager &) = delete; + SceneManager(SceneManager &&) = delete; + SceneManager & operator=(const SceneManager &) = delete; + SceneManager & operator=(SceneManager &&) = delete; + +public: + /** + * \brief Add a new concrete scene to the scene manager + * + * \tparam T Type of concrete scene + * \param name Name of new scene + */ + template <typename T> + void add_scene(const std::string & name); + /** + * \brief Set the next scene + * + * This scene will be loaded at the end of the frame + * + * \param name Name of the next scene + */ + void set_next_scene(const std::string & name); + //! Load a new scene (if there is one) + void load_next_scene(); + +private: + SceneManager() = default; + +private: + std::vector<std::unique_ptr<Scene>> scenes; + std::string next_scene; +}; + +} // namespace crepe + +#include "SceneManager.hpp" diff --git a/src/crepe/api/SceneManager.hpp b/src/crepe/api/SceneManager.hpp new file mode 100644 index 0000000..8bad7b2 --- /dev/null +++ b/src/crepe/api/SceneManager.hpp @@ -0,0 +1,18 @@ +#include "SceneManager.h" + +namespace crepe { + +template <typename T> +void SceneManager::add_scene(const std::string & name) { + static_assert(std::is_base_of<Scene, T>::value, + "T must be derived from Scene"); + + scenes.emplace_back(make_unique<T>(name)); + + // The first scene added, is the one that will be loaded at the beginning + if (next_scene.empty()) { + next_scene = name; + } +} + +} // namespace crepe |