4 files changed, 88 insertions, 0 deletions
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 0bb1263..7fd8ffd 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -11,6 +11,8 @@ target_sources(crepe PUBLIC
 	Texture.cpp
 	AssetManager.cpp
 	Sprite.cpp
+	Scene.cpp
+	SceneManager.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -28,4 +30,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Texture.h 
 	AssetManager.h 
 	AssetManager.hpp
+	Scene.h
+	SceneManager.h
+	SceneManager.hpp
 )
diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp
new file mode 100644
index 0000000..773303b
--- /dev/null
+++ b/src/crepe/api/SceneManager.cpp
@@ -0,0 +1,36 @@
+#include "../ComponentManager.h"
+
+#include "SceneManager.h"
+
+using namespace crepe::api;
+
+SceneManager::SceneManager() {}
+
+SceneManager & SceneManager::get_instance() {
+	static SceneManager instance;
+	return instance;
+}
+
+// Push the next scene onto the queue
+void SceneManager::load_scene(std::string name) {
+	next_scene.push(name);
+}
+
+// Load a new scene from the queue (if there is one)
+void SceneManager::empty_queue() {
+	while (!next_scene.empty()) {
+		string name = next_scene.front();
+		next_scene.pop();
+
+		for (auto & scene : scenes) {
+			if (scene->name == name) {
+				// Delete all components of the current scene
+				ComponentManager & mgr = ComponentManager::get_instance();
+				mgr.delete_all_components();
+				// Load the new scene
+				scene->load_scene();
+				break;
+			}
+		}
+	}
+}
diff --git a/src/crepe/api/SceneManager.h b/src/crepe/api/SceneManager.h
new file mode 100644
index 0000000..97441a5
--- /dev/null
+++ b/src/crepe/api/SceneManager.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <vector>
+#include <memory>
+#include <queue>
+
+#include "Scene.h"
+
+namespace crepe::api {
+
+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:
+	template <typename T>
+	void add_scene(std::string name);
+	void load_scene(std::string name);
+	void empty_queue();
+
+private:
+	SceneManager();
+
+private:
+	std::vector<std::unique_ptr<Scene>> scenes;
+	std::queue<std::string> next_scene;
+};
+
+} // namespace crepe::api
+
+#include "SceneManager.hpp"
diff --git a/src/crepe/api/SceneManager.hpp b/src/crepe/api/SceneManager.hpp
new file mode 100644
index 0000000..120640f
--- /dev/null
+++ b/src/crepe/api/SceneManager.hpp
@@ -0,0 +1,11 @@
+#include "SceneManager.h"
+
+using namespace crepe::api;
+using namespace std;
+
+// Add a new concrete scene to the scene manager
+template <typename T>
+void SceneManager::add_scene(string name) {
+	static_assert(is_base_of<Scene, T>::value, "T must be derived from Scene");
+	scenes.emplace_back(make_unique<T>(name));
+}