From 827f09031e2d3cc15e956b242774a4566e1403c1 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 7 Nov 2024 20:52:06 +0100
Subject: more WIP audio system

---
 src/crepe/system/AudioSystem.cpp  | 24 ++++++++++++++++++++++++
 src/crepe/system/AudioSystem.h    | 21 +++++++++++++++++++++
 src/crepe/system/CMakeLists.txt   |  3 +++
 src/crepe/system/ScriptSystem.cpp |  3 +--
 src/crepe/system/System.cpp       |  7 +++++++
 src/crepe/system/System.h         | 10 +++++++++-
 6 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 src/crepe/system/AudioSystem.cpp
 create mode 100644 src/crepe/system/AudioSystem.h
 create mode 100644 src/crepe/system/System.cpp

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
new file mode 100644
index 0000000..93c0955
--- /dev/null
+++ b/src/crepe/system/AudioSystem.cpp
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "AudioSystem.h"
+#include "ComponentManager.h"
+
+#include "../api/AudioSource.h"
+
+using namespace crepe;
+using namespace std;
+
+AudioSystem::AudioSystem(SoundContext & ctx) : ctx(ctx) {}
+
+void AudioSystem::update() {
+	vector<reference_wrapper<AudioSource>> components = this->compmgr.get_components_by_type<AudioSource>();
+
+	for (auto component_ref : components) {
+		AudioSource & component = component_ref.get();
+		if (!component.active) continue;
+
+		// TODO: fetch Sound instance from resourcemanager
+		// TODO: lots of state diffing
+	}
+}
+
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
new file mode 100644
index 0000000..8fb681f
--- /dev/null
+++ b/src/crepe/system/AudioSystem.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "../facade/SoundContext.h"
+
+#include "System.h"
+
+namespace crepe {
+
+class AudioSystem : public System {
+public:
+	AudioSystem(SoundContext & ctx);
+
+public:
+	void update();
+
+private:
+	SoundContext & ctx;
+};
+
+} // namespace crepe
+
diff --git a/src/crepe/system/CMakeLists.txt b/src/crepe/system/CMakeLists.txt
index ff6f66f..ca62add 100644
--- a/src/crepe/system/CMakeLists.txt
+++ b/src/crepe/system/CMakeLists.txt
@@ -1,9 +1,11 @@
 target_sources(crepe PUBLIC
+	System.cpp
 	ParticleSystem.cpp
 	ScriptSystem.cpp
 	PhysicsSystem.cpp
 	CollisionSystem.cpp
 	RenderSystem.cpp
+	AudioSystem.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -12,4 +14,5 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	PhysicsSystem.h
 	CollisionSystem.h
 	RenderSystem.h
+	AudioSystem.h
 )
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index f2673e7..68fbb02 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -22,9 +22,8 @@ void ScriptSystem::update() {
 
 forward_list<Script *> ScriptSystem::get_scripts() {
 	forward_list<Script *> scripts = {};
-	ComponentManager & mgr = ComponentManager::get_instance();
 	vector<reference_wrapper<BehaviorScript>> behavior_scripts
-		= mgr.get_components_by_type<BehaviorScript>();
+		= this->compmgr.get_components_by_type<BehaviorScript>();
 
 	for (auto behavior_script_ref : behavior_scripts) {
 		BehaviorScript & behavior_script = behavior_script_ref.get();
diff --git a/src/crepe/system/System.cpp b/src/crepe/system/System.cpp
new file mode 100644
index 0000000..fa51d2f
--- /dev/null
+++ b/src/crepe/system/System.cpp
@@ -0,0 +1,7 @@
+#include "System.h"
+
+using namespace crepe;
+
+// TODO: ComponentManager shouldn't be a singleton
+System::System() : compmgr(ComponentManager::get_instance()) {}
+
diff --git a/src/crepe/system/System.h b/src/crepe/system/System.h
index 3b81bef..5091977 100644
--- a/src/crepe/system/System.h
+++ b/src/crepe/system/System.h
@@ -1,14 +1,22 @@
 #pragma once
 
+#include "../ComponentManager.h"
+
 namespace crepe {
 
+//! ECS system base class
 class System {
 public:
+	//! Process components belonging to this system
 	virtual void update() = 0;
 
 public:
-	System() = default;
+	System();
 	virtual ~System() = default;
+
+public:
+	//! Reference to component manager
+	ComponentManager & compmgr;
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From d258fcc8efdb6a968a220c4590a204292a16ad42 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 14 Nov 2024 20:27:05 +0100
Subject: added thoughts

---
 src/crepe/Component.h            | 12 +++++++++---
 src/crepe/api/AudioSource.h      | 11 ++++++++++-
 src/crepe/system/AudioSystem.cpp | 37 ++++++++++++++++++++++++++++++++++++-
 src/crepe/system/AudioSystem.h   |  2 ++
 src/test/ResourceManagerTest.cpp | 11 ++++++-----
 5 files changed, 63 insertions(+), 10 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index 12c10cb..7734335 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -16,7 +16,12 @@ class Component {
 public:
 	//! Whether the component is active
 	bool active = true;
-	//! The id of the GameObject this component belongs to
+	/**
+	 * \brief The id of the GameObject this component belongs to
+	 *
+	 * \note Only systems are supposed to use this member, but since friend
+	 * relations aren't inherited this needs to be public.
+	 */
 	const game_object_id_t game_object_id;
 
 protected:
@@ -24,10 +29,9 @@ protected:
 	 * \param id The id of the GameObject this component belongs to
 	 */
 	Component(game_object_id_t id);
-	//! Only the ComponentManager can create components
+	//! Only ComponentManager can create components
 	friend class ComponentManager;
 
-public:
 	/**
 	 * \brief Get the maximum number of instances for this component
 	 *
@@ -38,6 +42,8 @@ public:
 	 * \return The maximum number of instances for this component
 	 */
 	virtual int get_instances_max() const { return -1; }
+	//! Only ComponentManager needs to know the max instance count
+	friend class ComponentManager;
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 8a78927..1264790 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -7,10 +7,19 @@
 
 namespace crepe {
 
+class AudioSystem;
+
 //! Audio source component
 class AudioSource : public Component {
-public:
+	//! AudioSource components are handled by AudioSystem
+	friend class AudioSystem;
+
+protected:
 	AudioSource(game_object_id_t id, const Asset & source);
+	//! Only ComponentManager can create components
+	friend class ComponentManager;
+public:
+	// But std::unique_ptr needs to be able to destoy this component again
 	virtual ~AudioSource() = default;
 
 public:
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index 67967ef..c8dae9d 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -14,7 +14,42 @@ void AudioSystem::update() {
 		AudioSource & component = component_ref.get();
 		if (!component.active) continue;
 
-		// TODO: fetch Sound instance from resourcemanager
+		/**
+		 * How this is supposed to work:
+		 * - Get an instance of Sound for this resource/component combo (Sound
+		 *   instance is supposed to be unique per component, even if they use the
+		 *   same underlying asset).
+		 * OR
+		 * - Use the same instance of Sound if this is what the cache returns
+		 *   (= what the game programmer's wishes to do).
+		 *
+		 * NOT supposed to happen but still the case:
+		 * - Below function call causes assets to be cached unintentionally
+		 * - Cached assets are deleted at the end of a scene (i think?)
+		 * - I'm not sure if the ResourceManager is even supposed to have a public
+		 *   `.clear()` method since the control over resource lifetime is
+		 *   explicitly handed over to the game programmer by using ResourceManager
+		 *   to cache/uncache. I believe the proper methods are supposed to be:
+		 *
+		 *   - get()       get a reference to resource (used here)
+		 *   - clear()     clears NON-cached assets
+		 *   - cache()     marks asset as "do not delete at end of scene"
+		 *   - uncache()   undoes the above
+		 *
+		 *   I think somewhere in the above function calls a unique identifier for
+		 *   the Asset/GameObject should be given to make sure the unique instance
+		 *   shit works as intended. The resource manager is also used for things
+		 *   other than sounds.
+		 *
+		 * Also need to check:
+		 * - Is it an issue if there are multiple AudioSource components playing
+		 *   the same sample (= identical Asset), while they are all triggered
+		 *   using the same underlying instance of Sound (esp. w/
+		 *   play/pause/retrigger behavior).
+		 */
+		Sound & sound = this->resman.cache<Sound>(component.source);
+		sound.set_context(this->context);
+
 		// TODO: lots of state diffing
 	}
 }
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index e037f51..d0b4f9a 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../facade/SoundContext.h"
+#include "../api/ResourceManager.h"
 
 #include "System.h"
 
@@ -13,6 +14,7 @@ public:
 
 private:
 	SoundContext context {};
+	ResourceManager & resman = ResourceManager::get_instance();
 };
 
 } // namespace crepe
diff --git a/src/test/ResourceManagerTest.cpp b/src/test/ResourceManagerTest.cpp
index 5d1ae7a..3fc9ebd 100644
--- a/src/test/ResourceManagerTest.cpp
+++ b/src/test/ResourceManagerTest.cpp
@@ -14,12 +14,17 @@ public:
 	Config & cfg = Config::get_instance();
 
 	void SetUp() override {
-		cfg.log.level = Log::Level::TRACE;
 		resman.clear();
 	}
 };
 
 TEST_F(ResourceManagerTest, Main) {
+	// NOTE: there is no way (that I know of) to ensure the last cache call
+	// allocates the new Sound instance in a different location than the first,
+	// so this test should be verified manually using these print statements and
+	// debug trace messages.
+	cfg.log.level = Log::Level::TRACE;
+
 	Asset path1 = "mwe/audio/sfx1.wav";
 	Asset path2 = "mwe/audio/sfx1.wav";
 	ASSERT_EQ(path1, path2);
@@ -43,9 +48,5 @@ TEST_F(ResourceManagerTest, Main) {
 
 	Log::logf(Log::Level::DEBUG, "Get first sound again (constructor call)");
 	Sound & sound = resman.cache<Sound>(path1);
-
-	// NOTE: there is no way (that I know of) to ensure the above statement
-	// allocates the new Sound instance in a different location than the first,
-	// so this test was verified using the above print statements.
 }
 
-- 
cgit v1.2.3


From a685e5f743786cc6499e7ce8973bb78a83d101f7 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 26 Nov 2024 20:03:41 +0100
Subject: big WIP

---
 src/crepe/CMakeLists.txt          |   2 +
 src/crepe/ResourceManager.cpp     |  36 ++++++++++++
 src/crepe/ResourceManager.h       |  76 +++++++++++++++++++++++++
 src/crepe/api/AudioSource.h       |   1 +
 src/crepe/api/CMakeLists.txt      |   2 -
 src/crepe/api/Config.h            |  27 +--------
 src/crepe/api/ResourceManager.cpp |  41 --------------
 src/crepe/api/ResourceManager.h   |  69 -----------------------
 src/crepe/system/AudioSystem.cpp  |   2 +-
 src/crepe/system/AudioSystem.h    |   4 +-
 src/crepe/util/Log.cpp            |   2 +-
 src/crepe/util/Log.h              |  16 ++++++
 src/test/EventTest.cpp            |   1 -
 src/test/ResourceManagerTest.cpp  | 115 +++++++++++++++++++++++++++-----------
 src/test/main.cpp                 |  12 ++--
 15 files changed, 224 insertions(+), 182 deletions(-)
 create mode 100644 src/crepe/ResourceManager.cpp
 create mode 100644 src/crepe/ResourceManager.h
 delete mode 100644 src/crepe/api/ResourceManager.cpp
 delete mode 100644 src/crepe/api/ResourceManager.h

(limited to 'src/crepe/system')

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index df15b8f..0313dfa 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -3,6 +3,7 @@ target_sources(crepe PUBLIC
 	ComponentManager.cpp
 	Component.cpp
 	Collider.cpp
+	ResourceManager.cpp
 	Resource.cpp
 )
 
@@ -13,6 +14,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Collider.h
 	ValueBroker.h
 	ValueBroker.hpp
+	ResourceManager.h
 	Resource.h
 )
 
diff --git a/src/crepe/ResourceManager.cpp b/src/crepe/ResourceManager.cpp
new file mode 100644
index 0000000..111b9e0
--- /dev/null
+++ b/src/crepe/ResourceManager.cpp
@@ -0,0 +1,36 @@
+#include <stdexcept>
+
+#include "util/Log.h"
+
+#include "ResourceManager.h"
+
+using namespace crepe;
+using namespace std;
+
+ResourceManager::~ResourceManager() { dbg_trace(); }
+ResourceManager::ResourceManager() { dbg_trace(); }
+
+void ResourceManager::clear() {
+	this->resources.clear();
+}
+
+// template <typename T>
+// T & ResourceManager::cache(const Asset & asset) {
+// 	dbg_trace();
+// 	static_assert(is_base_of<Resource, T>::value, "cache must recieve a derivative class of Resource");
+// 
+// 	if (!this->resources.contains(asset))
+// 		this->resources[asset] = make_unique<T>(asset);
+// 
+// 	Resource * resource = this->resources.at(asset).get();
+// 	T * concrete_resource = dynamic_cast<T *>(resource);
+// 
+// 	if (concrete_resource == nullptr)
+// 		throw runtime_error(format("ResourceManager: mismatch between requested type and actual type of resource ({})", asset.get_path()));
+// 
+// 	return *concrete_resource;
+// }
+// 
+// #include "facade/Sound.h"
+// template Sound & ResourceManager::cache(const Asset &);
+
diff --git a/src/crepe/ResourceManager.h b/src/crepe/ResourceManager.h
new file mode 100644
index 0000000..26a86a8
--- /dev/null
+++ b/src/crepe/ResourceManager.h
@@ -0,0 +1,76 @@
+#pragma once
+
+#include <memory>
+#include <unordered_map>
+
+#include "api/Asset.h"
+
+#include "Component.h"
+#include "Resource.h"
+
+namespace crepe {
+
+
+/**
+ * \brief The ResourceManager is responsible for storing and managing assets over
+ * multiple scenes.
+ * 
+ * The ResourceManager ensures that assets are loaded once and can be accessed
+ * across different scenes. It caches assets to avoid reloading them every time
+ * a scene is loaded. Assets are retained in memory until the ResourceManager is
+ * destroyed, at which point the cached assets are cleared.
+ */
+class ResourceManager {
+public:
+	ResourceManager(); // dbg_trace
+	virtual ~ResourceManager(); // dbg_trace
+
+private:
+	template <typename Resource>
+	Resource & get_internal(const Component & component, const Asset & asset);
+
+	template <typename Resource>
+	const Asset & get_source(const Component & component) const;
+
+	//! A cache that holds all the assets, accessible by their file path, over multiple scenes.
+	std::unordered_map<const Asset, std::unique_ptr<Resource>> resources;
+
+public:
+	/**
+	 * \brief Caches an asset by loading it from the given file path.
+	 *
+	 * \param file_path The path to the asset file to load.
+	 * \param reload If true, the asset will be reloaded from the file, even if
+	 * it is already cached.
+	 * \tparam T The type of asset to cache (e.g., texture, sound, etc.).
+	 * 
+	 * \return A reference to the resource
+	 * 
+	 * This template function caches the asset at the given file path. If the
+	 * asset is already cached, the existing instance will be returned.
+	 * Otherwise, the concrete resource will be instantiated and added to the
+	 * cache.
+	 */
+	template <typename Resource>
+	void cache(const Asset & asset, bool persistent = false);
+
+	template <typename Component>
+	void cache(const Component & component, bool persistent = false);
+
+	// void resman.cache<Resource>(Asset, Lifetime);
+	// void resman.cache(Component, Asset, Lifetime);
+
+	template <typename Resource, typename Component>
+	Resource & get(const Component & component);
+
+	//! Clear the resource cache
+	void clear();
+};
+
+class Sound;
+class AudioSource;
+template <>
+Sound & ResourceManager::get(const AudioSource & component);
+
+} // namespace crepe
+
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 1264790..0950129 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -3,6 +3,7 @@
 #include "../Component.h"
 #include "../types.h"
 
+#include "GameObject.h"
 #include "Asset.h"
 
 namespace crepe {
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index a2e21fa..ad82924 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -7,7 +7,6 @@ target_sources(crepe PUBLIC
 	Transform.cpp
 	Color.cpp
 	Texture.cpp
-	ResourceManager.cpp
 	Sprite.cpp
 	SaveManager.cpp
 	Config.cpp
@@ -39,7 +38,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Vector2.hpp
 	Color.h
 	Texture.h 
-	ResourceManager.h 
 	SaveManager.h
 	Scene.h
 	Metadata.h
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 0c9d116..5bd6913 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -11,35 +11,12 @@ namespace crepe {
  * modified *before* execution is handed over from the game programmer to the engine (i.e. the
  * main loop is started).
  */
-class Config final {
-public:
+struct Config final {
 	//! Retrieve handle to global Config instance
 	static Config & get_instance();
 
-private:
-	Config() = default;
-	~Config() = default;
-	Config(const Config &) = default;
-	Config(Config &&) = default;
-	Config & operator=(const Config &) = default;
-	Config & operator=(Config &&) = default;
-
-public:
 	//! Logging-related settings
-	struct {
-		/**
-		 * \brief Log level
-		 *
-		 * Only messages with equal or higher priority than this value will be logged.
-		 */
-		Log::Level level = Log::Level::INFO;
-		/**
-		 * \brief Colored log output
-		 *
-		 * Enables log coloring using ANSI escape codes.
-		 */
-		bool color = true;
-	} log;
+	Log::Config log;
 
 	//! Save manager
 	struct {
diff --git a/src/crepe/api/ResourceManager.cpp b/src/crepe/api/ResourceManager.cpp
deleted file mode 100644
index 7877ed9..0000000
--- a/src/crepe/api/ResourceManager.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <stdexcept>
-
-#include "util/Log.h"
-
-#include "ResourceManager.h"
-
-using namespace crepe;
-using namespace std;
-
-ResourceManager & ResourceManager::get_instance() {
-	static ResourceManager instance;
-	return instance;
-}
-
-ResourceManager::~ResourceManager() { dbg_trace(); }
-ResourceManager::ResourceManager() { dbg_trace(); }
-
-void ResourceManager::clear() {
-	this->resources.clear();
-}
-
-template <typename T>
-T & ResourceManager::cache(const Asset & asset) {
-	dbg_trace();
-	static_assert(is_base_of<Resource, T>::value, "cache must recieve a derivative class of Resource");
-
-	if (!this->resources.contains(asset))
-		this->resources[asset] = make_unique<T>(asset);
-
-	Resource * resource = this->resources.at(asset).get();
-	T * concrete_resource = dynamic_cast<T *>(resource);
-
-	if (concrete_resource == nullptr)
-		throw runtime_error(format("ResourceManager: mismatch between requested type and actual type of resource ({})", asset.get_path()));
-
-	return *concrete_resource;
-}
-
-#include "../facade/Sound.h"
-template Sound & ResourceManager::cache(const Asset &);
-
diff --git a/src/crepe/api/ResourceManager.h b/src/crepe/api/ResourceManager.h
deleted file mode 100644
index efdd5c5..0000000
--- a/src/crepe/api/ResourceManager.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <unordered_map>
-
-#include "Asset.h"
-#include "Resource.h"
-
-namespace crepe {
-
-class Sound;
-
-/**
- * \brief The ResourceManager is responsible for storing and managing assets over
- * multiple scenes.
- * 
- * The ResourceManager ensures that assets are loaded once and can be accessed
- * across different scenes. It caches assets to avoid reloading them every time
- * a scene is loaded. Assets are retained in memory until the ResourceManager is
- * destroyed, at which point the cached assets are cleared.
- */
-class ResourceManager {
-
-private:
-	//! A cache that holds all the assets, accessible by their file path, over multiple scenes.
-	std::unordered_map<const Asset, std::unique_ptr<Resource>> resources;
-
-private:
-	ResourceManager(); // dbg_trace
-	virtual ~ResourceManager(); // dbg_trace
-
-	ResourceManager(const ResourceManager &) = delete;
-	ResourceManager(ResourceManager &&) = delete;
-	ResourceManager & operator=(const ResourceManager &) = delete;
-	ResourceManager & operator=(ResourceManager &&) = delete;
-
-public:
-	/**
-	 * \brief Retrieves the singleton instance of the ResourceManager.
-	 *
-	 * \return A reference to the single instance of the ResourceManager.
-	 */
-	static ResourceManager & get_instance();
-
-public:
-	/**
-	 * \brief Caches an asset by loading it from the given file path.
-	 *
-	 * \param file_path The path to the asset file to load.
-	 * \param reload If true, the asset will be reloaded from the file, even if
-	 * it is already cached.
-	 * \tparam T The type of asset to cache (e.g., texture, sound, etc.).
-	 * 
-	 * \return A reference to the resource
-	 * 
-	 * This template function caches the asset at the given file path. If the
-	 * asset is already cached, the existing instance will be returned.
-	 * Otherwise, the concrete resource will be instantiated and added to the
-	 * cache.
-	 */
-	template <typename T>
-	T & cache(const Asset & asset);
-
-	//! Clear the resource cache
-	void clear();
-};
-
-} // namespace crepe
-
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index b7ac1f2..6c30b85 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -47,7 +47,7 @@ void AudioSystem::update() {
 		 *   using the same underlying instance of Sound (esp. w/
 		 *   play/pause/retrigger behavior).
 		 */
-		Sound & sound = this->resman.cache<Sound>(component.source);
+		// Sound & sound = this->resource_manager.get<Sound>(component);
 
 		// TODO: lots of state diffing
 	}
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index d0b4f9a..d3d5aeb 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../facade/SoundContext.h"
-#include "../api/ResourceManager.h"
+#include "../ResourceManager.h"
 
 #include "System.h"
 
@@ -14,7 +14,7 @@ public:
 
 private:
 	SoundContext context {};
-	ResourceManager & resman = ResourceManager::get_instance();
+	ResourceManager resource_manager {};
 };
 
 } // namespace crepe
diff --git a/src/crepe/util/Log.cpp b/src/crepe/util/Log.cpp
index 84d80a8..bc86c7e 100644
--- a/src/crepe/util/Log.cpp
+++ b/src/crepe/util/Log.cpp
@@ -25,7 +25,7 @@ string Log::prefix(const Level & level) {
 }
 
 void Log::log(const Level & level, const string & msg) {
-	auto & cfg = Config::get_instance();
+	auto & cfg = crepe::Config::get_instance();
 	if (level < cfg.log.level) return;
 
 	string out = Log::prefix(level) + msg;
diff --git a/src/crepe/util/Log.h b/src/crepe/util/Log.h
index fc0bb3a..914145a 100644
--- a/src/crepe/util/Log.h
+++ b/src/crepe/util/Log.h
@@ -77,6 +77,22 @@ private:
 	 * \return Colored message severity prefix string
 	 */
 	static std::string prefix(const Level & level);
+
+public:
+	struct Config {
+		/**
+		 * \brief Log level
+		 *
+		 * Only messages with equal or higher priority than this value will be logged.
+		 */
+		Level level = INFO;
+		/**
+		 * \brief Colored log output
+		 *
+		 * Enables log coloring using ANSI escape codes.
+		 */
+		bool color = true;
+	};
 };
 
 } // namespace crepe
diff --git a/src/test/EventTest.cpp b/src/test/EventTest.cpp
index b0e6c9c..a21a851 100644
--- a/src/test/EventTest.cpp
+++ b/src/test/EventTest.cpp
@@ -37,7 +37,6 @@ public:
 
 TEST_F(EventManagerTest, EventSubscription) {
 	EventHandler<KeyPressEvent> key_handler = [](const KeyPressEvent & e) {
-		std::cout << "Key Event Triggered" << std::endl;
 		return true;
 	};
 
diff --git a/src/test/ResourceManagerTest.cpp b/src/test/ResourceManagerTest.cpp
index 3fc9ebd..f57c419 100644
--- a/src/test/ResourceManagerTest.cpp
+++ b/src/test/ResourceManagerTest.cpp
@@ -1,52 +1,101 @@
 #include <gtest/gtest.h>
 
+#define private public
+#define protected public
+
 #include <crepe/util/Log.h>
-#include <crepe/api/Config.h>
-#include <crepe/api/ResourceManager.h>
+#include <crepe/ResourceManager.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/Component.h>
+#include <crepe/ComponentManager.h>
 
 using namespace std;
 using namespace crepe;
 using namespace testing;
 
+class TestComponent : public Component {
+public:
+	TestComponent(game_object_id_t id, const Asset & asset)
+		: Component(id),
+		  source(asset) {}
+	const Asset source;
+};
+
+class TestResource : public Resource {
+public:
+	static unsigned instances;
+
+public:
+	const unsigned instance;
+	TestResource(const Asset & src)
+		: Resource(src),
+		  instance(this->instances++) { }
+};
+unsigned TestResource::instances = 0;
+
+template <>
+TestResource & ResourceManager::get(const TestComponent & component) {
+	return this->get_internal<TestResource>(component, component.source);
+}
+
 class ResourceManagerTest : public Test {
 public:
-	ResourceManager & resman = ResourceManager::get_instance();
-	Config & cfg = Config::get_instance();
+	ResourceManager resource_manager{};
+
+	static constexpr const char * ASSET_LOCATION = "asset/texture/img.png";
+
+	TestComponent a{0, ASSET_LOCATION};
+	TestComponent b{1, ASSET_LOCATION};
 
+private:
 	void SetUp() override {
-		resman.clear();
+		TestResource::instances = 0;
 	}
 };
 
-TEST_F(ResourceManagerTest, Main) {
-	// NOTE: there is no way (that I know of) to ensure the last cache call
-	// allocates the new Sound instance in a different location than the first,
-	// so this test should be verified manually using these print statements and
-	// debug trace messages.
-	cfg.log.level = Log::Level::TRACE;
-
-	Asset path1 = "mwe/audio/sfx1.wav";
-	Asset path2 = "mwe/audio/sfx1.wav";
-	ASSERT_EQ(path1, path2);
-
-	Sound * ptr1 = nullptr;
-	Sound * ptr2 = nullptr;
-	{
-		Log::logf(Log::Level::DEBUG, "Get first sound (constructor call)");
-		Sound & sound = resman.cache<Sound>(path1);
-		ptr1 = &sound;
-	}
-	{
-		Log::logf(Log::Level::DEBUG, "Get same sound (NO constructor call)");
-		Sound & sound = resman.cache<Sound>(path2);
-		ptr2 = &sound;
-	}
-	EXPECT_EQ(ptr1, ptr2);
+TEST_F(ResourceManagerTest, Uncached) {
+	TestResource & res_1 = resource_manager.get<TestResource>(a); // 1
+	TestResource & res_2 = resource_manager.get<TestResource>(a); // 1
+	TestResource & res_3 = resource_manager.get<TestResource>(b); // 2
+	TestResource & res_4 = resource_manager.get<TestResource>(b); // 2
+
+	ASSERT_EQ(res_1, res_2);
+	ASSERT_EQ(res_3, res_4);
+	EXPECT_NE(res_1, res_3);
+
+	EXPECT_EQ(TestResource::instances, 2);
+}
+
+// TODO: per GameObject / Component
+TEST_F(ResourceManagerTest, PerComponent) {
+	resource_manager.cache(a);
+	resource_manager.cache(b);
+
+	TestResource & res_1 = resource_manager.get<TestResource>(a); // 1
+	TestResource & res_2 = resource_manager.get<TestResource>(a); // 1
+	TestResource & res_3 = resource_manager.get<TestResource>(b); // 2
+	TestResource & res_4 = resource_manager.get<TestResource>(b); // 2
+
+	ASSERT_EQ(res_1, res_2);
+	ASSERT_EQ(res_3, res_4);
+	EXPECT_NE(res_1, res_3);
+
+	EXPECT_EQ(TestResource::instances, 2);
+}
+
+TEST_F(ResourceManagerTest, PerAsset) {
+	resource_manager.cache(ASSET_LOCATION);
+	EXPECT_EQ(TestResource::instances, 1);
+
+	TestResource & res_1 = resource_manager.get<TestResource>(a); // 1
+	TestResource & res_2 = resource_manager.get<TestResource>(a); // 1
+	TestResource & res_3 = resource_manager.get<TestResource>(b); // 1
+	TestResource & res_4 = resource_manager.get<TestResource>(b); // 1
 
-	Log::logf(Log::Level::DEBUG, "Clear cache (destructor call)");
-	resman.clear();
+	EXPECT_EQ(res_1, res_2);
+	EXPECT_EQ(res_2, res_3);
+	EXPECT_EQ(res_3, res_4);
 
-	Log::logf(Log::Level::DEBUG, "Get first sound again (constructor call)");
-	Sound & sound = resman.cache<Sound>(path1);
+	EXPECT_EQ(TestResource::instances, 1);
 }
 
diff --git a/src/test/main.cpp b/src/test/main.cpp
index e03a989..54f74fd 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -1,8 +1,4 @@
 #include <gtest/gtest.h>
-
-#define protected public
-#define private public
-
 #include <crepe/api/Config.h>
 
 using namespace crepe;
@@ -11,12 +7,14 @@ using namespace testing;
 class GlobalConfigReset : public EmptyTestEventListener {
 public:
 	Config & cfg = Config::get_instance();
-	Config cfg_default = Config();
 
 	// This function is called before each test
 	void OnTestStart(const TestInfo &) override {
-		cfg = cfg_default;
-		cfg.log.level = Log::Level::WARNING;
+		cfg = {
+			.log = {
+				.level = Log::Level::WARNING,
+			},
+		};
 	}
 };
 
-- 
cgit v1.2.3


From 74bffd3e466c342ca80811146a536716fb6437cb Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 28 Nov 2024 18:19:51 +0100
Subject: remove large think

---
 src/crepe/system/AudioSystem.cpp | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index 6c30b85..f90132a 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -14,41 +14,7 @@ void AudioSystem::update() {
 		AudioSource & component = component_ref.get();
 		if (!component.active) continue;
 
-		/**
-		 * How this is supposed to work:
-		 * - Get an instance of Sound for this resource/component combo (Sound
-		 *   instance is supposed to be unique per component, even if they use the
-		 *   same underlying asset).
-		 * OR
-		 * - Use the same instance of Sound if this is what the cache returns
-		 *   (= what the game programmer's wishes to do).
-		 *
-		 * NOT supposed to happen but still the case:
-		 * - Below function call causes assets to be cached unintentionally
-		 * - Cached assets are deleted at the end of a scene (i think?)
-		 * - I'm not sure if the ResourceManager is even supposed to have a public
-		 *   `.clear()` method since the control over resource lifetime is
-		 *   explicitly handed over to the game programmer by using ResourceManager
-		 *   to cache/uncache. I believe the proper methods are supposed to be:
-		 *
-		 *   - get()       get a reference to resource (used here)
-		 *   - clear()     clears NON-cached assets
-		 *   - cache()     marks asset as "do not delete at end of scene"
-		 *   - uncache()   undoes the above
-		 *
-		 *   I think somewhere in the above function calls a unique identifier for
-		 *   the Asset/GameObject should be given to make sure the unique instance
-		 *   shit works as intended. The resource manager is also used for things
-		 *   other than sounds.
-		 *
-		 * Also need to check:
-		 * - Is it an issue if there are multiple AudioSource components playing
-		 *   the same sample (= identical Asset), while they are all triggered
-		 *   using the same underlying instance of Sound (esp. w/
-		 *   play/pause/retrigger behavior).
-		 */
-		// Sound & sound = this->resource_manager.get<Sound>(component);
-
+		Sound & sound = this->resource_manager.get<Sound>(component.source);
 		// TODO: lots of state diffing
 	}
 }
-- 
cgit v1.2.3


From c59d460f12e1393e0ddbaaa1c6f5522eb12f8ff9 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Fri, 29 Nov 2024 16:23:52 +0100
Subject: more utility classes for Audio system

---
 src/crepe/api/AudioSource.h      | 11 ++-----
 src/crepe/facade/Sound.h         |  4 +++
 src/crepe/system/AudioSystem.cpp | 17 +++++++++--
 src/crepe/system/AudioSystem.h   | 21 +++++++++++++
 src/crepe/util/CMakeLists.txt    |  3 ++
 src/crepe/util/Private.cpp       | 29 ++++++++++++++++++
 src/crepe/util/Private.h         | 34 +++++++++++++++++++++
 src/crepe/util/Private.hpp       | 31 +++++++++++++++++++
 src/example/CMakeLists.txt       |  1 -
 src/example/asset_manager.cpp    | 36 ----------------------
 src/test/AudioTest.cpp           |  5 ++-
 src/test/CMakeLists.txt          |  1 +
 src/test/PrivateTest.cpp         | 66 ++++++++++++++++++++++++++++++++++++++++
 13 files changed, 210 insertions(+), 49 deletions(-)
 create mode 100644 src/crepe/util/Private.cpp
 create mode 100644 src/crepe/util/Private.h
 create mode 100644 src/crepe/util/Private.hpp
 delete mode 100644 src/example/asset_manager.cpp
 create mode 100644 src/test/PrivateTest.cpp

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 0950129..9d76f0b 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -2,6 +2,7 @@
 
 #include "../Component.h"
 #include "../types.h"
+#include "../util/Private.h"
 
 #include "GameObject.h"
 #include "Asset.h"
@@ -47,14 +48,8 @@ private:
 	bool rewind = false;
 
 private:
-	//! Value of \c active after last system update
-	bool last_active = false;
-	//! Value of \c playing after last system update
-	bool last_playing = false;
-	//! Value of \c volume after last system update
-	float last_volume = 1.0;
-	//! Value of \c loop after last system update
-	bool last_loop = false;
+	//! AudioSystem::ComponentPrivate
+	Private private_data;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/Sound.h b/src/crepe/facade/Sound.h
index b0b80f8..f33ee58 100644
--- a/src/crepe/facade/Sound.h
+++ b/src/crepe/facade/Sound.h
@@ -9,6 +9,10 @@ namespace crepe {
 
 class SoundContext;
 
+struct SoundHandle {
+	SoLoud::handle handle;
+};
+
 /**
  * \brief Sound resource facade
  *
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index 97cf966..0f943be 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -1,6 +1,5 @@
 #include "AudioSystem.h"
 
-#include "../api/AudioSource.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/ResourceManager.h"
 #include "../types.h"
@@ -13,12 +12,24 @@ void AudioSystem::update() {
 	ResourceManager & resource_manager = this->mediator.resource_manager;
 	RefVector<AudioSource> components = component_manager.get_components_by_type<AudioSource>();
 
-	for (auto component_ref : components) {
-		AudioSource & component = component_ref.get();
+	for (AudioSource & component : components) {
 		if (!component.active) continue;
 
 		Sound & sound = resource_manager.get<Sound>(component.source);
+		if (component.private_data.empty())
+			component.private_data.set<ComponentPrivate>();
+		auto & data = component.private_data.get<ComponentPrivate>();
 		// TODO: lots of state diffing
+
+
+		this->update_private(component, data);
 	}
 }
 
+void AudioSystem::update_private(const AudioSource & component, ComponentPrivate & data) {
+	data.last_active = component.active;
+	data.last_loop = component.loop;
+	data.last_playing = component.playing;
+	data.last_volume = component.volume;
+}
+
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index e037f51..7f41fda 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../facade/SoundContext.h"
+#include "../api/AudioSource.h"
 
 #include "System.h"
 
@@ -11,6 +12,26 @@ public:
 	using System::System;
 	void update() override;
 
+private:
+	/**
+	 * \brief Private data stored by AudioSystem on AudioSource component
+	 */
+	struct ComponentPrivate {
+		//! This sample's voice handle
+		SoLoud::handle handle;
+
+		//! Value of \c active after last system update
+		bool last_active = false;
+		//! Value of \c playing after last system update
+		bool last_playing = false;
+		//! Value of \c volume after last system update
+		float last_volume = 1.0;
+		//! Value of \c loop after last system update
+		bool last_loop = false;
+	};
+
+	void update_private(const AudioSource & component, ComponentPrivate & data);
+
 private:
 	SoundContext context {};
 };
diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
index 94ed906..f49d851 100644
--- a/src/crepe/util/CMakeLists.txt
+++ b/src/crepe/util/CMakeLists.txt
@@ -1,6 +1,7 @@
 target_sources(crepe PUBLIC
 	LogColor.cpp
 	Log.cpp
+	Private.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -11,5 +12,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Proxy.hpp
 	OptionalRef.h
 	OptionalRef.hpp
+	Private.h
+	Private.hpp
 )
 
diff --git a/src/crepe/util/Private.cpp b/src/crepe/util/Private.cpp
new file mode 100644
index 0000000..c5b5b30
--- /dev/null
+++ b/src/crepe/util/Private.cpp
@@ -0,0 +1,29 @@
+#include "Private.h"
+
+using namespace crepe;
+
+bool Private::empty() const noexcept {
+	return this->instance == nullptr;
+}
+
+Private::~Private() {
+	if (this->instance == nullptr) return;
+	this->destructor(this->instance);
+}
+
+Private::Private(Private && other) {
+	*this = std::move(other);
+}
+
+Private & Private::operator=(Private && other) {
+	// TODO: ideally this function checks for self-assignment
+	this->instance = other.instance;
+	this->destructor = other.destructor;
+	this->type = other.type;
+
+	other.instance = nullptr;
+	other.destructor = [](void*){};
+
+	return *this;
+}
+
diff --git a/src/crepe/util/Private.h b/src/crepe/util/Private.h
new file mode 100644
index 0000000..fc3728f
--- /dev/null
+++ b/src/crepe/util/Private.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <typeindex>
+#include <functional>
+
+namespace crepe {
+
+class Private {
+public:
+	Private() = default;
+	~Private();
+	Private(Private &&);
+	Private & operator=(Private &&);
+	Private(const Private &) = delete;
+	Private & operator=(const Private &) = delete;
+
+	template <typename T>
+	T & get();
+
+	template <typename T, typename... Args>
+	void set(Args &&... args);
+
+	bool empty() const noexcept;
+
+private:
+	std::function<void(void *)> destructor;
+	std::type_index type = typeid(void);
+	void * instance = nullptr;
+};
+
+}
+
+#include "Private.hpp"
+
diff --git a/src/crepe/util/Private.hpp b/src/crepe/util/Private.hpp
new file mode 100644
index 0000000..30c8146
--- /dev/null
+++ b/src/crepe/util/Private.hpp
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <stdexcept>
+#include <format>
+
+#include "Private.h"
+
+namespace crepe {
+
+template <typename T, typename... Args>
+void Private::set(Args &&... args) {
+	T * instance = new T(std::forward<Args>(args)...);
+	this->instance = static_cast<void*>(instance);
+	this->destructor = [](void * instance) {
+		delete static_cast<T*>(instance);
+	};
+	this->type = typeid(T);
+}
+
+template <typename T>
+T & Private::get() {
+	using namespace std;
+	if (this->empty())
+		throw out_of_range("Private: get() called on empty object");
+	type_index requested_type = typeid(T);
+	if (this->type != requested_type)
+		throw logic_error(format("Private: get() called with [T = {}] (actual is [T = {}])", requested_type.name(), this->type.name()));
+	return *static_cast<T*>(this->instance);
+}
+
+}
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 560e2bc..9c3c550 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -16,7 +16,6 @@ function(add_example target_name)
 	add_dependencies(examples ${target_name})
 endfunction()
 
-add_example(asset_manager)
 add_example(savemgr)
 add_example(rendering_particle)
 add_example(gameloop)
diff --git a/src/example/asset_manager.cpp b/src/example/asset_manager.cpp
deleted file mode 100644
index 660b318..0000000
--- a/src/example/asset_manager.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <crepe/api/AssetManager.h>
-#include <crepe/api/Texture.h>
-#include <crepe/facade/Sound.h>
-
-using namespace crepe;
-
-int main() {
-
-	// this needs to be called before the asset manager otherwise the destructor of sdl is not in
-	// the right order
-	{ Texture test("asset/texture/img.png"); }
-	// FIXME: make it so the issue described by the above comment is not possible (i.e. the order
-	// in which internal classes are instantiated should not impact the way the engine works).
-
-	auto & mgr = AssetManager::get_instance();
-
-	{
-		// TODO: [design] the Sound class can't be directly included by the user as it includes
-		// SoLoud headers.
-		auto bgm = mgr.cache<Sound>("mwe/audio/bgm.ogg");
-		auto sfx1 = mgr.cache<Sound>("mwe/audio/sfx1.wav");
-		auto sfx2 = mgr.cache<Sound>("mwe/audio/sfx2.wav");
-
-		auto img = mgr.cache<Texture>("asset/texture/img.png");
-		auto img1 = mgr.cache<Texture>("asset/texture/second.png");
-	}
-
-	{
-		auto bgm = mgr.cache<Sound>("mwe/audio/bgm.ogg");
-		auto sfx1 = mgr.cache<Sound>("mwe/audio/sfx1.wav");
-		auto sfx2 = mgr.cache<Sound>("mwe/audio/sfx2.wav");
-
-		auto img = mgr.cache<Texture>("asset/texture/img.png");
-		auto img1 = mgr.cache<Texture>("asset/texture/second.png");
-	}
-}
diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index afd2672..3be5afa 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 
 #include <crepe/manager/ComponentManager.h>
+#include <crepe/manager/ResourceManager.h>
 #include <crepe/api/AudioSource.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/system/AudioSystem.h>
@@ -13,15 +14,17 @@ class AudioTest : public Test {
 	Mediator mediator;
 public:
 	ComponentManager component_manager{mediator};
+	ResourceManager resource_manager{mediator};
 	AudioSystem system {mediator};
 
 	void SetUp() override {
 		auto & mgr = this->component_manager;
 		GameObject entity = mgr.new_object("name");
-		entity.add_component<AudioSource>("mwe/audio/sfx1.wav");
+		AudioSource & audio_source = entity.add_component<AudioSource>("mwe/audio/sfx1.wav");
 	}
 };
 
 TEST_F(AudioTest, Default) {
+	system.update();
 }
 
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 4174926..8c4b855 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -16,4 +16,5 @@ target_sources(test_main PUBLIC
 	Vector2Test.cpp
 	ScriptEventTest.cpp
 	ScriptSceneTest.cpp
+	PrivateTest.cpp
 )
diff --git a/src/test/PrivateTest.cpp b/src/test/PrivateTest.cpp
new file mode 100644
index 0000000..f0d2b1a
--- /dev/null
+++ b/src/test/PrivateTest.cpp
@@ -0,0 +1,66 @@
+#include <gtest/gtest.h>
+
+#include <crepe/util/Private.h>
+
+using namespace std;
+using namespace crepe;
+using namespace testing;
+
+class PrivateTest : public Test {
+public:
+	static unsigned constructors;
+	static unsigned destructors;
+
+	void SetUp() override {
+		PrivateTest::constructors = 0;
+		PrivateTest::destructors = 0;
+	}
+
+	class TestClass {
+	public:
+		TestClass() { PrivateTest::constructors++; }
+		~TestClass() { PrivateTest::destructors++; }
+	};
+	class Unrelated {};
+};
+unsigned PrivateTest::constructors;
+unsigned PrivateTest::destructors;
+
+TEST_F(PrivateTest, Empty) {
+	{
+		Private foo;
+	}
+
+	EXPECT_EQ(PrivateTest::constructors, 0);
+	EXPECT_EQ(PrivateTest::destructors, 0);
+}
+
+TEST_F(PrivateTest, WithObject) {
+	{
+		Private foo;
+		foo.set<TestClass>();
+
+		EXPECT_EQ(PrivateTest::constructors, 1);
+		EXPECT_EQ(PrivateTest::destructors, 0);
+	}
+
+	EXPECT_EQ(PrivateTest::constructors, 1);
+	EXPECT_EQ(PrivateTest::destructors, 1);
+}
+
+TEST_F(PrivateTest, EmptyException) {
+	Private foo;
+	EXPECT_THROW(foo.get<TestClass>(), std::out_of_range);
+
+	foo.set<TestClass>();
+	EXPECT_NO_THROW(foo.get<TestClass>());
+}
+
+TEST_F(PrivateTest, IncorrectTypeException) {
+	Private foo;
+	foo.set<TestClass>();
+
+	EXPECT_THROW(foo.get<Unrelated>(), std::logic_error);
+	EXPECT_NO_THROW(foo.get<TestClass>());
+}
+
-- 
cgit v1.2.3


From 693355f55193cb2ea4c29616073227e37665afc1 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Fri, 29 Nov 2024 17:30:45 +0100
Subject: more audio system WIP

---
 src/crepe/facade/Sound.cpp       | 64 ++++++++++++++--------------
 src/crepe/facade/Sound.h         | 66 +++++-----------------------
 src/crepe/facade/SoundContext.h  |  3 +-
 src/crepe/system/AudioSystem.cpp | 29 ++++++++++---
 src/crepe/system/AudioSystem.h   | 26 +++++++-----
 src/crepe/util/Private.cpp       |  5 +++
 src/crepe/util/Private.h         |  6 +--
 src/crepe/util/Private.hpp       |  4 +-
 src/test/AudioTest.cpp           | 51 +++++++++++++++++++---
 src/test/PrivateTest.cpp         | 92 ++++++++++++++++++++++++++++++++++++++++
 10 files changed, 229 insertions(+), 117 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/facade/Sound.cpp b/src/crepe/facade/Sound.cpp
index 52496af..0df1f48 100644
--- a/src/crepe/facade/Sound.cpp
+++ b/src/crepe/facade/Sound.cpp
@@ -13,36 +13,36 @@ Sound::Sound(const Asset & src) : Resource(src) {
 }
 Sound::~Sound() { dbg_trace(); }
 
-void Sound::play(SoundContext & ctx) {
-	if (ctx.engine.getPause(this->handle)) {
-		// resume if paused
-		ctx.engine.setPause(this->handle, false);
-	} else {
-		// or start new sound
-		this->handle = ctx.engine.play(this->sample, this->volume);
-		ctx.engine.setLooping(this->handle, this->looping);
-	}
-}
-
-void Sound::pause(SoundContext & ctx) {
-	if (ctx.engine.getPause(this->handle)) return;
-	ctx.engine.setPause(this->handle, true);
-}
-
-void Sound::rewind(SoundContext & ctx) {
-	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
-	ctx.engine.seek(this->handle, 0);
-}
-
-void Sound::set_volume(SoundContext & ctx, float volume) {
-	this->volume = volume;
-	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
-	ctx.engine.setVolume(this->handle, this->volume);
-}
-
-void Sound::set_looping(SoundContext & ctx, bool looping) {
-	this->looping = looping;
-	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
-	ctx.engine.setLooping(this->handle, this->looping);
-}
+// void Sound::play(SoundContext & ctx) {
+// 	if (ctx.engine.getPause(this->handle)) {
+// 		// resume if paused
+// 		ctx.engine.setPause(this->handle, false);
+// 	} else {
+// 		// or start new sound
+// 		this->handle = ctx.engine.play(this->sample, this->volume);
+// 		ctx.engine.setLooping(this->handle, this->looping);
+// 	}
+// }
+// 
+// void Sound::pause(SoundContext & ctx) {
+// 	if (ctx.engine.getPause(this->handle)) return;
+// 	ctx.engine.setPause(this->handle, true);
+// }
+// 
+// void Sound::rewind(SoundContext & ctx) {
+// 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
+// 	ctx.engine.seek(this->handle, 0);
+// }
+// 
+// void Sound::set_volume(SoundContext & ctx, float volume) {
+// 	this->volume = volume;
+// 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
+// 	ctx.engine.setVolume(this->handle, this->volume);
+// }
+// 
+// void Sound::set_looping(SoundContext & ctx, bool looping) {
+// 	this->looping = looping;
+// 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
+// 	ctx.engine.setLooping(this->handle, this->looping);
+// }
 
diff --git a/src/crepe/facade/Sound.h b/src/crepe/facade/Sound.h
index f33ee58..10d7c3c 100644
--- a/src/crepe/facade/Sound.h
+++ b/src/crepe/facade/Sound.h
@@ -9,10 +9,6 @@ namespace crepe {
 
 class SoundContext;
 
-struct SoundHandle {
-	SoLoud::handle handle;
-};
-
 /**
  * \brief Sound resource facade
  *
@@ -23,62 +19,20 @@ class Sound : public Resource {
 public:
 	Sound(const Asset & src);
 	~Sound(); // dbg_trace
-	/**
-	 * \brief Pause this sample
-	 *
-	 * Pauses this sound if it is playing, or does nothing if it is already paused. The playhead
-	 * position is saved, such that calling \c play() after this function makes the sound resume.
-	 */
-	void pause(SoundContext & ctx);
-	/**
-	 * \brief Play this sample
-	 *
-	 * Resume playback if this sound is paused, or start from the beginning of the sample.
-	 *
-	 * \note This class only saves a reference to the most recent 'voice' of this sound. Calling
-	 * \c play() while the sound is already playing causes multiple instances of the sample to
-	 * play simultaniously. The sample started last is the one that is controlled afterwards.
-	 */
-	void play(SoundContext & ctx);
-	/**
-	 * \brief Reset playhead position
-	 * 
-	 * Resets the playhead position so that calling \c play() after this function makes it play
-	 * from the start of the sample. If the sound is not paused before calling this function,
-	 * this function will stop playback.
-	 */
-	void rewind(SoundContext & ctx);
-	/**
-	 * \brief Set playback volume / gain
-	 *
-	 * \param volume  Volume (0 = muted, 1 = full volume)
-	 */
-	void set_volume(SoundContext & ctx, float volume);
-	/**
-	 * \brief Get playback volume / gain
-	 *
-	 * \return Volume
-	 */
-	float get_volume() const { return this->volume; }
-	/**
-	 * \brief Set looping behavior for this sample
-	 *
-	 * \param looping  Looping behavior (false = one-shot, true = loop)
-	 */
-	void set_looping(SoundContext & ctx, bool looping);
-	/**
-	 * \brief Get looping behavior
-	 *
-	 * \return true if looping, false if one-shot
-	 */
-	bool get_looping() const { return this->looping; }
+
+	class Handle {
+	private:
+		SoLoud::handle handle;
+		float volume = 1.0f;
+		bool looping = false;
+
+		friend class SoundContext;
+	};
 
 private:
 	SoLoud::Wav sample;
-	SoLoud::handle handle;
 
-	float volume = 1.0f;
-	bool looping = false;
+	friend class SoundContext;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h
index d22ff7a..286ced8 100644
--- a/src/crepe/facade/SoundContext.h
+++ b/src/crepe/facade/SoundContext.h
@@ -22,10 +22,9 @@ public:
 	SoundContext & operator=(const SoundContext &) = delete;
 	SoundContext & operator=(SoundContext &&) = delete;
 
+
 private:
 	SoLoud::Soloud engine;
-	//! Sound directly calls methods on \c engine
-	friend class Sound;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index 0f943be..191dbbb 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -15,18 +15,35 @@ void AudioSystem::update() {
 	for (AudioSource & component : components) {
 		if (!component.active) continue;
 
-		Sound & sound = resource_manager.get<Sound>(component.source);
-		if (component.private_data.empty())
-			component.private_data.set<ComponentPrivate>();
+		Sound & resource = resource_manager.get<Sound>(component.source);
+
+		if (component.private_data.empty()) {
+			auto & data = component.private_data.set<ComponentPrivate>();
+			this->update_last(component, data);
+		}
 		auto & data = component.private_data.get<ComponentPrivate>();
-		// TODO: lots of state diffing
 
+		this->diff_update(component, data, resource);
+
+		this->update_last(component, data);
+	}
+}
+
+void AudioSystem::diff_update(AudioSource & component, const ComponentPrivate & data, Sound & resource) {
+	bool update_playing = component.playing != data.last_playing;
+	bool update_volume = component.volume != data.last_volume;
+	bool update_loop = component.loop != data.last_loop;
+	bool update_active = component.active != data.last_active;
 
-		this->update_private(component, data);
+	if (update_active)
+	if (component.rewind) {
+		component.playing = false;
+		// this->context.rewind(resource, data.handle);
 	}
+
 }
 
-void AudioSystem::update_private(const AudioSource & component, ComponentPrivate & data) {
+void AudioSystem::update_last(const AudioSource & component, ComponentPrivate & data) {
 	data.last_active = component.active;
 	data.last_loop = component.loop;
 	data.last_playing = component.playing;
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index 7f41fda..4650178 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../facade/SoundContext.h"
+#include "../facade/Sound.h"
 #include "../api/AudioSource.h"
 
 #include "System.h"
@@ -18,19 +19,22 @@ private:
 	 */
 	struct ComponentPrivate {
 		//! This sample's voice handle
-		SoLoud::handle handle;
-
-		//! Value of \c active after last system update
-		bool last_active = false;
-		//! Value of \c playing after last system update
-		bool last_playing = false;
-		//! Value of \c volume after last system update
-		float last_volume = 1.0;
-		//! Value of \c loop after last system update
-		bool last_loop = false;
+		Sound::Handle handle;
+
+		/**
+		 * \name State diffing variables
+		 * \{
+		 */
+		typeof(AudioSource::active) last_active;
+		typeof(AudioSource::playing) last_playing;
+		typeof(AudioSource::volume) last_volume;
+		typeof(AudioSource::loop) last_loop;
+		//! \}
 	};
 
-	void update_private(const AudioSource & component, ComponentPrivate & data);
+	void update_last(const AudioSource & component, ComponentPrivate & data);
+
+	void diff_update(AudioSource & component, const ComponentPrivate & data, Sound & resource);
 
 private:
 	SoundContext context {};
diff --git a/src/crepe/util/Private.cpp b/src/crepe/util/Private.cpp
index c5b5b30..cb4cb5b 100644
--- a/src/crepe/util/Private.cpp
+++ b/src/crepe/util/Private.cpp
@@ -27,3 +27,8 @@ Private & Private::operator=(Private && other) {
 	return *this;
 }
 
+Private::Private(const Private & other) { }
+Private & Private::operator=(const Private & other) {
+	return *this;
+}
+
diff --git a/src/crepe/util/Private.h b/src/crepe/util/Private.h
index fc3728f..6dd28bb 100644
--- a/src/crepe/util/Private.h
+++ b/src/crepe/util/Private.h
@@ -9,16 +9,16 @@ class Private {
 public:
 	Private() = default;
 	~Private();
+	Private(const Private &);
 	Private(Private &&);
+	Private & operator=(const Private &);
 	Private & operator=(Private &&);
-	Private(const Private &) = delete;
-	Private & operator=(const Private &) = delete;
 
 	template <typename T>
 	T & get();
 
 	template <typename T, typename... Args>
-	void set(Args &&... args);
+	T & set(Args &&... args);
 
 	bool empty() const noexcept;
 
diff --git a/src/crepe/util/Private.hpp b/src/crepe/util/Private.hpp
index 30c8146..d6ab23f 100644
--- a/src/crepe/util/Private.hpp
+++ b/src/crepe/util/Private.hpp
@@ -8,13 +8,15 @@
 namespace crepe {
 
 template <typename T, typename... Args>
-void Private::set(Args &&... args) {
+T & Private::set(Args &&... args) {
+	if (!this->empty()) this->destructor(this->instance);
 	T * instance = new T(std::forward<Args>(args)...);
 	this->instance = static_cast<void*>(instance);
 	this->destructor = [](void * instance) {
 		delete static_cast<T*>(instance);
 	};
 	this->type = typeid(T);
+	return *instance;
 }
 
 template <typename T>
diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index 3be5afa..c6f0097 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+#include <future>
 
 #include <crepe/manager/ComponentManager.h>
 #include <crepe/manager/ResourceManager.h>
@@ -7,6 +8,7 @@
 #include <crepe/system/AudioSystem.h>
 
 using namespace std;
+using namespace std::chrono_literals;
 using namespace crepe;
 using namespace testing;
 
@@ -17,14 +19,51 @@ public:
 	ResourceManager resource_manager{mediator};
 	AudioSystem system {mediator};
 
-	void SetUp() override {
-		auto & mgr = this->component_manager;
-		GameObject entity = mgr.new_object("name");
-		AudioSource & audio_source = entity.add_component<AudioSource>("mwe/audio/sfx1.wav");
-	}
+private:
+	GameObject entity = component_manager.new_object("name");
+public:
+	AudioSource & bgm = entity.add_component<AudioSource>("mwe/audio/bgm.ogg");
+	AudioSource & sfx1 = entity.add_component<AudioSource>("mwe/audio/sfx1.wav");
+	AudioSource & sfx2 = entity.add_component<AudioSource>("mwe/audio/sfx2.wav");
+	AudioSource & sfx3 = entity.add_component<AudioSource>("mwe/audio/sfx3.wav");
+
 };
 
 TEST_F(AudioTest, Default) {
-	system.update();
+	bool example_done = false;
+
+	future example = async([&](){
+		// Start the background track
+		bgm.play();
+
+		// Play each sample sequentially while pausing and resuming the background track
+		this_thread::sleep_for(500ms);
+		sfx1.play();
+		this_thread::sleep_for(500ms);
+		sfx2.play();
+		bgm.stop();
+		this_thread::sleep_for(500ms);
+		sfx3.play();
+		bgm.play();
+		this_thread::sleep_for(500ms);
+
+		// Play all samples simultaniously
+		sfx1.play();
+		sfx2.play();
+		sfx3.play();
+		this_thread::sleep_for(1000ms);
+	});
+
+	future system_loop = async([&](){
+		while (!example_done) {
+			auto next = chrono::steady_clock::now() + 25ms;
+			system.update();
+			this_thread::sleep_until(next);
+		}
+	});
+
+	example.wait();
+	example_done = true;
+	system_loop.wait();
 }
 
diff --git a/src/test/PrivateTest.cpp b/src/test/PrivateTest.cpp
index f0d2b1a..0ea67d6 100644
--- a/src/test/PrivateTest.cpp
+++ b/src/test/PrivateTest.cpp
@@ -64,3 +64,95 @@ TEST_F(PrivateTest, IncorrectTypeException) {
 	EXPECT_NO_THROW(foo.get<TestClass>());
 }
 
+TEST_F(PrivateTest, MoveConstructor) {
+	{
+		Private foo;
+		foo.set<TestClass>();
+
+		EXPECT_EQ(PrivateTest::constructors, 1);
+		EXPECT_EQ(PrivateTest::destructors, 0);
+
+		Private bar(std::move(foo));
+
+		EXPECT_EQ(PrivateTest::constructors, 1);
+		EXPECT_EQ(PrivateTest::destructors, 0);
+	}
+
+	EXPECT_EQ(PrivateTest::constructors, 1);
+	EXPECT_EQ(PrivateTest::destructors, 1);
+}
+
+TEST_F(PrivateTest, MoveOperator) {
+	{
+		Private foo;
+		foo.set<TestClass>();
+
+		EXPECT_EQ(PrivateTest::constructors, 1);
+		EXPECT_EQ(PrivateTest::destructors, 0);
+
+		Private bar = std::move(foo);
+
+		EXPECT_EQ(PrivateTest::constructors, 1);
+		EXPECT_EQ(PrivateTest::destructors, 0);
+	}
+
+	EXPECT_EQ(PrivateTest::constructors, 1);
+	EXPECT_EQ(PrivateTest::destructors, 1);
+}
+
+TEST_F(PrivateTest, CopyConstructor) {
+	{
+		Private foo;
+		foo.set<TestClass>();
+
+		EXPECT_EQ(PrivateTest::constructors, 1);
+		EXPECT_EQ(PrivateTest::destructors, 0);
+
+		Private bar(foo);
+
+		EXPECT_TRUE(bar.empty());
+		EXPECT_EQ(PrivateTest::constructors, 1);
+		EXPECT_EQ(PrivateTest::destructors, 0);
+	}
+
+	EXPECT_EQ(PrivateTest::constructors, 1);
+	EXPECT_EQ(PrivateTest::destructors, 1);
+}
+
+TEST_F(PrivateTest, CopyOperator) {
+	{
+		Private foo;
+		foo.set<TestClass>();
+
+		EXPECT_EQ(PrivateTest::constructors, 1);
+		EXPECT_EQ(PrivateTest::destructors, 0);
+
+		Private bar = foo;
+
+		EXPECT_TRUE(bar.empty());
+		EXPECT_EQ(PrivateTest::constructors, 1);
+		EXPECT_EQ(PrivateTest::destructors, 0);
+	}
+
+	EXPECT_EQ(PrivateTest::constructors, 1);
+	EXPECT_EQ(PrivateTest::destructors, 1);
+}
+
+TEST_F(PrivateTest, DoubleAssignment) {
+	{
+		Private foo;
+		foo.set<TestClass>();
+
+		EXPECT_EQ(PrivateTest::constructors, 1);
+		EXPECT_EQ(PrivateTest::destructors, 0);
+
+		foo.set<TestClass>();
+
+		EXPECT_EQ(PrivateTest::constructors, 2);
+		EXPECT_EQ(PrivateTest::destructors, 1);
+	}
+
+	EXPECT_EQ(PrivateTest::constructors, 2);
+	EXPECT_EQ(PrivateTest::destructors, 2);
+}
+
-- 
cgit v1.2.3


From e4be73051a68b552c44280bbe9836dd4f02972d8 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Fri, 29 Nov 2024 20:35:17 +0100
Subject: audio system kinda working

---
 src/crepe/api/AudioSource.cpp     |  1 -
 src/crepe/api/AudioSource.h       |  2 --
 src/crepe/api/Config.h            | 25 +++++++++++++++++++++++--
 src/crepe/facade/Sound.h          |  7 +------
 src/crepe/facade/SoundContext.cpp | 31 +++++++++++++++++++++++++++++--
 src/crepe/facade/SoundContext.h   | 10 ++++++++++
 src/crepe/system/AudioSystem.cpp  | 30 ++++++++++++++++++++++++------
 src/crepe/system/AudioSystem.h    |  2 +-
 src/crepe/util/Log.cpp            |  2 +-
 src/crepe/util/Log.h              | 16 ----------------
 10 files changed, 89 insertions(+), 37 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index 4baac9a..c646aeb 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -15,6 +15,5 @@ void AudioSource::play(bool looping) {
 
 void AudioSource::stop() {
 	this->playing = false;
-	this->rewind = true;
 }
 
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 9d76f0b..8dc1645 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -44,8 +44,6 @@ private:
 
 	//! If this source is playing audio
 	bool playing = false;
-	//! Rewind the sample location
-	bool rewind = false;
 
 private:
 	//! AudioSystem::ComponentPrivate
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 693400a..7be506e 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -1,8 +1,10 @@
 #pragma once
 
+#include <string>
+
 #include "../util/Log.h"
+
 #include "types.h"
-#include <string>
 
 namespace crepe {
 
@@ -18,7 +20,20 @@ struct Config final {
 	static Config & get_instance();
 
 	//! Logging-related settings
-	Log::Config log;
+	struct {
+		/**
+		 * \brief Log level
+		 *
+		 * Only messages with equal or higher priority than this value will be logged.
+		 */
+		Log::Level level = Log::Level::INFO;
+		/**
+		 * \brief Colored log output
+		 *
+		 * Enables log coloring using ANSI escape codes.
+		 */
+		bool color = true;
+	} log;
 
 	//! Save manager
 	struct {
@@ -62,6 +77,12 @@ struct Config final {
 		 */
 		std::string root_pattern = ".crepe-root";
 	} asset;
+
+	//! Audio system settings
+	struct {
+		//! Max amount of simultanious voices
+		unsigned int voices = 32;
+	} audio;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/Sound.h b/src/crepe/facade/Sound.h
index 10d7c3c..35bccdb 100644
--- a/src/crepe/facade/Sound.h
+++ b/src/crepe/facade/Sound.h
@@ -20,13 +20,8 @@ public:
 	Sound(const Asset & src);
 	~Sound(); // dbg_trace
 
-	class Handle {
-	private:
+	struct Handle {
 		SoLoud::handle handle;
-		float volume = 1.0f;
-		bool looping = false;
-
-		friend class SoundContext;
 	};
 
 private:
diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
index b65dfb2..3e9a3d1 100644
--- a/src/crepe/facade/SoundContext.cpp
+++ b/src/crepe/facade/SoundContext.cpp
@@ -6,10 +6,37 @@ using namespace crepe;
 
 SoundContext::SoundContext() {
 	dbg_trace();
-	engine.init();
+	this->engine.init();
+	this->engine.setMaxActiveVoiceCount(this->config.audio.voices);
 }
 
 SoundContext::~SoundContext() {
 	dbg_trace();
-	engine.deinit();
+	this->engine.deinit();
 }
+
+Sound::Handle SoundContext::play(Sound & resource) {
+	return {
+		.handle = this->engine.play(resource.sample, this->default_volume),
+	};
+}
+
+void SoundContext::stop(Sound::Handle & handle) {
+	this->engine.stop(handle.handle);
+}
+
+void SoundContext::set_volume(Sound & resource, Sound::Handle & handle, float volume) {
+	this->engine.setVolume(handle.handle, volume);
+	this->default_volume = volume;
+}
+
+void SoundContext::set_loop(Sound & resource, Sound::Handle & handle, bool loop) {
+	this->engine.setLooping(handle.handle, loop);
+}
+
+bool SoundContext::get_playing(Sound::Handle & handle) {
+	// See Soloud::stopVoice_internal in soloud/src/core/soloud_core_voiceops.cpp for why this is
+	// the correct method to use here (samples are currently never paused)
+	return this->engine.isValidVoiceHandle(handle.handle);
+}
+
diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h
index 286ced8..e02977e 100644
--- a/src/crepe/facade/SoundContext.h
+++ b/src/crepe/facade/SoundContext.h
@@ -2,6 +2,8 @@
 
 #include <soloud/soloud.h>
 
+#include "../api/Config.h"
+
 #include "Sound.h"
 
 namespace crepe {
@@ -22,9 +24,17 @@ public:
 	SoundContext & operator=(const SoundContext &) = delete;
 	SoundContext & operator=(SoundContext &&) = delete;
 
+	Sound::Handle play(Sound & resource);
+	void stop(Sound::Handle &);
+	void set_volume(Sound &, Sound::Handle &, float);
+	void set_loop(Sound &, Sound::Handle &, bool);
+	bool get_playing(Sound::Handle &);
 
 private:
 	SoLoud::Soloud engine;
+	float default_volume = 1.0f;
+
+	Config & config = Config::get_instance();
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index 191dbbb..98aff58 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -20,6 +20,7 @@ void AudioSystem::update() {
 		if (component.private_data.empty()) {
 			auto & data = component.private_data.set<ComponentPrivate>();
 			this->update_last(component, data);
+			data.last_playing = false; // always start
 		}
 		auto & data = component.private_data.get<ComponentPrivate>();
 
@@ -29,18 +30,35 @@ void AudioSystem::update() {
 	}
 }
 
-void AudioSystem::diff_update(AudioSource & component, const ComponentPrivate & data, Sound & resource) {
+void AudioSystem::diff_update(AudioSource & component, ComponentPrivate & data, Sound & resource) {
 	bool update_playing = component.playing != data.last_playing;
 	bool update_volume = component.volume != data.last_volume;
 	bool update_loop = component.loop != data.last_loop;
 	bool update_active = component.active != data.last_active;
 
-	if (update_active)
-	if (component.rewind) {
-		component.playing = false;
-		// this->context.rewind(resource, data.handle);
+	if (update_active) {
+		if (component.active) {
+			update_playing = true;
+			if (component.play_on_awake)
+				component.playing = true;
+		} else {
+			this->context.stop(data.handle);
+			return;
+		}
+	}
+	if (!component.active) return;
+	if (update_playing) {
+		if (component.playing) data.handle = this->context.play(resource);
+		else this->context.stop(data.handle);
+	} else {
+		component.playing = this->context.get_playing(data.handle);
+	}
+	if (update_volume) {
+		this->context.set_volume(resource, data.handle, component.volume);
+	}
+	if (update_loop) {
+		this->context.set_loop(resource, data.handle, component.loop);
 	}
-
 }
 
 void AudioSystem::update_last(const AudioSource & component, ComponentPrivate & data) {
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index 4650178..3404878 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -34,7 +34,7 @@ private:
 
 	void update_last(const AudioSource & component, ComponentPrivate & data);
 
-	void diff_update(AudioSource & component, const ComponentPrivate & data, Sound & resource);
+	void diff_update(AudioSource & component, ComponentPrivate & data, Sound & resource);
 
 private:
 	SoundContext context {};
diff --git a/src/crepe/util/Log.cpp b/src/crepe/util/Log.cpp
index bc86c7e..84d80a8 100644
--- a/src/crepe/util/Log.cpp
+++ b/src/crepe/util/Log.cpp
@@ -25,7 +25,7 @@ string Log::prefix(const Level & level) {
 }
 
 void Log::log(const Level & level, const string & msg) {
-	auto & cfg = crepe::Config::get_instance();
+	auto & cfg = Config::get_instance();
 	if (level < cfg.log.level) return;
 
 	string out = Log::prefix(level) + msg;
diff --git a/src/crepe/util/Log.h b/src/crepe/util/Log.h
index 914145a..fc0bb3a 100644
--- a/src/crepe/util/Log.h
+++ b/src/crepe/util/Log.h
@@ -77,22 +77,6 @@ private:
 	 * \return Colored message severity prefix string
 	 */
 	static std::string prefix(const Level & level);
-
-public:
-	struct Config {
-		/**
-		 * \brief Log level
-		 *
-		 * Only messages with equal or higher priority than this value will be logged.
-		 */
-		Level level = INFO;
-		/**
-		 * \brief Colored log output
-		 *
-		 * Enables log coloring using ANSI escape codes.
-		 */
-		bool color = true;
-	};
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From 30e2b2b0cbb503d83a087d8d326940c3c4bc8fff Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 30 Nov 2024 15:08:57 +0100
Subject: fix audio system implementation

---
 src/crepe/api/AudioSource.cpp     |  4 ++--
 src/crepe/api/AudioSource.h       | 15 +++++++++++++--
 src/crepe/facade/SoundContext.cpp |  6 ------
 src/crepe/facade/SoundContext.h   |  1 -
 src/crepe/system/AudioSystem.cpp  | 23 ++++++++++-------------
 src/crepe/system/AudioSystem.h    |  1 -
 src/test/AudioTest.cpp            | 14 ++++++++++----
 7 files changed, 35 insertions(+), 29 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index c646aeb..cc70801 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -10,10 +10,10 @@ AudioSource::AudioSource(game_object_id_t id, const Asset & src) :
 
 void AudioSource::play(bool looping) {
 	this->loop = looping;
-	this->playing = true;
+	this->oneshot_play = true;
 }
 
 void AudioSource::stop() {
-	this->playing = false;
+	this->oneshot_stop = true;
 }
 
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 8dc1645..1899c22 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -42,8 +42,19 @@ private:
 	//! This audio source's clip
 	const Asset source;
 
-	//! If this source is playing audio
-	bool playing = false;
+	/**
+	 * \name One-shot state variables
+	 *
+	 * These variables trigger function calls when set to true, and are unconditionally reset on
+	 * every system update.
+	 *
+	 * \{
+	 */
+	//! Play this sample
+	bool oneshot_play = false;
+	//! Stop this sample
+	bool oneshot_stop = false;
+	//! \}
 
 private:
 	//! AudioSystem::ComponentPrivate
diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
index 3e9a3d1..3ae5956 100644
--- a/src/crepe/facade/SoundContext.cpp
+++ b/src/crepe/facade/SoundContext.cpp
@@ -34,9 +34,3 @@ void SoundContext::set_loop(Sound & resource, Sound::Handle & handle, bool loop)
 	this->engine.setLooping(handle.handle, loop);
 }
 
-bool SoundContext::get_playing(Sound::Handle & handle) {
-	// See Soloud::stopVoice_internal in soloud/src/core/soloud_core_voiceops.cpp for why this is
-	// the correct method to use here (samples are currently never paused)
-	return this->engine.isValidVoiceHandle(handle.handle);
-}
-
diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h
index e02977e..91d3fe9 100644
--- a/src/crepe/facade/SoundContext.h
+++ b/src/crepe/facade/SoundContext.h
@@ -28,7 +28,6 @@ public:
 	void stop(Sound::Handle &);
 	void set_volume(Sound &, Sound::Handle &, float);
 	void set_loop(Sound &, Sound::Handle &, bool);
-	bool get_playing(Sound::Handle &);
 
 private:
 	SoLoud::Soloud engine;
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index 98aff58..b105a4d 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -13,14 +13,12 @@ void AudioSystem::update() {
 	RefVector<AudioSource> components = component_manager.get_components_by_type<AudioSource>();
 
 	for (AudioSource & component : components) {
-		if (!component.active) continue;
-
 		Sound & resource = resource_manager.get<Sound>(component.source);
 
 		if (component.private_data.empty()) {
 			auto & data = component.private_data.set<ComponentPrivate>();
 			this->update_last(component, data);
-			data.last_playing = false; // always start
+			data.last_active = false;
 		}
 		auto & data = component.private_data.get<ComponentPrivate>();
 
@@ -31,27 +29,26 @@ void AudioSystem::update() {
 }
 
 void AudioSystem::diff_update(AudioSource & component, ComponentPrivate & data, Sound & resource) {
-	bool update_playing = component.playing != data.last_playing;
 	bool update_volume = component.volume != data.last_volume;
 	bool update_loop = component.loop != data.last_loop;
 	bool update_active = component.active != data.last_active;
 
 	if (update_active) {
 		if (component.active) {
-			update_playing = true;
-			if (component.play_on_awake)
-				component.playing = true;
+			component.oneshot_play = component.play_on_awake;
 		} else {
 			this->context.stop(data.handle);
 			return;
 		}
 	}
 	if (!component.active) return;
-	if (update_playing) {
-		if (component.playing) data.handle = this->context.play(resource);
-		else this->context.stop(data.handle);
-	} else {
-		component.playing = this->context.get_playing(data.handle);
+	if (component.oneshot_play) {
+		data.handle = this->context.play(resource);
+		component.oneshot_play = false;
+	}
+	if (component.oneshot_stop) {
+		this->context.stop(data.handle);
+		component.oneshot_stop = false;
 	}
 	if (update_volume) {
 		this->context.set_volume(resource, data.handle, component.volume);
@@ -63,8 +60,8 @@ void AudioSystem::diff_update(AudioSource & component, ComponentPrivate & data,
 
 void AudioSystem::update_last(const AudioSource & component, ComponentPrivate & data) {
 	data.last_active = component.active;
+	if (!component.active) return;
 	data.last_loop = component.loop;
-	data.last_playing = component.playing;
 	data.last_volume = component.volume;
 }
 
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index 3404878..dee82f6 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -26,7 +26,6 @@ private:
 		 * \{
 		 */
 		typeof(AudioSource::active) last_active;
-		typeof(AudioSource::playing) last_playing;
 		typeof(AudioSource::volume) last_volume;
 		typeof(AudioSource::loop) last_loop;
 		//! \}
diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index c6f0097..2a2d0e1 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -1,3 +1,4 @@
+#include "util/Log.h"
 #include <gtest/gtest.h>
 #include <future>
 
@@ -27,24 +28,29 @@ public:
 	AudioSource & sfx2 = entity.add_component<AudioSource>("mwe/audio/sfx2.wav");
 	AudioSource & sfx3 = entity.add_component<AudioSource>("mwe/audio/sfx3.wav");
 
+	void SetUp() override {
+		bgm.play_on_awake = true;
+	}
 };
 
 TEST_F(AudioTest, Default) {
 	bool example_done = false;
 
 	future example = async([&](){
-		// Start the background track
-		bgm.play();
+		// Start the background track. This happens automatically due to the play_on_awake property
+		// being true. The following call is optional and doesn't start two simultanious voices if
+		// left in:
+		// bgm.play();
 
 		// Play each sample sequentially while pausing and resuming the background track
 		this_thread::sleep_for(500ms);
 		sfx1.play();
 		this_thread::sleep_for(500ms);
 		sfx2.play();
-		bgm.stop();
+		bgm.active = false;
 		this_thread::sleep_for(500ms);
 		sfx3.play();
-		bgm.play();
+		bgm.active = true;
 		this_thread::sleep_for(500ms);
 
 		// Play all samples simultaniously
-- 
cgit v1.2.3


From eefaeb807eb5d0b08353389070bf3d27c3d0d958 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 30 Nov 2024 16:32:13 +0100
Subject: test and debug audio system

---
 src/crepe/facade/SoundContext.h  |   8 +-
 src/crepe/system/AudioSystem.cpp |  28 ++++---
 src/crepe/system/AudioSystem.h   |   4 +-
 src/crepe/system/System.cpp      |   4 +-
 src/test/AudioTest.cpp           | 174 ++++++++++++++++++++++++++++-----------
 5 files changed, 150 insertions(+), 68 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h
index 91d3fe9..c651cd5 100644
--- a/src/crepe/facade/SoundContext.h
+++ b/src/crepe/facade/SoundContext.h
@@ -24,10 +24,10 @@ public:
 	SoundContext & operator=(const SoundContext &) = delete;
 	SoundContext & operator=(SoundContext &&) = delete;
 
-	Sound::Handle play(Sound & resource);
-	void stop(Sound::Handle &);
-	void set_volume(Sound &, Sound::Handle &, float);
-	void set_loop(Sound &, Sound::Handle &, bool);
+	virtual Sound::Handle play(Sound & resource);
+	virtual void stop(Sound::Handle &);
+	virtual void set_volume(Sound &, Sound::Handle &, float);
+	virtual void set_loop(Sound &, Sound::Handle &, bool);
 
 private:
 	SoLoud::Soloud engine;
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index b105a4d..84a101a 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -29,39 +29,43 @@ void AudioSystem::update() {
 }
 
 void AudioSystem::diff_update(AudioSource & component, ComponentPrivate & data, Sound & resource) {
-	bool update_volume = component.volume != data.last_volume;
-	bool update_loop = component.loop != data.last_loop;
-	bool update_active = component.active != data.last_active;
+	SoundContext & context = this->get_context();
 
-	if (update_active) {
+	if (component.active != data.last_active) {
 		if (component.active) {
 			component.oneshot_play = component.play_on_awake;
 		} else {
-			this->context.stop(data.handle);
+			context.stop(data.handle);
 			return;
 		}
 	}
 	if (!component.active) return;
+
 	if (component.oneshot_play) {
-		data.handle = this->context.play(resource);
+		data.handle = context.play(resource);
 		component.oneshot_play = false;
 	}
 	if (component.oneshot_stop) {
-		this->context.stop(data.handle);
+		context.stop(data.handle);
 		component.oneshot_stop = false;
 	}
-	if (update_volume) {
-		this->context.set_volume(resource, data.handle, component.volume);
+	if (component.volume != data.last_volume) {
+		context.set_volume(resource, data.handle, component.volume);
 	}
-	if (update_loop) {
-		this->context.set_loop(resource, data.handle, component.loop);
+	if (component.loop != data.last_loop) {
+		context.set_loop(resource, data.handle, component.loop);
 	}
 }
 
 void AudioSystem::update_last(const AudioSource & component, ComponentPrivate & data) {
 	data.last_active = component.active;
-	if (!component.active) return;
 	data.last_loop = component.loop;
 	data.last_volume = component.volume;
 }
 
+SoundContext & AudioSystem::get_context() {
+	if (this->context.empty())
+		this->context.set<SoundContext>();
+	return this->context.get<SoundContext>();
+}
+
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index dee82f6..a004c60 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -35,8 +35,10 @@ private:
 
 	void diff_update(AudioSource & component, ComponentPrivate & data, Sound & resource);
 
+protected:
+	virtual SoundContext & get_context();
 private:
-	SoundContext context {};
+	Private context;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/System.cpp b/src/crepe/system/System.cpp
index f68549b..ecc740d 100644
--- a/src/crepe/system/System.cpp
+++ b/src/crepe/system/System.cpp
@@ -1,7 +1,5 @@
-#include "../util/Log.h"
-
 #include "System.h"
 
 using namespace crepe;
 
-System::System(const Mediator & mediator) : mediator(mediator) { dbg_trace(); }
+System::System(const Mediator & mediator) : mediator(mediator) {}
diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index 2a2d0e1..9c3cb9c 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -1,6 +1,5 @@
-#include "util/Log.h"
 #include <gtest/gtest.h>
-#include <future>
+#include <gmock/gmock.h>
 
 #include <crepe/manager/ComponentManager.h>
 #include <crepe/manager/ResourceManager.h>
@@ -14,62 +13,141 @@ using namespace crepe;
 using namespace testing;
 
 class AudioTest : public Test {
+private:
+	class TestSoundContext : public SoundContext {
+	public:
+		MOCK_METHOD(Sound::Handle, play, (Sound & resource), (override));
+		MOCK_METHOD(void, stop, (Sound::Handle &), (override));
+		MOCK_METHOD(void, set_volume, (Sound &, Sound::Handle &, float), (override));
+		MOCK_METHOD(void, set_loop, (Sound &, Sound::Handle &, bool), (override));
+	};
+
+	class TestAudioSystem : public AudioSystem {
+	public:
+		using AudioSystem::AudioSystem;
+		StrictMock<TestSoundContext> context;
+		virtual SoundContext & get_context() {
+			return this->context;
+		}
+	};
+
+private:
 	Mediator mediator;
-public:
 	ComponentManager component_manager{mediator};
 	ResourceManager resource_manager{mediator};
-	AudioSystem system {mediator};
+public:
+	TestAudioSystem system {mediator};
+	TestSoundContext & context = system.context;
 
 private:
 	GameObject entity = component_manager.new_object("name");
 public:
-	AudioSource & bgm = entity.add_component<AudioSource>("mwe/audio/bgm.ogg");
-	AudioSource & sfx1 = entity.add_component<AudioSource>("mwe/audio/sfx1.wav");
-	AudioSource & sfx2 = entity.add_component<AudioSource>("mwe/audio/sfx2.wav");
-	AudioSource & sfx3 = entity.add_component<AudioSource>("mwe/audio/sfx3.wav");
-
-	void SetUp() override {
-		bgm.play_on_awake = true;
-	}
+	AudioSource & component = entity.add_component<AudioSource>("mwe/audio/bgm.ogg");
 };
 
 TEST_F(AudioTest, Default) {
-	bool example_done = false;
-
-	future example = async([&](){
-		// Start the background track. This happens automatically due to the play_on_awake property
-		// being true. The following call is optional and doesn't start two simultanious voices if
-		// left in:
-		// bgm.play();
-
-		// Play each sample sequentially while pausing and resuming the background track
-		this_thread::sleep_for(500ms);
-		sfx1.play();
-		this_thread::sleep_for(500ms);
-		sfx2.play();
-		bgm.active = false;
-		this_thread::sleep_for(500ms);
-		sfx3.play();
-		bgm.active = true;
-		this_thread::sleep_for(500ms);
-
-		// Play all samples simultaniously
-		sfx1.play();
-		sfx2.play();
-		sfx3.play();
-		this_thread::sleep_for(1000ms);
-	});
-
-	future system_loop = async([&](){
-		while (!example_done) {
-			auto next = chrono::steady_clock::now() + 25ms;
-			system.update();
-			this_thread::sleep_until(next);
-		}
-	});
+	EXPECT_CALL(context, play(_)).Times(0);
+	EXPECT_CALL(context, stop(_)).Times(0);
+	EXPECT_CALL(context, set_volume(_, _, _)).Times(0);
+	EXPECT_CALL(context, set_loop(_, _, _)).Times(0);
+	system.update();
+}
+
+TEST_F(AudioTest, Play) {
+	system.update();
+
+	{
+		InSequence seq;
 
-	example.wait();
-	example_done = true;
-	system_loop.wait();
+		EXPECT_CALL(context, play(_)).Times(0);
+		component.play();
+	}
+
+	{
+		InSequence seq;
+
+		EXPECT_CALL(context, play(_)).Times(1);
+		system.update();
+	}
+}
+
+TEST_F(AudioTest, Stop) {
+	system.update();
+
+	{
+		InSequence seq;
+
+		EXPECT_CALL(context, stop(_)).Times(0);
+		component.stop();
+	}
+
+	{
+		InSequence seq;
+
+		EXPECT_CALL(context, stop(_)).Times(1);
+		system.update();
+	}
+}
+
+TEST_F(AudioTest, Volume) {
+	system.update();
+
+	{
+		InSequence seq;
+
+		EXPECT_CALL(context, set_volume(_, _, _)).Times(0);
+		component.volume += 0.2;
+	}
+
+	{
+		InSequence seq;
+
+		EXPECT_CALL(context, set_volume(_, _, component.volume)).Times(1);
+		system.update();
+	}
+}
+
+TEST_F(AudioTest, Looping) {
+	system.update();
+
+	{
+		InSequence seq;
+
+		EXPECT_CALL(context, set_loop(_, _, _)).Times(0);
+		component.loop = !component.loop;
+	}
+
+	{
+		InSequence seq;
+
+		EXPECT_CALL(context, set_loop(_, _, component.loop)).Times(1);
+		system.update();
+	}
+}
+
+TEST_F(AudioTest, StopOnDeactivate) {
+	system.update();
+
+	{
+		InSequence seq;
+
+		EXPECT_CALL(context, stop(_)).Times(1);
+		component.active = false;
+		system.update();
+	}
+}
+
+TEST_F(AudioTest, PlayOnActive) {
+	component.active = false;
+	component.play_on_awake = true;
+	system.update();
+
+	{
+		InSequence seq;
+
+		EXPECT_CALL(context, play(_)).Times(1);
+		component.active = true;
+		system.update();
+	}
 }
 
-- 
cgit v1.2.3


From 9eff2e24fa4cf0ffad2b47cc922a6558bc1a9fa1 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 30 Nov 2024 16:42:21 +0100
Subject: `make format`

---
 src/crepe/Resource.cpp                 |  3 +--
 src/crepe/api/AudioSource.cpp          | 12 ++++--------
 src/crepe/api/AudioSource.h            |  4 ++--
 src/crepe/api/LoopManager.cpp          |  5 +----
 src/crepe/api/LoopManager.h            |  2 +-
 src/crepe/api/Scene.h                  |  3 ++-
 src/crepe/api/Script.cpp               |  1 -
 src/crepe/api/Script.h                 |  4 ++--
 src/crepe/facade/Sound.cpp             |  9 ++++-----
 src/crepe/facade/SoundContext.cpp      |  5 +----
 src/crepe/manager/ComponentManager.cpp |  2 +-
 src/crepe/manager/Manager.cpp          |  3 +--
 src/crepe/manager/Manager.h            |  3 +--
 src/crepe/manager/Mediator.h           |  4 ++--
 src/crepe/manager/ResourceManager.cpp  |  8 ++------
 src/crepe/manager/ResourceManager.hpp  | 13 +++++++------
 src/crepe/manager/SaveManager.cpp      |  4 ++--
 src/crepe/system/AudioSystem.cpp       | 10 +++++-----
 src/crepe/system/AudioSystem.h         |  6 +++---
 src/crepe/system/PhysicsSystem.cpp     |  2 +-
 src/crepe/system/RenderSystem.cpp      |  2 +-
 src/crepe/system/ScriptSystem.cpp      |  2 +-
 src/crepe/util/Private.cpp             | 17 +++++------------
 src/crepe/util/Private.h               |  5 ++---
 src/crepe/util/Private.hpp             | 18 ++++++++----------
 src/test/AudioTest.cpp                 | 15 +++++++--------
 src/test/ECSTest.cpp                   |  3 ++-
 src/test/EventTest.cpp                 |  6 ++----
 src/test/ParticleTest.cpp              |  3 ++-
 src/test/PhysicsTest.cpp               |  3 ++-
 src/test/PrivateTest.cpp               |  5 +----
 src/test/RenderSystemTest.cpp          |  3 ++-
 src/test/ResourceManagerTest.cpp       | 16 ++++++----------
 src/test/SceneManagerTest.cpp          |  7 ++++---
 src/test/ScriptEventTest.cpp           |  7 +++----
 src/test/ScriptSceneTest.cpp           |  3 +--
 src/test/ScriptTest.cpp                |  3 +--
 src/test/ScriptTest.h                  |  8 +++++---
 src/test/main.cpp                      |  3 +--
 39 files changed, 99 insertions(+), 133 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/Resource.cpp b/src/crepe/Resource.cpp
index e254695..27b4c4b 100644
--- a/src/crepe/Resource.cpp
+++ b/src/crepe/Resource.cpp
@@ -2,5 +2,4 @@
 
 using namespace crepe;
 
-Resource::Resource(const Asset & asset) { }
-
+Resource::Resource(const Asset & asset) {}
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index cc70801..7b05cb1 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -3,17 +3,13 @@
 using namespace crepe;
 using namespace std;
 
-AudioSource::AudioSource(game_object_id_t id, const Asset & src) :
-	Component(id),
-	source(src)
-{ }
+AudioSource::AudioSource(game_object_id_t id, const Asset & src)
+	: Component(id),
+	  source(src) {}
 
 void AudioSource::play(bool looping) {
 	this->loop = looping;
 	this->oneshot_play = true;
 }
 
-void AudioSource::stop() {
-	this->oneshot_stop = true;
-}
-
+void AudioSource::stop() { this->oneshot_stop = true; }
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 1899c22..63b4bc4 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -4,8 +4,8 @@
 #include "../types.h"
 #include "../util/Private.h"
 
-#include "GameObject.h"
 #include "Asset.h"
+#include "GameObject.h"
 
 namespace crepe {
 
@@ -20,6 +20,7 @@ protected:
 	AudioSource(game_object_id_t id, const Asset & source);
 	//! Only ComponentManager can create components
 	friend class ComponentManager;
+
 public:
 	// But std::unique_ptr needs to be able to destoy this component again
 	virtual ~AudioSource() = default;
@@ -62,4 +63,3 @@ private:
 };
 
 } // namespace crepe
-
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index b277185..731cfb7 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -22,9 +22,7 @@ LoopManager::LoopManager() {
 	this->load_system<ScriptSystem>();
 }
 
-void LoopManager::process_input() {
-	this->sdl_context.handle_events(this->game_running);
-}
+void LoopManager::process_input() { this->sdl_context.handle_events(this->game_running); }
 
 void LoopManager::start() {
 	this->setup();
@@ -69,4 +67,3 @@ void LoopManager::render() {
 }
 
 void LoopManager::update() {}
-
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 6ea5ccc..d8910a0 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -2,10 +2,10 @@
 
 #include <memory>
 
+#include "../facade/SDLContext.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/SceneManager.h"
 #include "../system/System.h"
-#include "../facade/SDLContext.h"
 
 #include "LoopTimer.h"
 
diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h
index 66dad17..9f1e8ce 100644
--- a/src/crepe/api/Scene.h
+++ b/src/crepe/api/Scene.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "../util/OptionalRef.h"
 #include "../manager/Mediator.h"
+#include "../util/OptionalRef.h"
 
 namespace crepe {
 
@@ -37,6 +37,7 @@ public:
 
 	// TODO: Late references should ALWAYS be private! This is currently kept as-is so unit tests
 	// keep passing, but this reference should not be directly accessible by the user!!!
+
 protected:
 	/**
 	 * \name Late references
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index a27838e..4091fd4 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -25,4 +25,3 @@ void Script::set_next_scene(const string & name) {
 	SceneManager & mgr = mediator.scene_manager;
 	mgr.set_next_scene(name);
 }
-
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index e1f86b2..1b339b0 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -2,10 +2,10 @@
 
 #include <vector>
 
+#include "../manager/EventManager.h"
+#include "../manager/Mediator.h"
 #include "../types.h"
 #include "../util/OptionalRef.h"
-#include "../manager/Mediator.h"
-#include "../manager/EventManager.h"
 
 namespace crepe {
 
diff --git a/src/crepe/facade/Sound.cpp b/src/crepe/facade/Sound.cpp
index 0df1f48..33a0c47 100644
--- a/src/crepe/facade/Sound.cpp
+++ b/src/crepe/facade/Sound.cpp
@@ -23,26 +23,25 @@ Sound::~Sound() { dbg_trace(); }
 // 		ctx.engine.setLooping(this->handle, this->looping);
 // 	}
 // }
-// 
+//
 // void Sound::pause(SoundContext & ctx) {
 // 	if (ctx.engine.getPause(this->handle)) return;
 // 	ctx.engine.setPause(this->handle, true);
 // }
-// 
+//
 // void Sound::rewind(SoundContext & ctx) {
 // 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
 // 	ctx.engine.seek(this->handle, 0);
 // }
-// 
+//
 // void Sound::set_volume(SoundContext & ctx, float volume) {
 // 	this->volume = volume;
 // 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
 // 	ctx.engine.setVolume(this->handle, this->volume);
 // }
-// 
+//
 // void Sound::set_looping(SoundContext & ctx, bool looping) {
 // 	this->looping = looping;
 // 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
 // 	ctx.engine.setLooping(this->handle, this->looping);
 // }
-
diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
index 3ae5956..470b3cc 100644
--- a/src/crepe/facade/SoundContext.cpp
+++ b/src/crepe/facade/SoundContext.cpp
@@ -21,9 +21,7 @@ Sound::Handle SoundContext::play(Sound & resource) {
 	};
 }
 
-void SoundContext::stop(Sound::Handle & handle) {
-	this->engine.stop(handle.handle);
-}
+void SoundContext::stop(Sound::Handle & handle) { this->engine.stop(handle.handle); }
 
 void SoundContext::set_volume(Sound & resource, Sound::Handle & handle, float volume) {
 	this->engine.setVolume(handle.handle, volume);
@@ -33,4 +31,3 @@ void SoundContext::set_volume(Sound & resource, Sound::Handle & handle, float vo
 void SoundContext::set_loop(Sound & resource, Sound::Handle & handle, bool loop) {
 	this->engine.setLooping(handle.handle, loop);
 }
-
diff --git a/src/crepe/manager/ComponentManager.cpp b/src/crepe/manager/ComponentManager.cpp
index 5a96158..80cf8b4 100644
--- a/src/crepe/manager/ComponentManager.cpp
+++ b/src/crepe/manager/ComponentManager.cpp
@@ -1,6 +1,6 @@
 #include "../api/GameObject.h"
-#include "../util/Log.h"
 #include "../types.h"
+#include "../util/Log.h"
 
 #include "ComponentManager.h"
 
diff --git a/src/crepe/manager/Manager.cpp b/src/crepe/manager/Manager.cpp
index fe7c936..1182785 100644
--- a/src/crepe/manager/Manager.cpp
+++ b/src/crepe/manager/Manager.cpp
@@ -2,5 +2,4 @@
 
 using namespace crepe;
 
-Manager::Manager(Mediator & mediator) : mediator(mediator) { }
-
+Manager::Manager(Mediator & mediator) : mediator(mediator) {}
diff --git a/src/crepe/manager/Manager.h b/src/crepe/manager/Manager.h
index 9adfd0b..4f21ef4 100644
--- a/src/crepe/manager/Manager.h
+++ b/src/crepe/manager/Manager.h
@@ -13,5 +13,4 @@ protected:
 	Mediator & mediator;
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index 475aed9..e9c10b1 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -3,8 +3,8 @@
 #include "../util/OptionalRef.h"
 
 // TODO: remove these singletons:
-#include "SaveManager.h"
 #include "EventManager.h"
+#include "SaveManager.h"
 
 namespace crepe {
 
@@ -32,4 +32,4 @@ struct Mediator {
 	OptionalRef<ResourceManager> resource_manager;
 };
 
-}
+} // namespace crepe
diff --git a/src/crepe/manager/ResourceManager.cpp b/src/crepe/manager/ResourceManager.cpp
index 87585ad..7c01808 100644
--- a/src/crepe/manager/ResourceManager.cpp
+++ b/src/crepe/manager/ResourceManager.cpp
@@ -18,17 +18,13 @@ void ResourceManager::clear() {
 	});
 }
 
-void ResourceManager::clear_all() {
-	this->resources.clear();
-}
+void ResourceManager::clear_all() { this->resources.clear(); }
 
 void ResourceManager::set_persistent(const Asset & asset, bool persistent) {
 	this->get_entry(asset).persistent = persistent;
 }
 
 ResourceManager::CacheEntry & ResourceManager::get_entry(const Asset & asset) {
-	if (!this->resources.contains(asset))
-		this->resources[asset] = {};
+	if (!this->resources.contains(asset)) this->resources[asset] = {};
 	return this->resources.at(asset);
 }
-
diff --git a/src/crepe/manager/ResourceManager.hpp b/src/crepe/manager/ResourceManager.hpp
index 8270bc5..5167d71 100644
--- a/src/crepe/manager/ResourceManager.hpp
+++ b/src/crepe/manager/ResourceManager.hpp
@@ -9,18 +9,19 @@ namespace crepe {
 template <typename T>
 T & ResourceManager::get(const Asset & asset) {
 	using namespace std;
-	static_assert(is_base_of<Resource, T>::value, "cache must recieve a derivative class of Resource");
+	static_assert(is_base_of<Resource, T>::value,
+				  "cache must recieve a derivative class of Resource");
 
 	CacheEntry & entry = this->get_entry(asset);
-	if (entry.resource == nullptr)
-		entry.resource = make_unique<T>(asset);
+	if (entry.resource == nullptr) entry.resource = make_unique<T>(asset);
 
 	T * concrete_resource = dynamic_cast<T *>(entry.resource.get());
 	if (concrete_resource == nullptr)
-		throw runtime_error(format("ResourceManager: mismatch between requested type and actual type of resource ({})", asset.get_path()));
+		throw runtime_error(format("ResourceManager: mismatch between requested type and "
+								   "actual type of resource ({})",
+								   asset.get_path()));
 
 	return *concrete_resource;
 }
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/manager/SaveManager.cpp b/src/crepe/manager/SaveManager.cpp
index 121d017..d4ed1c1 100644
--- a/src/crepe/manager/SaveManager.cpp
+++ b/src/crepe/manager/SaveManager.cpp
@@ -1,7 +1,7 @@
+#include "../ValueBroker.h"
+#include "../api/Config.h"
 #include "../facade/DB.h"
 #include "../util/Log.h"
-#include "../api/Config.h"
-#include "../ValueBroker.h"
 
 #include "SaveManager.h"
 
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index 84a101a..0696b34 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -10,7 +10,8 @@ using namespace std;
 void AudioSystem::update() {
 	ComponentManager & component_manager = this->mediator.component_manager;
 	ResourceManager & resource_manager = this->mediator.resource_manager;
-	RefVector<AudioSource> components = component_manager.get_components_by_type<AudioSource>();
+	RefVector<AudioSource> components
+		= component_manager.get_components_by_type<AudioSource>();
 
 	for (AudioSource & component : components) {
 		Sound & resource = resource_manager.get<Sound>(component.source);
@@ -28,7 +29,8 @@ void AudioSystem::update() {
 	}
 }
 
-void AudioSystem::diff_update(AudioSource & component, ComponentPrivate & data, Sound & resource) {
+void AudioSystem::diff_update(AudioSource & component, ComponentPrivate & data,
+							  Sound & resource) {
 	SoundContext & context = this->get_context();
 
 	if (component.active != data.last_active) {
@@ -64,8 +66,6 @@ void AudioSystem::update_last(const AudioSource & component, ComponentPrivate &
 }
 
 SoundContext & AudioSystem::get_context() {
-	if (this->context.empty())
-		this->context.set<SoundContext>();
+	if (this->context.empty()) this->context.set<SoundContext>();
 	return this->context.get<SoundContext>();
 }
-
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index a004c60..c941470 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../facade/SoundContext.h"
-#include "../facade/Sound.h"
 #include "../api/AudioSource.h"
+#include "../facade/Sound.h"
+#include "../facade/SoundContext.h"
 
 #include "System.h"
 
@@ -37,9 +37,9 @@ private:
 
 protected:
 	virtual SoundContext & get_context();
+
 private:
 	Private context;
 };
 
 } // namespace crepe
-
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index eba9dfa..bebcf3d 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -1,10 +1,10 @@
 #include <cmath>
 
-#include "../manager/ComponentManager.h"
 #include "../api/Config.h"
 #include "../api/Rigidbody.h"
 #include "../api/Transform.h"
 #include "../api/Vector2.h"
+#include "../manager/ComponentManager.h"
 
 #include "PhysicsSystem.h"
 
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 4e97b3e..0ad685c 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -5,12 +5,12 @@
 #include <stdexcept>
 #include <vector>
 
-#include "../manager/ComponentManager.h"
 #include "../api/Camera.h"
 #include "../api/ParticleEmitter.h"
 #include "../api/Sprite.h"
 #include "../api/Transform.h"
 #include "../facade/SDLContext.h"
+#include "../manager/ComponentManager.h"
 
 #include "RenderSystem.h"
 
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 2e16eb0..d6b2ca1 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -1,6 +1,6 @@
-#include "../manager/ComponentManager.h"
 #include "../api/BehaviorScript.h"
 #include "../api/Script.h"
+#include "../manager/ComponentManager.h"
 
 #include "ScriptSystem.h"
 
diff --git a/src/crepe/util/Private.cpp b/src/crepe/util/Private.cpp
index cb4cb5b..262620d 100644
--- a/src/crepe/util/Private.cpp
+++ b/src/crepe/util/Private.cpp
@@ -2,18 +2,14 @@
 
 using namespace crepe;
 
-bool Private::empty() const noexcept {
-	return this->instance == nullptr;
-}
+bool Private::empty() const noexcept { return this->instance == nullptr; }
 
 Private::~Private() {
 	if (this->instance == nullptr) return;
 	this->destructor(this->instance);
 }
 
-Private::Private(Private && other) {
-	*this = std::move(other);
-}
+Private::Private(Private && other) { *this = std::move(other); }
 
 Private & Private::operator=(Private && other) {
 	// TODO: ideally this function checks for self-assignment
@@ -22,13 +18,10 @@ Private & Private::operator=(Private && other) {
 	this->type = other.type;
 
 	other.instance = nullptr;
-	other.destructor = [](void*){};
-
-	return *this;
-}
+	other.destructor = [](void *) {};
 
-Private::Private(const Private & other) { }
-Private & Private::operator=(const Private & other) {
 	return *this;
 }
 
+Private::Private(const Private & other) {}
+Private & Private::operator=(const Private & other) { return *this; }
diff --git a/src/crepe/util/Private.h b/src/crepe/util/Private.h
index 6dd28bb..62a2e1a 100644
--- a/src/crepe/util/Private.h
+++ b/src/crepe/util/Private.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <typeindex>
 #include <functional>
+#include <typeindex>
 
 namespace crepe {
 
@@ -28,7 +28,6 @@ private:
 	void * instance = nullptr;
 };
 
-}
+} // namespace crepe
 
 #include "Private.hpp"
-
diff --git a/src/crepe/util/Private.hpp b/src/crepe/util/Private.hpp
index d6ab23f..3a87a9f 100644
--- a/src/crepe/util/Private.hpp
+++ b/src/crepe/util/Private.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <stdexcept>
 #include <format>
+#include <stdexcept>
 
 #include "Private.h"
 
@@ -11,10 +11,8 @@ template <typename T, typename... Args>
 T & Private::set(Args &&... args) {
 	if (!this->empty()) this->destructor(this->instance);
 	T * instance = new T(std::forward<Args>(args)...);
-	this->instance = static_cast<void*>(instance);
-	this->destructor = [](void * instance) {
-		delete static_cast<T*>(instance);
-	};
+	this->instance = static_cast<void *>(instance);
+	this->destructor = [](void * instance) { delete static_cast<T *>(instance); };
 	this->type = typeid(T);
 	return *instance;
 }
@@ -22,12 +20,12 @@ T & Private::set(Args &&... args) {
 template <typename T>
 T & Private::get() {
 	using namespace std;
-	if (this->empty())
-		throw out_of_range("Private: get() called on empty object");
+	if (this->empty()) throw out_of_range("Private: get() called on empty object");
 	type_index requested_type = typeid(T);
 	if (this->type != requested_type)
-		throw logic_error(format("Private: get() called with [T = {}] (actual is [T = {}])", requested_type.name(), this->type.name()));
-	return *static_cast<T*>(this->instance);
+		throw logic_error(format("Private: get() called with [T = {}] (actual is [T = {}])",
+								 requested_type.name(), this->type.name()));
+	return *static_cast<T *>(this->instance);
 }
 
-}
+} // namespace crepe
diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index 9c3cb9c..14f57bd 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -1,10 +1,10 @@
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
-#include <crepe/manager/ComponentManager.h>
-#include <crepe/manager/ResourceManager.h>
 #include <crepe/api/AudioSource.h>
 #include <crepe/api/GameObject.h>
+#include <crepe/manager/ComponentManager.h>
+#include <crepe/manager/ResourceManager.h>
 #include <crepe/system/AudioSystem.h>
 
 using namespace std;
@@ -26,21 +26,21 @@ private:
 	public:
 		using AudioSystem::AudioSystem;
 		StrictMock<TestSoundContext> context;
-		virtual SoundContext & get_context() {
-			return this->context;
-		}
+		virtual SoundContext & get_context() { return this->context; }
 	};
 
 private:
 	Mediator mediator;
 	ComponentManager component_manager{mediator};
 	ResourceManager resource_manager{mediator};
+
 public:
-	TestAudioSystem system {mediator};
+	TestAudioSystem system{mediator};
 	TestSoundContext & context = system.context;
 
 private:
 	GameObject entity = component_manager.new_object("name");
+
 public:
 	AudioSource & component = entity.add_component<AudioSource>("mwe/audio/bgm.ogg");
 };
@@ -150,4 +150,3 @@ TEST_F(AudioTest, PlayOnActive) {
 		system.update();
 	}
 }
-
diff --git a/src/test/ECSTest.cpp b/src/test/ECSTest.cpp
index 22c4fe7..3e6c61c 100644
--- a/src/test/ECSTest.cpp
+++ b/src/test/ECSTest.cpp
@@ -2,17 +2,18 @@
 
 #define protected public
 
-#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Metadata.h>
 #include <crepe/api/Transform.h>
 #include <crepe/api/Vector2.h>
+#include <crepe/manager/ComponentManager.h>
 
 using namespace std;
 using namespace crepe;
 
 class ECSTest : public ::testing::Test {
 	Mediator m;
+
 public:
 	ComponentManager mgr{m};
 };
diff --git a/src/test/EventTest.cpp b/src/test/EventTest.cpp
index 350dd07..dccd554 100644
--- a/src/test/EventTest.cpp
+++ b/src/test/EventTest.cpp
@@ -2,9 +2,9 @@
 #include <gtest/gtest.h>
 
 #include <crepe/api/Event.h>
-#include <crepe/manager/EventManager.h>
 #include <crepe/api/IKeyListener.h>
 #include <crepe/api/IMouseListener.h>
+#include <crepe/manager/EventManager.h>
 
 using namespace std;
 using namespace std::chrono_literals;
@@ -37,9 +37,7 @@ public:
 };
 
 TEST_F(EventManagerTest, EventSubscription) {
-	EventHandler<KeyPressEvent> key_handler = [](const KeyPressEvent & e) {
-		return true;
-	};
+	EventHandler<KeyPressEvent> key_handler = [](const KeyPressEvent & e) { return true; };
 
 	// Subscribe to KeyPressEvent
 	EventManager::get_instance().subscribe<KeyPressEvent>(key_handler, 1);
diff --git a/src/test/ParticleTest.cpp b/src/test/ParticleTest.cpp
index 4e9fa4e..a659fe5 100644
--- a/src/test/ParticleTest.cpp
+++ b/src/test/ParticleTest.cpp
@@ -1,4 +1,3 @@
-#include <crepe/manager/ComponentManager.h>
 #include <crepe/Particle.h>
 #include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
@@ -7,6 +6,7 @@
 #include <crepe/api/Sprite.h>
 #include <crepe/api/Texture.h>
 #include <crepe/api/Transform.h>
+#include <crepe/manager/ComponentManager.h>
 #include <crepe/system/ParticleSystem.h>
 #include <gtest/gtest.h>
 #include <math.h>
@@ -17,6 +17,7 @@ using namespace crepe;
 
 class ParticlesTest : public ::testing::Test {
 	Mediator m;
+
 public:
 	ComponentManager component_manager{m};
 	ParticleSystem particle_system{m};
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index 01b7c51..43af8e4 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -1,8 +1,8 @@
-#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Rigidbody.h>
 #include <crepe/api/Transform.h>
+#include <crepe/manager/ComponentManager.h>
 #include <crepe/system/PhysicsSystem.h>
 #include <gtest/gtest.h>
 
@@ -12,6 +12,7 @@ using namespace crepe;
 
 class PhysicsTest : public ::testing::Test {
 	Mediator m;
+
 public:
 	ComponentManager component_manager{m};
 	PhysicsSystem system{m};
diff --git a/src/test/PrivateTest.cpp b/src/test/PrivateTest.cpp
index 0ea67d6..454789e 100644
--- a/src/test/PrivateTest.cpp
+++ b/src/test/PrivateTest.cpp
@@ -27,9 +27,7 @@ unsigned PrivateTest::constructors;
 unsigned PrivateTest::destructors;
 
 TEST_F(PrivateTest, Empty) {
-	{
-		Private foo;
-	}
+	{ Private foo; }
 
 	EXPECT_EQ(PrivateTest::constructors, 0);
 	EXPECT_EQ(PrivateTest::destructors, 0);
@@ -155,4 +153,3 @@ TEST_F(PrivateTest, DoubleAssignment) {
 	EXPECT_EQ(PrivateTest::constructors, 2);
 	EXPECT_EQ(PrivateTest::destructors, 2);
 }
-
diff --git a/src/test/RenderSystemTest.cpp b/src/test/RenderSystemTest.cpp
index 3528e46..c105dcb 100644
--- a/src/test/RenderSystemTest.cpp
+++ b/src/test/RenderSystemTest.cpp
@@ -7,11 +7,11 @@
 #define protected public
 
 #include <crepe/api/Camera.h>
-#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/Color.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Sprite.h>
 #include <crepe/api/Texture.h>
+#include <crepe/manager/ComponentManager.h>
 
 #include <crepe/system/RenderSystem.h>
 
@@ -21,6 +21,7 @@ using namespace testing;
 
 class RenderSystemTest : public Test {
 	Mediator m;
+
 public:
 	ComponentManager mgr{m};
 	RenderSystem sys{m};
diff --git a/src/test/ResourceManagerTest.cpp b/src/test/ResourceManagerTest.cpp
index 1f56e23..b6be3c0 100644
--- a/src/test/ResourceManagerTest.cpp
+++ b/src/test/ResourceManagerTest.cpp
@@ -3,9 +3,9 @@
 #define private public
 #define protected public
 
-#include <crepe/util/Log.h>
-#include <crepe/manager/ResourceManager.h>
 #include <crepe/api/GameObject.h>
+#include <crepe/manager/ResourceManager.h>
+#include <crepe/util/Log.h>
 
 using namespace std;
 using namespace crepe;
@@ -13,6 +13,7 @@ using namespace testing;
 
 class ResourceManagerTest : public Test {
 	Mediator mediator;
+
 public:
 	ResourceManager resource_manager{mediator};
 
@@ -25,19 +26,15 @@ public:
 
 	public:
 		const unsigned instance;
-		TestResource(const Asset & src)
-			: Resource(src),
-				instance(this->instances++) { }
+		TestResource(const Asset & src) : Resource(src), instance(this->instances++) {}
 		~TestResource() { this->instances--; }
-		bool operator == (const TestResource & other) const {
+		bool operator==(const TestResource & other) const {
 			return this->instance == other.instance;
 		}
 	};
 
 private:
-	void SetUp() override {
-		TestResource::instances = 0;
-	}
+	void SetUp() override { TestResource::instances = 0; }
 };
 unsigned ResourceManagerTest::TestResource::instances = 0;
 
@@ -72,4 +69,3 @@ TEST_F(ResourceManagerTest, Persistent) {
 	resource_manager.clear_all();
 	EXPECT_EQ(TestResource::instances, 0);
 }
-
diff --git a/src/test/SceneManagerTest.cpp b/src/test/SceneManagerTest.cpp
index d027d89..9bb260c 100644
--- a/src/test/SceneManagerTest.cpp
+++ b/src/test/SceneManagerTest.cpp
@@ -1,13 +1,13 @@
 #include <gtest/gtest.h>
 
-#include <crepe/types.h>
-#include <crepe/manager/SceneManager.h>
-#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Metadata.h>
 #include <crepe/api/Scene.h>
 #include <crepe/api/Transform.h>
 #include <crepe/api/Vector2.h>
+#include <crepe/manager/ComponentManager.h>
+#include <crepe/manager/SceneManager.h>
+#include <crepe/types.h>
 
 using namespace std;
 using namespace crepe;
@@ -57,6 +57,7 @@ private:
 
 class SceneManagerTest : public ::testing::Test {
 	Mediator m;
+
 public:
 	ComponentManager component_mgr{m};
 	SceneManager scene_mgr{m};
diff --git a/src/test/ScriptEventTest.cpp b/src/test/ScriptEventTest.cpp
index 7a9abbb..5da31e7 100644
--- a/src/test/ScriptEventTest.cpp
+++ b/src/test/ScriptEventTest.cpp
@@ -4,13 +4,13 @@
 #define private public
 #define protected public
 
-#include <crepe/manager/ComponentManager.h>
-#include <crepe/manager/EventManager.h>
 #include <crepe/api/BehaviorScript.h>
 #include <crepe/api/Event.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Script.h>
 #include <crepe/api/Vector2.h>
+#include <crepe/manager/ComponentManager.h>
+#include <crepe/manager/EventManager.h>
 #include <crepe/system/ScriptSystem.h>
 
 #include "ScriptTest.h"
@@ -32,7 +32,7 @@ TEST_F(ScriptEventTest, Inactive) {
 	EventManager & evmgr = this->event_manager;
 
 	unsigned event_count = 0;
-	script.subscribe<MyEvent>([&](const MyEvent &){
+	script.subscribe<MyEvent>([&](const MyEvent &) {
 		event_count++;
 		return true;
 	});
@@ -48,4 +48,3 @@ TEST_F(ScriptEventTest, Inactive) {
 	evmgr.trigger_event<MyEvent>();
 	EXPECT_EQ(1, event_count);
 }
-
diff --git a/src/test/ScriptSceneTest.cpp b/src/test/ScriptSceneTest.cpp
index f96ae8b..9ee1e52 100644
--- a/src/test/ScriptSceneTest.cpp
+++ b/src/test/ScriptSceneTest.cpp
@@ -4,8 +4,8 @@
 #define private public
 #define protected public
 
-#include <crepe/manager/SceneManager.h>
 #include "ScriptTest.h"
+#include <crepe/manager/SceneManager.h>
 
 using namespace std;
 using namespace crepe;
@@ -28,4 +28,3 @@ TEST_F(ScriptSceneTest, Inactive) {
 	script.set_next_scene(non_default_value);
 	EXPECT_EQ(non_default_value, scene_manager.next_scene);
 }
-
diff --git a/src/test/ScriptTest.cpp b/src/test/ScriptTest.cpp
index 6d0d5fb..1d2d6dd 100644
--- a/src/test/ScriptTest.cpp
+++ b/src/test/ScriptTest.cpp
@@ -1,5 +1,5 @@
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 // stupid hack to allow access to private/protected members under test
 #define private public
@@ -75,4 +75,3 @@ TEST_F(ScriptTest, UpdateInactive) {
 		system.update();
 	}
 }
-
diff --git a/src/test/ScriptTest.h b/src/test/ScriptTest.h
index 9a71ba7..1bbfdd3 100644
--- a/src/test/ScriptTest.h
+++ b/src/test/ScriptTest.h
@@ -1,22 +1,24 @@
 #pragma once
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
-#include <crepe/manager/ComponentManager.h>
-#include <crepe/system/ScriptSystem.h>
 #include <crepe/api/BehaviorScript.h>
 #include <crepe/api/Script.h>
+#include <crepe/manager/ComponentManager.h>
+#include <crepe/system/ScriptSystem.h>
 
 class ScriptTest : public testing::Test {
 protected:
 	crepe::Mediator mediator;
+
 public:
 	crepe::ComponentManager component_manager{mediator};
 	crepe::ScriptSystem system{mediator};
 
 	class MyScript : public crepe::Script {
 		// NOTE: explicitly stating `public:` is not required on actual scripts
+
 	public:
 		MOCK_METHOD(void, init, (), (override));
 		MOCK_METHOD(void, update, (), (override));
diff --git a/src/test/main.cpp b/src/test/main.cpp
index 54f74fd..ed2aed5 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -1,5 +1,5 @@
-#include <gtest/gtest.h>
 #include <crepe/api/Config.h>
+#include <gtest/gtest.h>
 
 using namespace crepe;
 using namespace testing;
@@ -26,4 +26,3 @@ int main(int argc, char ** argv) {
 
 	return RUN_ALL_TESTS();
 }
-
-- 
cgit v1.2.3


From b8194e02679dc88f5c0a240da83a4700ec5200cf Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 30 Nov 2024 17:27:16 +0100
Subject: add doxygen comments + clean up

---
 src/crepe/Resource.h                | 18 +++++------
 src/crepe/api/AudioSource.h         |  9 ++++--
 src/crepe/facade/Sound.cpp          | 34 ---------------------
 src/crepe/facade/Sound.h            |  9 ++++--
 src/crepe/facade/SoundContext.cpp   |  7 ++---
 src/crepe/facade/SoundContext.h     | 48 +++++++++++++++++++++++++----
 src/crepe/manager/ResourceManager.h | 44 ++++++++++++++++++++++-----
 src/crepe/system/AudioSystem.cpp    |  4 +--
 src/crepe/system/AudioSystem.h      | 29 ++++++++++++++++--
 src/crepe/util/Private.h            | 60 +++++++++++++++++++++++++++++++++++--
 src/crepe/util/Private.hpp          |  2 +-
 src/test/AudioTest.cpp              | 16 +++++-----
 12 files changed, 197 insertions(+), 83 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/Resource.h b/src/crepe/Resource.h
index a0c8859..a2d65df 100644
--- a/src/crepe/Resource.h
+++ b/src/crepe/Resource.h
@@ -6,21 +6,19 @@ class ResourceManager;
 class Asset;
 
 /**
- * Resource is an interface class used to represent a (deserialized) game
- * resource (e.g. textures, sounds).
+ * \brief Resource interface
+ *
+ * Resource is an interface class used to represent a (deserialized) game resource (e.g.
+ * textures, sounds). Resources are always created from \ref Asset "assets" by ResourceManager.
+ *
+ * The game programmer has the ability to use the ResourceManager to keep instances of concrete
+ * resources between scenes, preventing them from being reinstantiated during a scene
+ * transition.
  */
 class Resource {
 public:
 	Resource(const Asset & src);
 	virtual ~Resource() = default;
-
-private:
-	/**
-	 * The resource manager uses \c clone to create new instances of the concrete
-	 * resource class. This may be used to inherit references to classes that
-	 * would otherwise need to be implemented as singletons.
-	 */
-	friend class ResourceManager;
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 63b4bc4..330e8e1 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -17,16 +17,19 @@ class AudioSource : public Component {
 	friend class AudioSystem;
 
 protected:
+	/**
+	 * \param source Sound sample to load
+	 */
 	AudioSource(game_object_id_t id, const Asset & source);
-	//! Only ComponentManager can create components
+	//! Only ComponentManager creates components
 	friend class ComponentManager;
 
 public:
-	// But std::unique_ptr needs to be able to destoy this component again
+	// std::unique_ptr needs to be able to destoy this component
 	virtual ~AudioSource() = default;
 
 public:
-	//! Start or resume this audio source
+	//! Start this audio source
 	void play(bool looping = false);
 	//! Stop this audio source
 	void stop();
diff --git a/src/crepe/facade/Sound.cpp b/src/crepe/facade/Sound.cpp
index 33a0c47..ad50637 100644
--- a/src/crepe/facade/Sound.cpp
+++ b/src/crepe/facade/Sound.cpp
@@ -2,7 +2,6 @@
 #include "../util/Log.h"
 
 #include "Sound.h"
-#include "SoundContext.h"
 
 using namespace crepe;
 using namespace std;
@@ -12,36 +11,3 @@ Sound::Sound(const Asset & src) : Resource(src) {
 	dbg_trace();
 }
 Sound::~Sound() { dbg_trace(); }
-
-// void Sound::play(SoundContext & ctx) {
-// 	if (ctx.engine.getPause(this->handle)) {
-// 		// resume if paused
-// 		ctx.engine.setPause(this->handle, false);
-// 	} else {
-// 		// or start new sound
-// 		this->handle = ctx.engine.play(this->sample, this->volume);
-// 		ctx.engine.setLooping(this->handle, this->looping);
-// 	}
-// }
-//
-// void Sound::pause(SoundContext & ctx) {
-// 	if (ctx.engine.getPause(this->handle)) return;
-// 	ctx.engine.setPause(this->handle, true);
-// }
-//
-// void Sound::rewind(SoundContext & ctx) {
-// 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
-// 	ctx.engine.seek(this->handle, 0);
-// }
-//
-// void Sound::set_volume(SoundContext & ctx, float volume) {
-// 	this->volume = volume;
-// 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
-// 	ctx.engine.setVolume(this->handle, this->volume);
-// }
-//
-// void Sound::set_looping(SoundContext & ctx, bool looping) {
-// 	this->looping = looping;
-// 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
-// 	ctx.engine.setLooping(this->handle, this->looping);
-// }
diff --git a/src/crepe/facade/Sound.h b/src/crepe/facade/Sound.h
index 35bccdb..a78a2a7 100644
--- a/src/crepe/facade/Sound.h
+++ b/src/crepe/facade/Sound.h
@@ -12,21 +12,24 @@ class SoundContext;
 /**
  * \brief Sound resource facade
  *
- * This class is a wrapper around a \c SoLoud::Wav instance, which holds a
- * single sample. It is part of the sound facade.
+ * This class is a wrapper around a \c SoLoud::Wav instance, which holds a single sample. It is
+ * part of the sound facade.
  */
 class Sound : public Resource {
 public:
 	Sound(const Asset & src);
 	~Sound(); // dbg_trace
 
+	//! Voice handle wrapper
 	struct Handle {
+		//! Voice handle (soloud), used by SoundContext
 		SoLoud::handle handle;
 	};
 
 private:
+	//! Deserialized resource (soloud)
 	SoLoud::Wav sample;
-
+	//! SoundContext uses \c sample
 	friend class SoundContext;
 };
 
diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
index 470b3cc..8bd7e74 100644
--- a/src/crepe/facade/SoundContext.cpp
+++ b/src/crepe/facade/SoundContext.cpp
@@ -17,17 +17,16 @@ SoundContext::~SoundContext() {
 
 Sound::Handle SoundContext::play(Sound & resource) {
 	return {
-		.handle = this->engine.play(resource.sample, this->default_volume),
+		.handle = this->engine.play(resource.sample, 1.0f),
 	};
 }
 
 void SoundContext::stop(Sound::Handle & handle) { this->engine.stop(handle.handle); }
 
-void SoundContext::set_volume(Sound & resource, Sound::Handle & handle, float volume) {
+void SoundContext::set_volume(Sound::Handle & handle, float volume) {
 	this->engine.setVolume(handle.handle, volume);
-	this->default_volume = volume;
 }
 
-void SoundContext::set_loop(Sound & resource, Sound::Handle & handle, bool loop) {
+void SoundContext::set_loop(Sound::Handle & handle, bool loop) {
 	this->engine.setLooping(handle.handle, loop);
 }
diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h
index c651cd5..3bc8be5 100644
--- a/src/crepe/facade/SoundContext.h
+++ b/src/crepe/facade/SoundContext.h
@@ -11,8 +11,8 @@ namespace crepe {
 /**
  * \brief Sound engine facade
  *
- * This class is a wrapper around a \c SoLoud::Soloud instance, which provides
- * the methods for playing \c Sound instances. It is part of the sound facade.
+ * This class is a wrapper around a \c SoLoud::Soloud instance, which provides the methods for
+ * playing \c Sound instances. It is part of the sound facade.
  */
 class SoundContext {
 public:
@@ -24,15 +24,51 @@ public:
 	SoundContext & operator=(const SoundContext &) = delete;
 	SoundContext & operator=(SoundContext &&) = delete;
 
+	/**
+	 * \brief Play a sample
+	 *
+	 * Plays a Sound from the beginning of the sample and returns a handle to control it later.
+	 *
+	 * \param resource Sound instance to play
+	 *
+	 * \returns Handle to control this voice
+	 */
 	virtual Sound::Handle play(Sound & resource);
-	virtual void stop(Sound::Handle &);
-	virtual void set_volume(Sound &, Sound::Handle &, float);
-	virtual void set_loop(Sound &, Sound::Handle &, bool);
+	/**
+	 * \brief Stop a voice immediately if it is still playing
+	 *
+	 * \note This function does nothing if the handle is invalid or if the sound is already
+	 * stopped / finished playing.
+	 *
+	 * \param handle Voice handle returned by SoundContext::play
+	 */
+	virtual void stop(Sound::Handle & handle);
+	/**
+	 * \brief Change the volume of a voice
+	 *
+	 * \note This function does nothing if the handle is invalid or if the sound is already
+	 * stopped / finished playing.
+	 *
+	 * \param handle Voice handle returned by SoundContext::play
+	 * \param volume New gain value (0=silent, 1=default)
+	 */
+	virtual void set_volume(Sound::Handle & handle, float volume);
+	/**
+	 * \brief Set the looping behavior of a voice
+	 *
+	 * \note This function does nothing if the handle is invalid or if the sound is already
+	 * stopped / finished playing.
+	 *
+	 * \param handle Voice handle returned by SoundContext::play
+	 * \param loop Looping behavior (false=oneshot, true=loop)
+	 */
+	virtual void set_loop(Sound::Handle & handle, bool loop);
 
 private:
+	//! Abstracted class
 	SoLoud::Soloud engine;
-	float default_volume = 1.0f;
 
+	//! Config reference
 	Config & config = Config::get_instance();
 };
 
diff --git a/src/crepe/manager/ResourceManager.h b/src/crepe/manager/ResourceManager.h
index e7e6abc..84b275d 100644
--- a/src/crepe/manager/ResourceManager.h
+++ b/src/crepe/manager/ResourceManager.h
@@ -11,13 +11,11 @@
 namespace crepe {
 
 /**
- * \brief The ResourceManager is responsible for storing and managing assets over
- * multiple scenes.
+ * \brief Owner of concrete Resource instances
  * 
- * The ResourceManager ensures that assets are loaded once and can be accessed
- * across different scenes. It caches assets to avoid reloading them every time
- * a scene is loaded. Assets are retained in memory until the ResourceManager is
- * destroyed, at which point the cached assets are cleared.
+ * ResourceManager caches concrete Resource instances per Asset. Concrete resources are
+ * destroyed at the end of scenes by default, unless the game programmer marks them as
+ * persistent.
  */
 class ResourceManager : public Manager {
 public:
@@ -25,21 +23,53 @@ public:
 	virtual ~ResourceManager(); // dbg_trace
 
 private:
+	//! Cache entry
 	struct CacheEntry {
+		//! Concrete resource instance
 		std::unique_ptr<Resource> resource = nullptr;
+		//! Prevent ResourceManager::clear from removing this entry
 		bool persistent = false;
 	};
-	//! A cache that holds all the assets, accessible by their file path, over multiple scenes.
+	//! Internal cache
 	std::unordered_map<const Asset, CacheEntry> resources;
+	/**
+	 * \brief Ensure a cache entry exists for this asset and return a mutable reference to it
+	 *
+	 * \param asset Asset the concrete resource is instantiated from
+	 *
+	 * \returns Mutable reference to cache entry
+	 */
 	CacheEntry & get_entry(const Asset & asset);
 
 public:
+	/**
+	 * \brief Mark a resource as persistent (i.e. used across multiple scenes)
+	 *
+	 * \param asset Asset the concrete resource is instantiated from
+	 * \param persistent Whether this resource is persistent (true=keep, false=destroy)
+	 */
 	void set_persistent(const Asset & asset, bool persistent);
 
+	/**
+	 * \brief Retrieve reference to concrete Resource by Asset
+	 *
+	 * \param asset Asset the concrete resource is instantiated from
+	 * \tparam Resource Concrete derivative of Resource
+	 *
+	 * This class instantiates the concrete resource if it is not yet stored in the internal
+	 * cache, or returns a reference to the cached resource if it already exists.
+	 *
+	 * \returns Reference to concrete resource
+	 *
+	 * \throws std::runtime_error if the \c Resource parameter does not match with the actual
+	 * type of the resource stored in the cache for this Asset
+	 */
 	template <typename Resource>
 	Resource & get(const Asset & asset);
 
+	//! Clear non-persistent resources from cache
 	void clear();
+	//! Clear all resources from cache regardless of persistence
 	void clear_all();
 };
 
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index 0696b34..26913c0 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -52,10 +52,10 @@ void AudioSystem::diff_update(AudioSource & component, ComponentPrivate & data,
 		component.oneshot_stop = false;
 	}
 	if (component.volume != data.last_volume) {
-		context.set_volume(resource, data.handle, component.volume);
+		context.set_volume(data.handle, component.volume);
 	}
 	if (component.loop != data.last_loop) {
-		context.set_loop(resource, data.handle, component.loop);
+		context.set_loop(data.handle, component.loop);
 	}
 }
 
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index c941470..4d21883 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -14,9 +14,7 @@ public:
 	void update() override;
 
 private:
-	/**
-	 * \brief Private data stored by AudioSystem on AudioSource component
-	 */
+	//! Private data stored by AudioSystem on AudioSource component
 	struct ComponentPrivate {
 		//! This sample's voice handle
 		Sound::Handle handle;
@@ -31,14 +29,39 @@ private:
 		//! \}
 	};
 
+	/**
+	 * \brief Update `last_*` members of \c data
+	 *
+	 * Copies all component properties stored for comparison between AudioSystem::update() calls
+	 *
+	 * \param component Source properties
+	 * \param data Destination properties
+	 */
 	void update_last(const AudioSource & component, ComponentPrivate & data);
 
+	/**
+	 * \brief Compare update component
+	 *
+	 * Compares properties of \c component and \c data, and calls SoundContext functions where
+	 * applicable.
+	 *
+	 * \param component AudioSource component to update
+	 * \param data AudioSource's private data
+	 * \param resource Sound instance for AudioSource's Asset
+	 */
 	void diff_update(AudioSource & component, ComponentPrivate & data, Sound & resource);
 
 protected:
+	/**
+	 * \brief Get SoundContext
+	 *
+	 * SoundContext is retrieved through this function instead of being a direct member of
+	 * AudioSystem to aid with testability.
+	 */
 	virtual SoundContext & get_context();
 
 private:
+	//! Actually stores SoundContext if the base AudioSystem::get_context implementation is used
 	Private context;
 };
 
diff --git a/src/crepe/util/Private.h b/src/crepe/util/Private.h
index 62a2e1a..d725a5e 100644
--- a/src/crepe/util/Private.h
+++ b/src/crepe/util/Private.h
@@ -5,26 +5,82 @@
 
 namespace crepe {
 
+/**
+ * \brief Utility for storing type hidden from user
+ *
+ * This class can be used to store types which cannot be used in the API directly due to header
+ * distribution limitations. This class is similar to `std::any`, but provides a method for
+ * retrieving a mutable reference to the stored object.
+ */
 class Private {
 public:
 	Private() = default;
 	~Private();
+	/**
+	 * \name Copy
+	 *
+	 * \note These functions do not do anything, resulting in `*this` being an empty (default)
+	 * instance.
+	 *
+	 * \{
+	 */
 	Private(const Private &);
-	Private(Private &&);
 	Private & operator=(const Private &);
+	//! \}
+	/**
+	 * \name Move
+	 *
+	 * These functions actually move the stored type if present.
+	 *
+	 * \{
+	 */
+	Private(Private &&);
 	Private & operator=(Private &&);
+	//! \}
 
+	/**
+	 * \brief Get the stored object
+	 *
+	 * \tparam T Type of stored object
+	 *
+	 * \returns Mutable reference to stored object
+	 *
+	 * \throws std::out_of_range if this instance does not contain any object
+	 * \throws std::logic_error if the stored type and requested type differ
+	 */
 	template <typename T>
-	T & get();
+	T & get() const;
 
+	/**
+	 * \brief Create and store an arbitrary object
+	 *
+	 * \tparam T Type of object
+	 * \tparam Args Perfect forwarding arguments
+	 * \param args Perfect forwarding arguments
+	 *
+	 * All arguments to this function are forwarded using `std::forward` to the constructor of T.
+	 *
+	 * \returns Mutable reference to stored object
+	 *
+	 * \note If this instance already contained an object, this function implicitly destroys the
+	 * previous object.
+	 */
 	template <typename T, typename... Args>
 	T & set(Args &&... args);
 
+	/**
+	 * \brief Check if this instance contains an object
+	 *
+	 * \returns `true` if this instance is empty, `false` if it contains an object
+	 */
 	bool empty() const noexcept;
 
 private:
+	//! Wrapper for destructor call of stored object type
 	std::function<void(void *)> destructor;
+	//! Stored object's type
 	std::type_index type = typeid(void);
+	//! Stored object
 	void * instance = nullptr;
 };
 
diff --git a/src/crepe/util/Private.hpp b/src/crepe/util/Private.hpp
index 3a87a9f..b2174c0 100644
--- a/src/crepe/util/Private.hpp
+++ b/src/crepe/util/Private.hpp
@@ -18,7 +18,7 @@ T & Private::set(Args &&... args) {
 }
 
 template <typename T>
-T & Private::get() {
+T & Private::get() const {
 	using namespace std;
 	if (this->empty()) throw out_of_range("Private: get() called on empty object");
 	type_index requested_type = typeid(T);
diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index 14f57bd..7644ab7 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -18,8 +18,8 @@ private:
 	public:
 		MOCK_METHOD(Sound::Handle, play, (Sound & resource), (override));
 		MOCK_METHOD(void, stop, (Sound::Handle &), (override));
-		MOCK_METHOD(void, set_volume, (Sound &, Sound::Handle &, float), (override));
-		MOCK_METHOD(void, set_loop, (Sound &, Sound::Handle &, bool), (override));
+		MOCK_METHOD(void, set_volume, (Sound::Handle &, float), (override));
+		MOCK_METHOD(void, set_loop, (Sound::Handle &, bool), (override));
 	};
 
 	class TestAudioSystem : public AudioSystem {
@@ -48,8 +48,8 @@ public:
 TEST_F(AudioTest, Default) {
 	EXPECT_CALL(context, play(_)).Times(0);
 	EXPECT_CALL(context, stop(_)).Times(0);
-	EXPECT_CALL(context, set_volume(_, _, _)).Times(0);
-	EXPECT_CALL(context, set_loop(_, _, _)).Times(0);
+	EXPECT_CALL(context, set_volume(_, _)).Times(0);
+	EXPECT_CALL(context, set_loop(_, _)).Times(0);
 	system.update();
 }
 
@@ -95,14 +95,14 @@ TEST_F(AudioTest, Volume) {
 	{
 		InSequence seq;
 
-		EXPECT_CALL(context, set_volume(_, _, _)).Times(0);
+		EXPECT_CALL(context, set_volume(_, _)).Times(0);
 		component.volume += 0.2;
 	}
 
 	{
 		InSequence seq;
 
-		EXPECT_CALL(context, set_volume(_, _, component.volume)).Times(1);
+		EXPECT_CALL(context, set_volume(_, component.volume)).Times(1);
 		system.update();
 	}
 }
@@ -113,14 +113,14 @@ TEST_F(AudioTest, Looping) {
 	{
 		InSequence seq;
 
-		EXPECT_CALL(context, set_loop(_, _, _)).Times(0);
+		EXPECT_CALL(context, set_loop(_, _)).Times(0);
 		component.loop = !component.loop;
 	}
 
 	{
 		InSequence seq;
 
-		EXPECT_CALL(context, set_loop(_, _, component.loop)).Times(1);
+		EXPECT_CALL(context, set_loop(_, component.loop)).Times(1);
 		system.update();
 	}
 }
-- 
cgit v1.2.3


From 7a8657dfe019104aced61a5b63e63f61ad919f7a Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Mon, 2 Dec 2024 16:13:08 +0100
Subject: remove `Private`

---
 src/crepe/api/AudioSource.h       |  15 +++-
 src/crepe/facade/Sound.h          |   6 --
 src/crepe/facade/SoundContext.cpp |  23 +++---
 src/crepe/facade/SoundContext.h   |  15 +++-
 src/crepe/facade/SoundHandle.h    |  13 ++++
 src/crepe/system/AudioSystem.cpp  |  44 +++++------
 src/crepe/system/AudioSystem.h    |  29 ++-----
 src/crepe/util/CMakeLists.txt     |   3 -
 src/crepe/util/Private.cpp        |  27 -------
 src/crepe/util/Private.h          |  89 ----------------------
 src/crepe/util/Private.hpp        |  31 --------
 src/test/AudioTest.cpp            |   8 +-
 src/test/CMakeLists.txt           |   1 -
 src/test/PrivateTest.cpp          | 155 --------------------------------------
 14 files changed, 78 insertions(+), 381 deletions(-)
 create mode 100644 src/crepe/facade/SoundHandle.h
 delete mode 100644 src/crepe/util/Private.cpp
 delete mode 100644 src/crepe/util/Private.h
 delete mode 100644 src/crepe/util/Private.hpp
 delete mode 100644 src/test/PrivateTest.cpp

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 330e8e1..7c1f161 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -2,7 +2,7 @@
 
 #include "../Component.h"
 #include "../types.h"
-#include "../util/Private.h"
+#include "../facade/SoundHandle.h"
 
 #include "Asset.h"
 #include "GameObject.h"
@@ -59,10 +59,17 @@ private:
 	//! Stop this sample
 	bool oneshot_stop = false;
 	//! \}
+	/**
+	 * \name State diffing variables
+	 * \{
+	 */
+	typeof(active) last_active = false;
+	typeof(volume) last_volume = volume;
+	typeof(loop) last_loop = loop;
+	//! \}
+	//! This source's voice handle
+	SoundHandle voice{};
 
-private:
-	//! AudioSystem::ComponentPrivate
-	Private private_data;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/Sound.h b/src/crepe/facade/Sound.h
index a78a2a7..85d141b 100644
--- a/src/crepe/facade/Sound.h
+++ b/src/crepe/facade/Sound.h
@@ -20,12 +20,6 @@ public:
 	Sound(const Asset & src);
 	~Sound(); // dbg_trace
 
-	//! Voice handle wrapper
-	struct Handle {
-		//! Voice handle (soloud), used by SoundContext
-		SoLoud::handle handle;
-	};
-
 private:
 	//! Deserialized resource (soloud)
 	SoLoud::Wav sample;
diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
index 8bd7e74..d18afc6 100644
--- a/src/crepe/facade/SoundContext.cpp
+++ b/src/crepe/facade/SoundContext.cpp
@@ -15,18 +15,23 @@ SoundContext::~SoundContext() {
 	this->engine.deinit();
 }
 
-Sound::Handle SoundContext::play(Sound & resource) {
-	return {
-		.handle = this->engine.play(resource.sample, 1.0f),
-	};
+SoundHandle SoundContext::play(Sound & resource) {
+	SoLoud::handle real_handle = this->engine.play(resource.sample, 1.0f);
+	SoundHandle handle = this->next_handle;
+	this->registry[handle] = real_handle;
+	this->next_handle++;
+	return handle;
 }
 
-void SoundContext::stop(Sound::Handle & handle) { this->engine.stop(handle.handle); }
+void SoundContext::stop(const SoundHandle & handle) {
+	this->engine.stop(this->registry[handle]);
+}
 
-void SoundContext::set_volume(Sound::Handle & handle, float volume) {
-	this->engine.setVolume(handle.handle, volume);
+void SoundContext::set_volume(const SoundHandle & handle, float volume) {
+	this->engine.setVolume(this->registry[handle], volume);
 }
 
-void SoundContext::set_loop(Sound::Handle & handle, bool loop) {
-	this->engine.setLooping(handle.handle, loop);
+void SoundContext::set_loop(const SoundHandle & handle, bool loop) {
+	this->engine.setLooping(this->registry[handle], loop);
 }
+
diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h
index 3bc8be5..102f928 100644
--- a/src/crepe/facade/SoundContext.h
+++ b/src/crepe/facade/SoundContext.h
@@ -4,6 +4,7 @@
 
 #include "../api/Config.h"
 
+#include "SoundHandle.h"
 #include "Sound.h"
 
 namespace crepe {
@@ -33,7 +34,7 @@ public:
 	 *
 	 * \returns Handle to control this voice
 	 */
-	virtual Sound::Handle play(Sound & resource);
+	virtual SoundHandle play(Sound & resource);
 	/**
 	 * \brief Stop a voice immediately if it is still playing
 	 *
@@ -42,7 +43,7 @@ public:
 	 *
 	 * \param handle Voice handle returned by SoundContext::play
 	 */
-	virtual void stop(Sound::Handle & handle);
+	virtual void stop(const SoundHandle & handle);
 	/**
 	 * \brief Change the volume of a voice
 	 *
@@ -52,7 +53,7 @@ public:
 	 * \param handle Voice handle returned by SoundContext::play
 	 * \param volume New gain value (0=silent, 1=default)
 	 */
-	virtual void set_volume(Sound::Handle & handle, float volume);
+	virtual void set_volume(const SoundHandle & handle, float volume);
 	/**
 	 * \brief Set the looping behavior of a voice
 	 *
@@ -62,7 +63,7 @@ public:
 	 * \param handle Voice handle returned by SoundContext::play
 	 * \param loop Looping behavior (false=oneshot, true=loop)
 	 */
-	virtual void set_loop(Sound::Handle & handle, bool loop);
+	virtual void set_loop(const SoundHandle & handle, bool loop);
 
 private:
 	//! Abstracted class
@@ -70,6 +71,12 @@ private:
 
 	//! Config reference
 	Config & config = Config::get_instance();
+
+	//! Sound handle registry
+	std::unordered_map<SoundHandle, SoLoud::handle> registry;
+	//! Unique handle counter
+	SoundHandle next_handle = 0;
+
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SoundHandle.h b/src/crepe/facade/SoundHandle.h
new file mode 100644
index 0000000..131d28c
--- /dev/null
+++ b/src/crepe/facade/SoundHandle.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <cstddef>
+
+namespace crepe {
+
+/**
+ * \brief Voice handle returned by
+ */
+typedef size_t SoundHandle;
+
+}
+
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index 26913c0..c1cde8b 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -16,56 +16,50 @@ void AudioSystem::update() {
 	for (AudioSource & component : components) {
 		Sound & resource = resource_manager.get<Sound>(component.source);
 
-		if (component.private_data.empty()) {
-			auto & data = component.private_data.set<ComponentPrivate>();
-			this->update_last(component, data);
-			data.last_active = false;
-		}
-		auto & data = component.private_data.get<ComponentPrivate>();
-
-		this->diff_update(component, data, resource);
+		this->diff_update(component, resource);
 
-		this->update_last(component, data);
+		this->update_last(component);
 	}
 }
 
-void AudioSystem::diff_update(AudioSource & component, ComponentPrivate & data,
-							  Sound & resource) {
+void AudioSystem::diff_update(AudioSource & component, Sound & resource) {
 	SoundContext & context = this->get_context();
 
-	if (component.active != data.last_active) {
+	if (component.active != component.last_active) {
 		if (component.active) {
 			component.oneshot_play = component.play_on_awake;
 		} else {
-			context.stop(data.handle);
+			context.stop(component.voice);
 			return;
 		}
 	}
 	if (!component.active) return;
 
 	if (component.oneshot_play) {
-		data.handle = context.play(resource);
+		component.voice = context.play(resource);
 		component.oneshot_play = false;
 	}
 	if (component.oneshot_stop) {
-		context.stop(data.handle);
+		context.stop(component.voice);
 		component.oneshot_stop = false;
 	}
-	if (component.volume != data.last_volume) {
-		context.set_volume(data.handle, component.volume);
+	if (component.volume != component.last_volume) {
+		context.set_volume(component.voice, component.volume);
 	}
-	if (component.loop != data.last_loop) {
-		context.set_loop(data.handle, component.loop);
+	if (component.loop != component.last_loop) {
+		context.set_loop(component.voice, component.loop);
 	}
 }
 
-void AudioSystem::update_last(const AudioSource & component, ComponentPrivate & data) {
-	data.last_active = component.active;
-	data.last_loop = component.loop;
-	data.last_volume = component.volume;
+void AudioSystem::update_last(AudioSource & component) {
+	component.last_active = component.active;
+	component.last_loop = component.loop;
+	component.last_volume = component.volume;
 }
 
 SoundContext & AudioSystem::get_context() {
-	if (this->context.empty()) this->context.set<SoundContext>();
-	return this->context.get<SoundContext>();
+	if (this->context == nullptr)
+		this->context = make_unique<SoundContext>();
+	return *this->context.get();
 }
+
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index 4d21883..2ddc443 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -14,30 +14,14 @@ public:
 	void update() override;
 
 private:
-	//! Private data stored by AudioSystem on AudioSource component
-	struct ComponentPrivate {
-		//! This sample's voice handle
-		Sound::Handle handle;
-
-		/**
-		 * \name State diffing variables
-		 * \{
-		 */
-		typeof(AudioSource::active) last_active;
-		typeof(AudioSource::volume) last_volume;
-		typeof(AudioSource::loop) last_loop;
-		//! \}
-	};
-
 	/**
-	 * \brief Update `last_*` members of \c data
+	 * \brief Update `last_*` members of \c component
 	 *
 	 * Copies all component properties stored for comparison between AudioSystem::update() calls
 	 *
-	 * \param component Source properties
-	 * \param data Destination properties
+	 * \param component AudioSource component to update
 	 */
-	void update_last(const AudioSource & component, ComponentPrivate & data);
+	void update_last(AudioSource & component);
 
 	/**
 	 * \brief Compare update component
@@ -46,10 +30,9 @@ private:
 	 * applicable.
 	 *
 	 * \param component AudioSource component to update
-	 * \param data AudioSource's private data
 	 * \param resource Sound instance for AudioSource's Asset
 	 */
-	void diff_update(AudioSource & component, ComponentPrivate & data, Sound & resource);
+	void diff_update(AudioSource & component, Sound & resource);
 
 protected:
 	/**
@@ -61,8 +44,8 @@ protected:
 	virtual SoundContext & get_context();
 
 private:
-	//! Actually stores SoundContext if the base AudioSystem::get_context implementation is used
-	Private context;
+	//! SoundContext
+	std::unique_ptr<SoundContext> context = nullptr;
 };
 
 } // namespace crepe
diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
index f49d851..94ed906 100644
--- a/src/crepe/util/CMakeLists.txt
+++ b/src/crepe/util/CMakeLists.txt
@@ -1,7 +1,6 @@
 target_sources(crepe PUBLIC
 	LogColor.cpp
 	Log.cpp
-	Private.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -12,7 +11,5 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Proxy.hpp
 	OptionalRef.h
 	OptionalRef.hpp
-	Private.h
-	Private.hpp
 )
 
diff --git a/src/crepe/util/Private.cpp b/src/crepe/util/Private.cpp
deleted file mode 100644
index 262620d..0000000
--- a/src/crepe/util/Private.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "Private.h"
-
-using namespace crepe;
-
-bool Private::empty() const noexcept { return this->instance == nullptr; }
-
-Private::~Private() {
-	if (this->instance == nullptr) return;
-	this->destructor(this->instance);
-}
-
-Private::Private(Private && other) { *this = std::move(other); }
-
-Private & Private::operator=(Private && other) {
-	// TODO: ideally this function checks for self-assignment
-	this->instance = other.instance;
-	this->destructor = other.destructor;
-	this->type = other.type;
-
-	other.instance = nullptr;
-	other.destructor = [](void *) {};
-
-	return *this;
-}
-
-Private::Private(const Private & other) {}
-Private & Private::operator=(const Private & other) { return *this; }
diff --git a/src/crepe/util/Private.h b/src/crepe/util/Private.h
deleted file mode 100644
index d725a5e..0000000
--- a/src/crepe/util/Private.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#pragma once
-
-#include <functional>
-#include <typeindex>
-
-namespace crepe {
-
-/**
- * \brief Utility for storing type hidden from user
- *
- * This class can be used to store types which cannot be used in the API directly due to header
- * distribution limitations. This class is similar to `std::any`, but provides a method for
- * retrieving a mutable reference to the stored object.
- */
-class Private {
-public:
-	Private() = default;
-	~Private();
-	/**
-	 * \name Copy
-	 *
-	 * \note These functions do not do anything, resulting in `*this` being an empty (default)
-	 * instance.
-	 *
-	 * \{
-	 */
-	Private(const Private &);
-	Private & operator=(const Private &);
-	//! \}
-	/**
-	 * \name Move
-	 *
-	 * These functions actually move the stored type if present.
-	 *
-	 * \{
-	 */
-	Private(Private &&);
-	Private & operator=(Private &&);
-	//! \}
-
-	/**
-	 * \brief Get the stored object
-	 *
-	 * \tparam T Type of stored object
-	 *
-	 * \returns Mutable reference to stored object
-	 *
-	 * \throws std::out_of_range if this instance does not contain any object
-	 * \throws std::logic_error if the stored type and requested type differ
-	 */
-	template <typename T>
-	T & get() const;
-
-	/**
-	 * \brief Create and store an arbitrary object
-	 *
-	 * \tparam T Type of object
-	 * \tparam Args Perfect forwarding arguments
-	 * \param args Perfect forwarding arguments
-	 *
-	 * All arguments to this function are forwarded using `std::forward` to the constructor of T.
-	 *
-	 * \returns Mutable reference to stored object
-	 *
-	 * \note If this instance already contained an object, this function implicitly destroys the
-	 * previous object.
-	 */
-	template <typename T, typename... Args>
-	T & set(Args &&... args);
-
-	/**
-	 * \brief Check if this instance contains an object
-	 *
-	 * \returns `true` if this instance is empty, `false` if it contains an object
-	 */
-	bool empty() const noexcept;
-
-private:
-	//! Wrapper for destructor call of stored object type
-	std::function<void(void *)> destructor;
-	//! Stored object's type
-	std::type_index type = typeid(void);
-	//! Stored object
-	void * instance = nullptr;
-};
-
-} // namespace crepe
-
-#include "Private.hpp"
diff --git a/src/crepe/util/Private.hpp b/src/crepe/util/Private.hpp
deleted file mode 100644
index b2174c0..0000000
--- a/src/crepe/util/Private.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <format>
-#include <stdexcept>
-
-#include "Private.h"
-
-namespace crepe {
-
-template <typename T, typename... Args>
-T & Private::set(Args &&... args) {
-	if (!this->empty()) this->destructor(this->instance);
-	T * instance = new T(std::forward<Args>(args)...);
-	this->instance = static_cast<void *>(instance);
-	this->destructor = [](void * instance) { delete static_cast<T *>(instance); };
-	this->type = typeid(T);
-	return *instance;
-}
-
-template <typename T>
-T & Private::get() const {
-	using namespace std;
-	if (this->empty()) throw out_of_range("Private: get() called on empty object");
-	type_index requested_type = typeid(T);
-	if (this->type != requested_type)
-		throw logic_error(format("Private: get() called with [T = {}] (actual is [T = {}])",
-								 requested_type.name(), this->type.name()));
-	return *static_cast<T *>(this->instance);
-}
-
-} // namespace crepe
diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index 7644ab7..774fdb8 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -16,10 +16,10 @@ class AudioTest : public Test {
 private:
 	class TestSoundContext : public SoundContext {
 	public:
-		MOCK_METHOD(Sound::Handle, play, (Sound & resource), (override));
-		MOCK_METHOD(void, stop, (Sound::Handle &), (override));
-		MOCK_METHOD(void, set_volume, (Sound::Handle &, float), (override));
-		MOCK_METHOD(void, set_loop, (Sound::Handle &, bool), (override));
+		MOCK_METHOD(SoundHandle, play, (Sound & resource), (override));
+		MOCK_METHOD(void, stop, (const SoundHandle &), (override));
+		MOCK_METHOD(void, set_volume, (const SoundHandle &, float), (override));
+		MOCK_METHOD(void, set_loop, (const SoundHandle &, bool), (override));
 	};
 
 	class TestAudioSystem : public AudioSystem {
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 8c4b855..4174926 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -16,5 +16,4 @@ target_sources(test_main PUBLIC
 	Vector2Test.cpp
 	ScriptEventTest.cpp
 	ScriptSceneTest.cpp
-	PrivateTest.cpp
 )
diff --git a/src/test/PrivateTest.cpp b/src/test/PrivateTest.cpp
deleted file mode 100644
index 454789e..0000000
--- a/src/test/PrivateTest.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <crepe/util/Private.h>
-
-using namespace std;
-using namespace crepe;
-using namespace testing;
-
-class PrivateTest : public Test {
-public:
-	static unsigned constructors;
-	static unsigned destructors;
-
-	void SetUp() override {
-		PrivateTest::constructors = 0;
-		PrivateTest::destructors = 0;
-	}
-
-	class TestClass {
-	public:
-		TestClass() { PrivateTest::constructors++; }
-		~TestClass() { PrivateTest::destructors++; }
-	};
-	class Unrelated {};
-};
-unsigned PrivateTest::constructors;
-unsigned PrivateTest::destructors;
-
-TEST_F(PrivateTest, Empty) {
-	{ Private foo; }
-
-	EXPECT_EQ(PrivateTest::constructors, 0);
-	EXPECT_EQ(PrivateTest::destructors, 0);
-}
-
-TEST_F(PrivateTest, WithObject) {
-	{
-		Private foo;
-		foo.set<TestClass>();
-
-		EXPECT_EQ(PrivateTest::constructors, 1);
-		EXPECT_EQ(PrivateTest::destructors, 0);
-	}
-
-	EXPECT_EQ(PrivateTest::constructors, 1);
-	EXPECT_EQ(PrivateTest::destructors, 1);
-}
-
-TEST_F(PrivateTest, EmptyException) {
-	Private foo;
-	EXPECT_THROW(foo.get<TestClass>(), std::out_of_range);
-
-	foo.set<TestClass>();
-	EXPECT_NO_THROW(foo.get<TestClass>());
-}
-
-TEST_F(PrivateTest, IncorrectTypeException) {
-	Private foo;
-	foo.set<TestClass>();
-
-	EXPECT_THROW(foo.get<Unrelated>(), std::logic_error);
-	EXPECT_NO_THROW(foo.get<TestClass>());
-}
-
-TEST_F(PrivateTest, MoveConstructor) {
-	{
-		Private foo;
-		foo.set<TestClass>();
-
-		EXPECT_EQ(PrivateTest::constructors, 1);
-		EXPECT_EQ(PrivateTest::destructors, 0);
-
-		Private bar(std::move(foo));
-
-		EXPECT_EQ(PrivateTest::constructors, 1);
-		EXPECT_EQ(PrivateTest::destructors, 0);
-	}
-
-	EXPECT_EQ(PrivateTest::constructors, 1);
-	EXPECT_EQ(PrivateTest::destructors, 1);
-}
-
-TEST_F(PrivateTest, MoveOperator) {
-	{
-		Private foo;
-		foo.set<TestClass>();
-
-		EXPECT_EQ(PrivateTest::constructors, 1);
-		EXPECT_EQ(PrivateTest::destructors, 0);
-
-		Private bar = std::move(foo);
-
-		EXPECT_EQ(PrivateTest::constructors, 1);
-		EXPECT_EQ(PrivateTest::destructors, 0);
-	}
-
-	EXPECT_EQ(PrivateTest::constructors, 1);
-	EXPECT_EQ(PrivateTest::destructors, 1);
-}
-
-TEST_F(PrivateTest, CopyConstructor) {
-	{
-		Private foo;
-		foo.set<TestClass>();
-
-		EXPECT_EQ(PrivateTest::constructors, 1);
-		EXPECT_EQ(PrivateTest::destructors, 0);
-
-		Private bar(foo);
-
-		EXPECT_TRUE(bar.empty());
-		EXPECT_EQ(PrivateTest::constructors, 1);
-		EXPECT_EQ(PrivateTest::destructors, 0);
-	}
-
-	EXPECT_EQ(PrivateTest::constructors, 1);
-	EXPECT_EQ(PrivateTest::destructors, 1);
-}
-
-TEST_F(PrivateTest, CopyOperator) {
-	{
-		Private foo;
-		foo.set<TestClass>();
-
-		EXPECT_EQ(PrivateTest::constructors, 1);
-		EXPECT_EQ(PrivateTest::destructors, 0);
-
-		Private bar = foo;
-
-		EXPECT_TRUE(bar.empty());
-		EXPECT_EQ(PrivateTest::constructors, 1);
-		EXPECT_EQ(PrivateTest::destructors, 0);
-	}
-
-	EXPECT_EQ(PrivateTest::constructors, 1);
-	EXPECT_EQ(PrivateTest::destructors, 1);
-}
-
-TEST_F(PrivateTest, DoubleAssignment) {
-	{
-		Private foo;
-		foo.set<TestClass>();
-
-		EXPECT_EQ(PrivateTest::constructors, 1);
-		EXPECT_EQ(PrivateTest::destructors, 0);
-
-		foo.set<TestClass>();
-
-		EXPECT_EQ(PrivateTest::constructors, 2);
-		EXPECT_EQ(PrivateTest::destructors, 1);
-	}
-
-	EXPECT_EQ(PrivateTest::constructors, 2);
-	EXPECT_EQ(PrivateTest::destructors, 2);
-}
-- 
cgit v1.2.3


From 823935627c7743c36e1b832670f931d6a67abe2a Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 5 Dec 2024 16:24:45 +0100
Subject: save

---
 src/crepe/api/LoopManager.h    |  4 +-
 src/crepe/system/InputSystem.h | 84 ++++++++++++++++++++++++++++++++++++++++++
 src/test/LoopManagerTest.cpp   | 56 ++++++++++++++--------------
 3 files changed, 115 insertions(+), 29 deletions(-)
 create mode 100644 src/crepe/system/InputSystem.h

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 6a212eb..7097ee1 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -61,7 +61,7 @@ private:
 	 *
 	 * Updates the game state based on the elapsed time since the last frame.
 	 */
-	void update();
+	virtual void update();
 
 	/**
 	 * \brief Late update which is called after update().
@@ -75,7 +75,7 @@ private:
 	 *
 	 * This function updates physics and game logic based on LoopTimer's fixed_delta_time.
 	 */
-	void fixed_update();
+	virtual void fixed_update();
 	/**
 	 * \brief Function for executing render-related systems.
 	 *
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
new file mode 100644
index 0000000..0c42bd6
--- /dev/null
+++ b/src/crepe/system/InputSystem.h
@@ -0,0 +1,84 @@
+#pragma once
+
+#include "../facade/SDLContext.h"
+#include "../types.h"
+#include "../util/OptionalRef.h"
+
+#include "System.h"
+
+namespace crepe {
+
+class Camera;
+class Button;
+class Transform;
+
+/**
+ * \brief Handles the processing of input events created by SDLContext
+ *
+ * This system processes events such as mouse clicks, mouse movement, and keyboard
+ * actions. It is responsible for detecting interactions with UI buttons and
+ * passing the corresponding events to the registered listeners.
+ */
+class InputSystem : public System {
+public:
+	using System::System;
+
+	/**
+     * \brief Updates the system, processing all input events.
+     * This method processes all events and triggers corresponding actions.
+     */
+	void update() override;
+
+private:
+	//! Stores the last position of the mouse when the button was pressed.
+	ivec2 last_mouse_down_position;
+
+	//! Stores the last mouse button pressed.
+	MouseButton last_mouse_button = MouseButton::NONE;
+
+	//! The maximum allowable distance between mouse down and mouse up to register as a click.
+	const int click_tolerance = 5;
+
+	/**
+	* \brief Handles the mouse click event.
+	* \param mouse_button The mouse button involved in the click.
+	* \param world_mouse_x The X coordinate of the mouse in world space.
+	* \param world_mouse_y The Y coordinate of the mouse in world space.
+	*
+	* This method processes the mouse click event and triggers the corresponding button action.
+	*/
+	void handle_click(const MouseButton & mouse_button, const int world_mouse_x,
+					  const int world_mouse_y);
+
+	/**
+	* \brief Handles the mouse movement event.
+	* \param event_data The event data containing information about the mouse movement.
+	* \param world_mouse_x The X coordinate of the mouse in world space.
+	* \param world_mouse_y The Y coordinate of the mouse in world space.
+	*
+	* This method processes the mouse movement event and updates the button hover state.
+	*/
+	void handle_move(const SDLContext::EventData & event_data, const int world_mouse_x,
+					 const int world_mouse_y);
+
+	/**
+	* \brief Checks if the mouse position is inside the bounds of the button.
+	* \param world_mouse_x The X coordinate of the mouse in world space.
+	* \param world_mouse_y The Y coordinate of the mouse in world space.
+	* \param button The button to check.
+	* \param transform The transform component of the button.
+	* \return True if the mouse is inside the button, false otherwise.
+	*/
+	bool is_mouse_inside_button(const int world_mouse_x, const int world_mouse_y,
+								const Button & button, const Transform & transform);
+
+	/**
+	* \brief Handles the button press event, calling the on_click callback if necessary.
+	* \param button The button being pressed.
+	*
+	* This method triggers the on_click action for the button when it is pressed.
+	*/
+	void handle_button_press(Button & button);
+};
+
+} // namespace crepe
diff --git a/src/test/LoopManagerTest.cpp b/src/test/LoopManagerTest.cpp
index 5897906..f2ca8db 100644
--- a/src/test/LoopManagerTest.cpp
+++ b/src/test/LoopManagerTest.cpp
@@ -1,6 +1,8 @@
 #include <chrono>
 #include <gtest/gtest.h>
+#include <gmock/gmock.h>
 #include <thread>
+
 #define private public
 #define protected public
 #include "api/LoopManager.h"
@@ -11,35 +13,35 @@ using namespace crepe;
 
 class LoopManagerTest : public ::testing::Test {
 protected:
-	LoopManager loop_manager;
+    class TestGameLoop : public crepe::LoopManager {
+    public:
+        MOCK_METHOD(void, fixed_update, (), (override));
+        MOCK_METHOD(void, update, (), (override));
+    };
+
+    TestGameLoop test_loop;
 
-	void SetUp() override {
-		// Setting up loop manager and start the loop
-		loop_manager.loop_timer->set_target_fps(60);
-	}
+    void SetUp() override {
+        test_loop.loop_timer->set_target_fps(60); // Example target FPS
+    }
 };
 
-//Test to check if exactly 5 fixed updates are done every second (50Hz)
+// Test to check if exactly 50 fixed updates occur in 1 second (50Hz)
 TEST_F(LoopManagerTest, FixedUpdate) {
-	loop_manager.loop_timer->fixed_delta_time = std::chrono::milliseconds(20);
-	loop_manager.loop_timer->set_target_fps(50);
-	int fixed_update_count = 0;
-	loop_manager.loop_timer->start();
-	// We want to simulate the game loop for about 1 second
-	auto start_time = steady_clock::now();
-
-	// Simulate the game loop for 1 second
-	while (duration_cast<milliseconds>(steady_clock::now() - start_time)
-		   < std::chrono::milliseconds(1000)) {
-		loop_manager.loop_timer->update();
-		// Simulate processing fixed updates while there's lag to advance
-		while (loop_manager.loop_timer->get_lag()
-			   >= loop_manager.loop_timer->get_fixed_delta_time()) {
-			fixed_update_count++;
-			loop_manager.loop_timer->advance_fixed_update();
-		}
-
-		loop_manager.loop_timer->enforce_frame_rate();
-	}
-	ASSERT_EQ(fixed_update_count, 50);
+    // Arrange
+    using ::testing::AtLeast;
+    using ::testing::Exactly;
+
+    test_loop.loop_timer->fixed_delta_time = std::chrono::milliseconds(20);
+	test_loop.start();
+    // Expect the `fixed_update` method to be called exactly 50 times
+    EXPECT_CALL(test_loop, fixed_update()).Times(Exactly(50));
+
+    auto start_time = steady_clock::now();
+
+    // Act: Simulate the game loop for 1 second
+    while (duration_cast<milliseconds>(steady_clock::now() - start_time) < std::chrono::milliseconds(1000)) {
+
+    }
+	test_loop.game_running = false;
 }
-- 
cgit v1.2.3


From 1e9e564f3806d07c7b0dc445c4ae2e738350fc83 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 5 Dec 2024 17:12:56 +0100
Subject: `make format`

---
 src/crepe/api/AudioSource.h       | 3 +--
 src/crepe/facade/SoundContext.cpp | 1 -
 src/crepe/facade/SoundContext.h   | 3 +--
 src/crepe/facade/SoundHandle.h    | 3 +--
 src/crepe/system/AudioSystem.cpp  | 4 +---
 src/test/ResourceManagerTest.cpp  | 9 ++-------
 6 files changed, 6 insertions(+), 17 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 7c1f161..b20e490 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "../Component.h"
-#include "../types.h"
 #include "../facade/SoundHandle.h"
+#include "../types.h"
 
 #include "Asset.h"
 #include "GameObject.h"
@@ -69,7 +69,6 @@ private:
 	//! \}
 	//! This source's voice handle
 	SoundHandle voice{};
-
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
index d18afc6..b1f8cb3 100644
--- a/src/crepe/facade/SoundContext.cpp
+++ b/src/crepe/facade/SoundContext.cpp
@@ -34,4 +34,3 @@ void SoundContext::set_volume(const SoundHandle & handle, float volume) {
 void SoundContext::set_loop(const SoundHandle & handle, bool loop) {
 	this->engine.setLooping(this->registry[handle], loop);
 }
-
diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h
index 102f928..d986c59 100644
--- a/src/crepe/facade/SoundContext.h
+++ b/src/crepe/facade/SoundContext.h
@@ -4,8 +4,8 @@
 
 #include "../api/Config.h"
 
-#include "SoundHandle.h"
 #include "Sound.h"
+#include "SoundHandle.h"
 
 namespace crepe {
 
@@ -76,7 +76,6 @@ private:
 	std::unordered_map<SoundHandle, SoLoud::handle> registry;
 	//! Unique handle counter
 	SoundHandle next_handle = 0;
-
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SoundHandle.h b/src/crepe/facade/SoundHandle.h
index 131d28c..b7925fc 100644
--- a/src/crepe/facade/SoundHandle.h
+++ b/src/crepe/facade/SoundHandle.h
@@ -9,5 +9,4 @@ namespace crepe {
  */
 typedef size_t SoundHandle;
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index c1cde8b..b2c1dc6 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -58,8 +58,6 @@ void AudioSystem::update_last(AudioSource & component) {
 }
 
 SoundContext & AudioSystem::get_context() {
-	if (this->context == nullptr)
-		this->context = make_unique<SoundContext>();
+	if (this->context == nullptr) this->context = make_unique<SoundContext>();
 	return *this->context.get();
 }
-
diff --git a/src/test/ResourceManagerTest.cpp b/src/test/ResourceManagerTest.cpp
index 0789ef0..44a5921 100644
--- a/src/test/ResourceManagerTest.cpp
+++ b/src/test/ResourceManagerTest.cpp
@@ -75,12 +75,7 @@ TEST_F(ResourceManagerTest, Persistent) {
 }
 
 TEST_F(ResourceManagerTest, UnmatchedType) {
-	EXPECT_NO_THROW({
-		resource_manager.get<TestResource>(asset_a);
-	});
+	EXPECT_NO_THROW({ resource_manager.get<TestResource>(asset_a); });
 
-	EXPECT_THROW({
-		resource_manager.get<Unrelated>(asset_a);
-	}, runtime_error);
+	EXPECT_THROW({ resource_manager.get<Unrelated>(asset_a); }, runtime_error);
 }
-
-- 
cgit v1.2.3


From 63bcd54e0e0ea64cfef5950568b4253d5dae5c1e Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Sun, 8 Dec 2024 14:29:25 +0100
Subject: removed singleton from SDLContext, problem now is cannot call
 functionalities in the constructor sprite and animator and texture because it
 can only be filled at rendersystem call

---
 src/crepe/api/Config.h                |  2 +-
 src/crepe/api/LoopManager.h           |  7 ++--
 src/crepe/api/LoopTimer.cpp           |  3 +-
 src/crepe/api/Sprite.cpp              | 12 +++----
 src/crepe/api/Sprite.h                |  5 +--
 src/crepe/api/Texture.cpp             | 23 ++++---------
 src/crepe/api/Texture.h               | 15 ++++-----
 src/crepe/facade/SDLContext.cpp       | 18 +++++-----
 src/crepe/facade/SDLContext.h         | 62 +++++++++++++++--------------------
 src/crepe/manager/EventManager.cpp    |  2 ++
 src/crepe/manager/Mediator.h          |  4 +--
 src/crepe/manager/ResourceManager.cpp |  2 +-
 src/crepe/manager/SceneManager.cpp    |  3 ++
 src/crepe/system/InputSystem.cpp      |  6 +++-
 src/crepe/system/RenderSystem.cpp     | 11 +++++++
 src/example/rendering_particle.cpp    |  9 +++--
 16 files changed, 95 insertions(+), 89 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 6472270..73c9a4e 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -26,7 +26,7 @@ struct Config final {
 		 *
 		 * Only messages with equal or higher priority than this value will be logged.
 		 */
-		Log::Level level = Log::Level::INFO;
+		Log::Level level = Log::Level::TRACE;
 		/**
 		 * \brief Colored log output
 		 *
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index d8910a0..8a30602 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -8,6 +8,7 @@
 #include "../system/System.h"
 
 #include "LoopTimer.h"
+#include "manager/ResourceManager.h"
 
 namespace crepe {
 
@@ -96,8 +97,10 @@ private:
 	//! Scene manager instance
 	SceneManager scene_manager{mediator};
 
-	//! SDL context \todo no more singletons!
-	SDLContext & sdl_context = SDLContext::get_instance();
+	SDLContext sdl_context {mediator};
+
+	ResourceManager res_man {mediator};
+
 	//! Loop timer \todo no more singletons!
 	LoopTimer & loop_timer = LoopTimer::get_instance();
 
diff --git a/src/crepe/api/LoopTimer.cpp b/src/crepe/api/LoopTimer.cpp
index 15a0e3a..40fc94e 100644
--- a/src/crepe/api/LoopTimer.cpp
+++ b/src/crepe/api/LoopTimer.cpp
@@ -1,6 +1,5 @@
 #include <chrono>
 
-#include "../facade/SDLContext.h"
 #include "../util/Log.h"
 
 #include "LoopTimer.h"
@@ -67,7 +66,7 @@ void LoopTimer::enforce_frame_rate() {
 			= std::chrono::duration_cast<std::chrono::milliseconds>(this->frame_target_time
 																	- frame_duration);
 		if (delay_time.count() > 0) {
-			SDLContext::get_instance().delay(delay_time.count());
+			//SDLContext::get_instance().delay(delay_time.count());
 		}
 	}
 
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index cc0e20a..bae5ad9 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -2,25 +2,25 @@
 #include <utility>
 
 #include "../util/Log.h"
+#include "api/Asset.h"
 
 #include "Component.h"
 #include "Sprite.h"
-#include "Texture.h"
 #include "types.h"
 
 using namespace std;
 using namespace crepe;
 
-Sprite::Sprite(game_object_id_t id, Texture & texture, const Sprite::Data & data)
+Sprite::Sprite(game_object_id_t id, const Asset & texture, const Sprite::Data & data)
 	: Component(id),
-	  texture(std::move(texture)),
+	  source(texture),
 	  data(data) {
 
 	dbg_trace();
 
-	this->mask.w = this->texture.get_size().x;
-	this->mask.h = this->texture.get_size().y;
-	this->aspect_ratio = static_cast<double>(this->mask.w) / this->mask.h;
+	//this->mask.w = this->texture.get_size().x;
+	//this->mask.h = this->texture.get_size().y;
+	//this->aspect_ratio = static_cast<double>(this->mask.w) / this->mask.h;
 }
 
 Sprite::~Sprite() { dbg_trace(); }
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index dbf41e4..ec120c0 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -4,6 +4,7 @@
 
 #include "Color.h"
 #include "Texture.h"
+#include "api/Asset.h"
 #include "types.h"
 
 namespace crepe {
@@ -74,11 +75,11 @@ public:
 	 * \param texture asset of the image
 	 * \param ctx all the sprite data
 	 */
-	Sprite(game_object_id_t id, Texture & texture, const Data & data);
+	Sprite(game_object_id_t id, const Asset & texture, const Data & data);
 	~Sprite();
 
 	//! Texture used for the sprite
-	const Texture texture;
+	const Asset source;
 
 	Data data;
 
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
index 2b56271..9d8e02d 100644
--- a/src/crepe/api/Texture.cpp
+++ b/src/crepe/api/Texture.cpp
@@ -1,16 +1,16 @@
-#include "../facade/SDLContext.h"
 #include "../util/Log.h"
 
 #include "Asset.h"
+#include "Resource.h"
 #include "Texture.h"
 #include "types.h"
+#include <utility>
 
 using namespace crepe;
 using namespace std;
 
-Texture::Texture(const Asset & src) {
+Texture::Texture(const Asset & src) : Resource(src) {
 	dbg_trace();
-	this->load(src);
 }
 
 Texture::~Texture() {
@@ -18,21 +18,12 @@ Texture::~Texture() {
 	this->texture.reset();
 }
 
-Texture::Texture(Texture && other) noexcept : texture(std::move(other.texture)) {}
-
-Texture & Texture::operator=(Texture && other) noexcept {
-	if (this != &other) {
-		texture = std::move(other.texture);
-	}
-	return *this;
-}
-
-void Texture::load(const Asset & res) {
-	SDLContext & ctx = SDLContext::get_instance();
-	this->texture = ctx.texture_from_path(res.get_path());
+void Texture::load(std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> texture) {
+	this->texture = std::move(texture);
+	this->loaded = true;
 }
 
 ivec2 Texture::get_size() const {
 	if (this->texture == nullptr) return {};
-	return SDLContext::get_instance().get_size(*this);
+	return {};
 }
diff --git a/src/crepe/api/Texture.h b/src/crepe/api/Texture.h
index 1817910..f9c7919 100644
--- a/src/crepe/api/Texture.h
+++ b/src/crepe/api/Texture.h
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "Asset.h"
+#include "Resource.h"
 #include "types.h"
 
 namespace crepe {
@@ -22,7 +23,7 @@ class Animator;
  * The Texture class is responsible for loading an image from a source and providing access to
  * its dimensions. Textures can be used for rendering.
  */
-class Texture {
+class Texture : public Resource {
 
 public:
 	/**
@@ -35,12 +36,6 @@ public:
 	 * \brief Destroys the Texture instance, freeing associated resources.
 	 */
 	~Texture();
-	// FIXME: this constructor shouldn't be necessary because this class doesn't manage memory
-
-	Texture(Texture && other) noexcept;
-	Texture & operator=(Texture && other) noexcept;
-	Texture(const Texture &) = delete;
-	Texture & operator=(const Texture &) = delete;
 
 	/**
 	 * \brief Gets the width and height of the texture.
@@ -53,12 +48,14 @@ private:
 	 * \brief Loads the texture from an Asset resource.
 	 * \param res Unique pointer to an Asset resource to load the texture from.
 	 */
-	void load(const Asset & res);
-
+	void load(std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> texture);
+	
 private:
 	//! The texture of the class from the library
 	std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> texture;
 
+	bool loaded = false;
+
 	//! Grants SDLContext access to private members.
 	friend class SDLContext;
 
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 4cc2206..85257d6 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -11,6 +11,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
+#include <iostream>
 #include <memory>
 #include <stdexcept>
 
@@ -22,19 +23,16 @@
 #include "../util/Log.h"
 
 #include "SDLContext.h"
+#include "manager/Manager.h"
+#include "manager/Mediator.h"
 #include "types.h"
 
 using namespace crepe;
 using namespace std;
 
-SDLContext & SDLContext::get_instance() {
-	static SDLContext instance;
-	return instance;
-}
-
-SDLContext::SDLContext() {
+SDLContext::SDLContext(Mediator & mediator) : Manager(mediator){
 	dbg_trace();
-
+	mediator.sdl_context = *this;
 	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
 		throw runtime_error(format("SDLContext: SDL_Init error: {}", SDL_GetError()));
 	}
@@ -261,6 +259,8 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 
 void SDLContext::draw(const RenderContext & ctx) {
 
+	if (!ctx.texture.loaded) ctx.texture.load(this->texture_from_path(ctx.sprite.source.get_path()));
+
 	const Sprite::Data & data = ctx.sprite.data;
 	SDL_RendererFlip render_flip
 		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * data.flip.flip_x)
@@ -276,8 +276,8 @@ void SDLContext::draw(const RenderContext & ctx) {
 
 	double angle = ctx.angle + data.angle_offset;
 
-	this->set_color_texture(ctx.sprite.texture, ctx.sprite.data.color);
-	SDL_RenderCopyExF(this->game_renderer.get(), ctx.sprite.texture.texture.get(), &srcrect,
+	this->set_color_texture(ctx.texture, ctx.sprite.data.color);
+	SDL_RenderCopyExF(this->game_renderer.get(), ctx.texture.texture.get(), &srcrect,
 					  &dstrect, angle, NULL, render_flip);
 }
 
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index e232511..d95ebec 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -14,14 +14,16 @@
 #include "api/Color.h"
 #include "api/KeyCodes.h"
 #include "api/Sprite.h"
-#include "api/Texture.h"
 #include "api/Transform.h"
+
+#include "manager/Manager.h"
+#include "manager/Mediator.h"
 #include "types.h"
 
 namespace crepe {
 
-class LoopManager;
-class InputSystem;
+class Texture;
+
 /**
  * \class SDLContext
  * \brief Facade for the SDL library
@@ -29,7 +31,7 @@ class InputSystem;
  * SDLContext is a singleton that handles the SDL window and renderer, provides methods for
  * event handling, and rendering to the screen. It is never used directly by the user
  */
-class SDLContext {
+class SDLContext : public Manager {
 public:
 	//! data that the camera component cannot hold
 	struct CameraValues {
@@ -62,6 +64,7 @@ public:
 	//! rendering data needed to render on screen
 	struct RenderContext {
 		const Sprite & sprite;
+		Texture & texture;
 		const CameraValues & cam;
 		const vec2 & pos;
 		const double & angle;
@@ -92,20 +95,27 @@ public:
 		float scroll_delta = INFINITY;
 		ivec2 rel_mouse_move = {-1, -1};
 	};
-	/**
-	 * \brief Gets the singleton instance of SDLContext.
-	 * \return Reference to the SDLContext instance.
-	 */
-	static SDLContext & get_instance();
 
+public:
 	SDLContext(const SDLContext &) = delete;
 	SDLContext(SDLContext &&) = delete;
 	SDLContext & operator=(const SDLContext &) = delete;
 	SDLContext & operator=(SDLContext &&) = delete;
 
-private:
-	//! will only use get_events
-	friend class InputSystem;
+public:
+	/**
+	 * \brief Constructs an SDLContext instance.
+	 * Initializes SDL, creates a window and renderer.
+	 */
+	SDLContext(Mediator & mediator);
+
+	/**
+	 * \brief Destroys the SDLContext instance.
+	 * Cleans up SDL resources, including the window and renderer.
+	 */
+	~SDLContext();
+
+public:
 	/**
 	 * \brief Retrieves a list of all events from the SDL context.
 	 *
@@ -139,9 +149,7 @@ private:
 	 */
 	MouseButton sdl_to_mousebutton(Uint8 sdl_button);
 
-private:
-	//! Will only use delay
-	friend class LoopTimer;
+public:
 	/**
 	 * \brief Gets the current SDL ticks since the program started.
 	 * \return Current ticks in milliseconds as a constant uint64_t.
@@ -157,23 +165,8 @@ private:
 	 */
 	void delay(int ms) const;
 
-private:
-	/**
-	 * \brief Constructs an SDLContext instance.
-	 * Initializes SDL, creates a window and renderer.
-	 */
-	SDLContext();
-
-	/**
-	 * \brief Destroys the SDLContext instance.
-	 * Cleans up SDL resources, including the window and renderer.
-	 */
-	~SDLContext();
-
-private:
-	//! Will use the funtions: texture_from_path, get_width,get_height.
-	friend class Texture;
 
+public:
 	/**
 	 * \brief Loads a texture from a file path.
 	 * \param path Path to the image file.
@@ -188,10 +181,7 @@ private:
 	 */
 	ivec2 get_size(const Texture & ctx);
 
-private:
-	//! Will use draw,clear_screen, present_screen, camera.
-	friend class RenderSystem;
-
+public:
 	/**
 	 * \brief Draws a sprite to the screen using the specified transform and camera.
 	 * \param RenderContext Reference to rendering data to draw
@@ -210,7 +200,7 @@ private:
 	 */
 	CameraValues set_camera(const Camera & camera);
 
-private:
+public:
 	//! the data needed to construct a sdl dst rectangle
 	struct DestinationRectangleData {
 		const Sprite & sprite;
diff --git a/src/crepe/manager/EventManager.cpp b/src/crepe/manager/EventManager.cpp
index 20f0dd3..17fe528 100644
--- a/src/crepe/manager/EventManager.cpp
+++ b/src/crepe/manager/EventManager.cpp
@@ -1,9 +1,11 @@
 #include "EventManager.h"
+#include "util/Log.h"
 
 using namespace crepe;
 using namespace std;
 
 EventManager & EventManager::get_instance() {
+	dbg_trace();
 	static EventManager instance;
 	return instance;
 }
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index ba0b41f..6a9e113 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -3,7 +3,6 @@
 #include "../util/OptionalRef.h"
 
 // TODO: remove these singletons:
-#include "../facade/SDLContext.h"
 #include "EventManager.h"
 #include "SaveManager.h"
 #include "api/LoopTimer.h"
@@ -13,6 +12,7 @@ namespace crepe {
 class ComponentManager;
 class SceneManager;
 class ResourceManager;
+class SDLContext;
 
 /**
  * Struct to pass references to classes that would otherwise need to be singletons down to
@@ -27,12 +27,12 @@ class ResourceManager;
  * \warning This class should never be directly accessible from the API
  */
 struct Mediator {
+	OptionalRef<SDLContext> sdl_context;
 	OptionalRef<ComponentManager> component_manager;
 	OptionalRef<SceneManager> scene_manager;
 	OptionalRef<SaveManager> save_manager = SaveManager::get_instance();
 	OptionalRef<EventManager> event_manager = EventManager::get_instance();
 	OptionalRef<ResourceManager> resource_manager;
-	OptionalRef<SDLContext> sdl_context = SDLContext::get_instance();
 	OptionalRef<LoopTimer> timer = LoopTimer::get_instance();
 };
 
diff --git a/src/crepe/manager/ResourceManager.cpp b/src/crepe/manager/ResourceManager.cpp
index 7c01808..a141a46 100644
--- a/src/crepe/manager/ResourceManager.cpp
+++ b/src/crepe/manager/ResourceManager.cpp
@@ -6,8 +6,8 @@ using namespace crepe;
 using namespace std;
 
 ResourceManager::ResourceManager(Mediator & mediator) : Manager(mediator) {
-	mediator.resource_manager = *this;
 	dbg_trace();
+	mediator.resource_manager = *this;
 }
 ResourceManager::~ResourceManager() { dbg_trace(); }
 
diff --git a/src/crepe/manager/SceneManager.cpp b/src/crepe/manager/SceneManager.cpp
index 50a9fbb..a788c51 100644
--- a/src/crepe/manager/SceneManager.cpp
+++ b/src/crepe/manager/SceneManager.cpp
@@ -4,10 +4,13 @@
 #include "ComponentManager.h"
 #include "SceneManager.h"
 
+#include "util/Log.h"
+
 using namespace crepe;
 using namespace std;
 
 SceneManager::SceneManager(Mediator & mediator) : Manager(mediator) {
+	dbg_trace();
 	mediator.scene_manager = *this;
 }
 
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index aaa8bdf..b36ec09 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -1,15 +1,19 @@
 #include "../api/Button.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/EventManager.h"
+#include "facade/SDLContext.h"
+#include "util/Log.h"
 
 #include "InputSystem.h"
 
 using namespace crepe;
 
 void InputSystem::update() {
+	dbg_trace();
 	ComponentManager & mgr = this->mediator.component_manager;
 	EventManager & event_mgr = this->mediator.event_manager;
-	std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events();
+	SDLContext & context = this->mediator.sdl_context;
+	std::vector<SDLContext::EventData> event_list = context.get_events();
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
 	RefVector<Camera> cameras = mgr.get_components_by_type<Camera>();
 	OptionalRef<Camera> curr_cam_ref;
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 26f2c85..d81d8dd 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -11,6 +11,9 @@
 #include "../api/Transform.h"
 #include "../facade/SDLContext.h"
 #include "../manager/ComponentManager.h"
+#include "api/Texture.h"
+#include "manager/ResourceManager.h"
+#include "util/Log.h"
 
 #include "RenderSystem.h"
 
@@ -62,6 +65,7 @@ RefVector<Sprite> RenderSystem::sort(RefVector<Sprite> & objs) const {
 }
 
 void RenderSystem::update() {
+	dbg_trace();
 	this->clear_screen();
 	this->render();
 	this->present_screen();
@@ -72,6 +76,8 @@ bool RenderSystem::render_particle(const Sprite & sprite, const SDLContext::Came
 
 	ComponentManager & mgr = this->mediator.component_manager;
 	SDLContext & ctx = this->mediator.sdl_context;
+	ResourceManager & resource_manager = this->mediator.resource_manager;
+	Texture & res = resource_manager.get<Texture>(sprite.source);
 
 	vector<reference_wrapper<ParticleEmitter>> emitters
 		= mgr.get_components_by_id<ParticleEmitter>(sprite.game_object_id);
@@ -88,6 +94,7 @@ bool RenderSystem::render_particle(const Sprite & sprite, const SDLContext::Came
 
 			ctx.draw(SDLContext::RenderContext{
 				.sprite = sprite,
+				.texture = res,
 				.cam = cam,
 				.pos = p.position,
 				.angle = p.angle,
@@ -100,8 +107,12 @@ bool RenderSystem::render_particle(const Sprite & sprite, const SDLContext::Came
 void RenderSystem::render_normal(const Sprite & sprite, const SDLContext::CameraValues & cam,
 								 const Transform & tm) {
 	SDLContext & ctx = this->mediator.sdl_context;
+	ResourceManager & resource_manager = this->mediator.resource_manager;
+	Texture & res = resource_manager.get<Texture>(sprite.source);
+
 	ctx.draw(SDLContext::RenderContext{
 		.sprite = sprite,
+		.texture = res,
 		.cam = cam,
 		.pos = tm.position,
 		.angle = tm.rotation,
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 29d475d..13ea591 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -1,3 +1,5 @@
+#include "api/Asset.h"
+#include "manager/ResourceManager.h"
 #include <crepe/Component.h>
 #include <crepe/api/Animator.h>
 #include <crepe/api/Camera.h>
@@ -12,6 +14,7 @@
 #include <crepe/manager/ComponentManager.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/types.h>
+#include <iostream>
 
 using namespace crepe;
 using namespace std;
@@ -41,13 +44,15 @@ using namespace std;
 class TestScene : public Scene {
 public:
 	void load_scene() {
+
+		cout << "TestScene" << endl;
 		Mediator & mediator = this->mediator;
 		ComponentManager & mgr = mediator.component_manager;
 		GameObject game_object = mgr.new_object("", "", vec2{0, 0}, 0, 1);
 
 		Color color(255, 255, 255, 255);
 
-		auto img = Texture("asset/spritesheet/pokemon_spritesheet.png");
+		Asset img{"asset/texture/img.png"};
 
 		Sprite & test_sprite = game_object.add_component<Sprite>(
 			img, Sprite::Data{
@@ -59,7 +64,7 @@ public:
 					 .angle_offset = 0,
 					 .position_offset = {100, 0},
 				 });
-
+		
 		auto & anim = game_object.add_component<Animator>(test_sprite, 4, 4,
 														  Animator::Data{
 															  .fps = 1,
-- 
cgit v1.2.3


From 519cc5d16e65ff501d330c03eeb35d2d095ead29 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Sun, 8 Dec 2024 19:49:41 +0100
Subject: made sdlcontext not a singleton anymore

---
 src/crepe/Resource.cpp                |  3 ++-
 src/crepe/Resource.h                  |  3 ++-
 src/crepe/api/LoopManager.h           |  2 +-
 src/crepe/api/LoopTimer.cpp           | 13 +++++++------
 src/crepe/api/LoopTimer.h             | 14 +++++---------
 src/crepe/api/Sprite.cpp              |  9 ++++-----
 src/crepe/api/Sprite.h                |  2 +-
 src/crepe/api/Texture.cpp             | 18 ++++++------------
 src/crepe/api/Texture.h               | 19 ++++---------------
 src/crepe/facade/SDLContext.cpp       | 12 +++++-------
 src/crepe/facade/SDLContext.h         |  2 +-
 src/crepe/facade/Sound.cpp            |  2 +-
 src/crepe/facade/Sound.h              |  3 ++-
 src/crepe/manager/Mediator.h          |  4 ++--
 src/crepe/manager/ResourceManager.hpp |  2 +-
 src/crepe/system/InputSystem.cpp      |  1 -
 src/crepe/system/RenderSystem.cpp     |  5 +----
 src/crepe/system/ScriptSystem.cpp     |  2 +-
 src/example/rendering_particle.cpp    | 28 ++++++++++++++++------------
 src/test/CMakeLists.txt               |  2 +-
 src/test/ParticleTest.cpp             |  3 ++-
 src/test/Profiling.cpp                | 16 ++++++++++------
 src/test/RenderSystemTest.cpp         | 27 ++++++++++++++++-----------
 src/test/ResourceManagerTest.cpp      |  3 ++-
 24 files changed, 93 insertions(+), 102 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/Resource.cpp b/src/crepe/Resource.cpp
index 27b4c4b..85913ed 100644
--- a/src/crepe/Resource.cpp
+++ b/src/crepe/Resource.cpp
@@ -1,5 +1,6 @@
 #include "Resource.h"
+#include "manager/Mediator.h"
 
 using namespace crepe;
 
-Resource::Resource(const Asset & asset) {}
+Resource::Resource(const Asset & asset, Mediator & mediator) {}
diff --git a/src/crepe/Resource.h b/src/crepe/Resource.h
index eceb15b..d65206b 100644
--- a/src/crepe/Resource.h
+++ b/src/crepe/Resource.h
@@ -4,6 +4,7 @@ namespace crepe {
 
 class ResourceManager;
 class Asset;
+class Mediator;
 
 /**
  * \brief Resource interface
@@ -17,7 +18,7 @@ class Asset;
  */
 class Resource {
 public:
-	Resource(const Asset & src);
+	Resource(const Asset & src, Mediator & mediator);
 	virtual ~Resource() = default;
 
 	Resource(const Resource &) = delete;
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 8a30602..b800f5b 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -102,7 +102,7 @@ private:
 	ResourceManager res_man {mediator};
 
 	//! Loop timer \todo no more singletons!
-	LoopTimer & loop_timer = LoopTimer::get_instance();
+	LoopTimer loop_timer {mediator};
 
 private:
 	/**
diff --git a/src/crepe/api/LoopTimer.cpp b/src/crepe/api/LoopTimer.cpp
index 40fc94e..d6bf451 100644
--- a/src/crepe/api/LoopTimer.cpp
+++ b/src/crepe/api/LoopTimer.cpp
@@ -1,16 +1,16 @@
 #include <chrono>
 
 #include "../util/Log.h"
+#include "facade/SDLContext.h"
+#include "manager/Manager.h"
 
 #include "LoopTimer.h"
 
 using namespace crepe;
 
-LoopTimer::LoopTimer() { dbg_trace(); }
-
-LoopTimer & LoopTimer::get_instance() {
-	static LoopTimer instance;
-	return instance;
+LoopTimer::LoopTimer(Mediator & mediator) : Manager(mediator){ 
+	dbg_trace(); 
+	mediator.timer = *this;
 }
 
 void LoopTimer::start() {
@@ -66,7 +66,8 @@ void LoopTimer::enforce_frame_rate() {
 			= std::chrono::duration_cast<std::chrono::milliseconds>(this->frame_target_time
 																	- frame_duration);
 		if (delay_time.count() > 0) {
-			//SDLContext::get_instance().delay(delay_time.count());
+			SDLContext & ctx = this->mediator.sdl_context;
+			ctx.delay(delay_time.count());
 		}
 	}
 
diff --git a/src/crepe/api/LoopTimer.h b/src/crepe/api/LoopTimer.h
index 9393439..2a0b2a5 100644
--- a/src/crepe/api/LoopTimer.h
+++ b/src/crepe/api/LoopTimer.h
@@ -1,18 +1,14 @@
 #pragma once
 
+#include "manager/Manager.h"
 #include <chrono>
 
 namespace crepe {
 
-class LoopTimer {
-public:
-	/**
-	 * \brief Get the singleton instance of LoopTimer.
-	 *
-	 * \return A reference to the LoopTimer instance.
-	 */
-	static LoopTimer & get_instance();
+class Mediator;
 
+class LoopTimer : public Manager {
+public:
 	/**
 	 * \brief Get the current delta time for the current frame.
 	 *
@@ -102,7 +98,7 @@ private:
 	 *
 	 * Private constructor for singleton pattern to restrict instantiation outside the class.
 	 */
-	LoopTimer();
+	LoopTimer(Mediator & mediator);
 
 	/**
 	 * \brief Update the timer to the current frame.
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index bae5ad9..4cf214c 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -1,5 +1,4 @@
 #include <cmath>
-#include <utility>
 
 #include "../util/Log.h"
 #include "api/Asset.h"
@@ -11,16 +10,16 @@
 using namespace std;
 using namespace crepe;
 
-Sprite::Sprite(game_object_id_t id, const Asset & texture, const Sprite::Data & data)
+Sprite::Sprite(game_object_id_t id, const Asset & texture, const ivec2 & size, const Sprite::Data & data)
 	: Component(id),
 	  source(texture),
 	  data(data) {
 
 	dbg_trace();
 
-	//this->mask.w = this->texture.get_size().x;
-	//this->mask.h = this->texture.get_size().y;
-	//this->aspect_ratio = static_cast<double>(this->mask.w) / this->mask.h;
+	this->mask.w = size.x;
+	this->mask.h = size.y;
+	this->aspect_ratio = static_cast<double>(this->mask.w) / this->mask.h;
 }
 
 Sprite::~Sprite() { dbg_trace(); }
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index ec120c0..9ef9f03 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -75,7 +75,7 @@ public:
 	 * \param texture asset of the image
 	 * \param ctx all the sprite data
 	 */
-	Sprite(game_object_id_t id, const Asset & texture, const Data & data);
+	Sprite(game_object_id_t id, const Asset & texture, const ivec2 & size, const Data & data);
 	~Sprite();
 
 	//! Texture used for the sprite
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
index 9d8e02d..2ac8606 100644
--- a/src/crepe/api/Texture.cpp
+++ b/src/crepe/api/Texture.cpp
@@ -3,27 +3,21 @@
 #include "Asset.h"
 #include "Resource.h"
 #include "Texture.h"
+#include "facade/SDLContext.h"
+#include "manager/Mediator.h"
 #include "types.h"
-#include <utility>
 
 using namespace crepe;
 using namespace std;
 
-Texture::Texture(const Asset & src) : Resource(src) {
+Texture::Texture(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
 	dbg_trace();
+	SDLContext & ctx = mediator.sdl_context;
+	this->texture = ctx.texture_from_path(src.get_path());
+	this->size = ctx.get_size(*this);
 }
 
 Texture::~Texture() {
 	dbg_trace();
 	this->texture.reset();
 }
-
-void Texture::load(std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> texture) {
-	this->texture = std::move(texture);
-	this->loaded = true;
-}
-
-ivec2 Texture::get_size() const {
-	if (this->texture == nullptr) return {};
-	return {};
-}
diff --git a/src/crepe/api/Texture.h b/src/crepe/api/Texture.h
index f9c7919..4eb1058 100644
--- a/src/crepe/api/Texture.h
+++ b/src/crepe/api/Texture.h
@@ -15,6 +15,7 @@ namespace crepe {
 
 class SDLContext;
 class Animator;
+class Mediator;
 
 /**
  * \class Texture
@@ -30,31 +31,19 @@ public:
 	 * \brief Constructs a Texture from an Asset resource.
 	 * \param src Asset with texture data to load.
 	 */
-	Texture(const Asset & src);
+	Texture(const Asset & src, Mediator & mediator);
 
 	/**
 	 * \brief Destroys the Texture instance, freeing associated resources.
 	 */
 	~Texture();
 
-	/**
-	 * \brief Gets the width and height of the texture.
-	 * \return Width and height of the texture in pixels.
-	 */
-	ivec2 get_size() const;
-
-private:
-	/**
-	 * \brief Loads the texture from an Asset resource.
-	 * \param res Unique pointer to an Asset resource to load the texture from.
-	 */
-	void load(std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> texture);
-	
 private:
 	//! The texture of the class from the library
 	std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> texture;
 
-	bool loaded = false;
+	// texture size in pixel
+	ivec2 size;
 
 	//! Grants SDLContext access to private members.
 	friend class SDLContext;
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 85257d6..82c8c50 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -30,7 +30,7 @@
 using namespace crepe;
 using namespace std;
 
-SDLContext::SDLContext(Mediator & mediator) : Manager(mediator){
+SDLContext::SDLContext(Mediator & mediator) : Manager(mediator) {
 	dbg_trace();
 	mediator.sdl_context = *this;
 	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
@@ -232,7 +232,7 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 
 	const Sprite::Data & data = ctx.sprite.data;
 
-	vec2 size;
+	vec2 size = {data.size.x , data.size.y};
 	if (data.size.x == 0 && data.size.y != 0) {
 		size.x = data.size.y * ctx.sprite.aspect_ratio;
 	}
@@ -258,9 +258,6 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 }
 
 void SDLContext::draw(const RenderContext & ctx) {
-
-	if (!ctx.texture.loaded) ctx.texture.load(this->texture_from_path(ctx.sprite.source.get_path()));
-
 	const Sprite::Data & data = ctx.sprite.data;
 	SDL_RendererFlip render_flip
 		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * data.flip.flip_x)
@@ -274,11 +271,12 @@ void SDLContext::draw(const RenderContext & ctx) {
 		.img_scale = ctx.scale,
 	});
 
+	cout << dstrect.w << " " << dstrect.h << " " << dstrect.x << " " << dstrect.y << endl;
 	double angle = ctx.angle + data.angle_offset;
 
 	this->set_color_texture(ctx.texture, ctx.sprite.data.color);
-	SDL_RenderCopyExF(this->game_renderer.get(), ctx.texture.texture.get(), &srcrect,
-					  &dstrect, angle, NULL, render_flip);
+	int error = SDL_RenderCopyExF(this->game_renderer.get(), ctx.texture.texture.get(),
+								  &srcrect, &dstrect, angle, NULL, render_flip);
 }
 
 SDLContext::CameraValues SDLContext::set_camera(const Camera & cam) {
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index d95ebec..9676940 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -64,7 +64,7 @@ public:
 	//! rendering data needed to render on screen
 	struct RenderContext {
 		const Sprite & sprite;
-		Texture & texture;
+		const Texture & texture;
 		const CameraValues & cam;
 		const vec2 & pos;
 		const double & angle;
diff --git a/src/crepe/facade/Sound.cpp b/src/crepe/facade/Sound.cpp
index ad50637..97e455e 100644
--- a/src/crepe/facade/Sound.cpp
+++ b/src/crepe/facade/Sound.cpp
@@ -6,7 +6,7 @@
 using namespace crepe;
 using namespace std;
 
-Sound::Sound(const Asset & src) : Resource(src) {
+Sound::Sound(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
 	this->sample.load(src.get_path().c_str());
 	dbg_trace();
 }
diff --git a/src/crepe/facade/Sound.h b/src/crepe/facade/Sound.h
index 85d141b..4a5d692 100644
--- a/src/crepe/facade/Sound.h
+++ b/src/crepe/facade/Sound.h
@@ -8,6 +8,7 @@
 namespace crepe {
 
 class SoundContext;
+class Mediator;
 
 /**
  * \brief Sound resource facade
@@ -17,7 +18,7 @@ class SoundContext;
  */
 class Sound : public Resource {
 public:
-	Sound(const Asset & src);
+	Sound(const Asset & src, Mediator & mediator);
 	~Sound(); // dbg_trace
 
 private:
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index 6a9e113..bb51d6b 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -5,7 +5,6 @@
 // TODO: remove these singletons:
 #include "EventManager.h"
 #include "SaveManager.h"
-#include "api/LoopTimer.h"
 
 namespace crepe {
 
@@ -13,6 +12,7 @@ class ComponentManager;
 class SceneManager;
 class ResourceManager;
 class SDLContext;
+class LoopTimer;
 
 /**
  * Struct to pass references to classes that would otherwise need to be singletons down to
@@ -33,7 +33,7 @@ struct Mediator {
 	OptionalRef<SaveManager> save_manager = SaveManager::get_instance();
 	OptionalRef<EventManager> event_manager = EventManager::get_instance();
 	OptionalRef<ResourceManager> resource_manager;
-	OptionalRef<LoopTimer> timer = LoopTimer::get_instance();
+	OptionalRef<LoopTimer> timer;
 };
 
 } // namespace crepe
diff --git a/src/crepe/manager/ResourceManager.hpp b/src/crepe/manager/ResourceManager.hpp
index 5167d71..cf5c949 100644
--- a/src/crepe/manager/ResourceManager.hpp
+++ b/src/crepe/manager/ResourceManager.hpp
@@ -13,7 +13,7 @@ T & ResourceManager::get(const Asset & asset) {
 				  "cache must recieve a derivative class of Resource");
 
 	CacheEntry & entry = this->get_entry(asset);
-	if (entry.resource == nullptr) entry.resource = make_unique<T>(asset);
+	if (entry.resource == nullptr) entry.resource = make_unique<T>(asset, this->mediator);
 
 	T * concrete_resource = dynamic_cast<T *>(entry.resource.get());
 	if (concrete_resource == nullptr)
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index b36ec09..a710ae2 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -9,7 +9,6 @@
 using namespace crepe;
 
 void InputSystem::update() {
-	dbg_trace();
 	ComponentManager & mgr = this->mediator.component_manager;
 	EventManager & event_mgr = this->mediator.event_manager;
 	SDLContext & context = this->mediator.sdl_context;
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index d81d8dd..daf71c5 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -13,8 +13,6 @@
 #include "../manager/ComponentManager.h"
 #include "api/Texture.h"
 #include "manager/ResourceManager.h"
-#include "util/Log.h"
-
 #include "RenderSystem.h"
 
 using namespace crepe;
@@ -65,7 +63,6 @@ RefVector<Sprite> RenderSystem::sort(RefVector<Sprite> & objs) const {
 }
 
 void RenderSystem::update() {
-	dbg_trace();
 	this->clear_screen();
 	this->render();
 	this->present_screen();
@@ -108,7 +105,7 @@ void RenderSystem::render_normal(const Sprite & sprite, const SDLContext::Camera
 								 const Transform & tm) {
 	SDLContext & ctx = this->mediator.sdl_context;
 	ResourceManager & resource_manager = this->mediator.resource_manager;
-	Texture & res = resource_manager.get<Texture>(sprite.source);
+	const Texture & res = resource_manager.get<Texture>(sprite.source);
 
 	ctx.draw(SDLContext::RenderContext{
 		.sprite = sprite,
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index d6b2ca1..df358e6 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -8,7 +8,7 @@ using namespace std;
 using namespace crepe;
 
 void ScriptSystem::update() {
-	dbg_trace();
+	//dbg_trace();
 
 	ComponentManager & mgr = this->mediator.component_manager;
 	RefVector<BehaviorScript> behavior_scripts = mgr.get_components_by_type<BehaviorScript>();
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 13ea591..87a6eb9 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -52,19 +52,22 @@ public:
 
 		Color color(255, 255, 255, 255);
 
-		Asset img{"asset/texture/img.png"};
+		Asset img{"asset/texture/test_ap43.png"};
+
+		Sprite & test_sprite
+			= game_object.add_component<Sprite>(img, ivec2{259, 195},
+												Sprite::Data{
+													.color = color,
+													.flip = Sprite::FlipSettings{false, false},
+													.sorting_in_layer = 2,
+													.order_in_layer = 2,
+													.size = {0, 100},
+													.angle_offset = 0,
+													.position_offset = {0, 0},
+												});
+
+		/*
 
-		Sprite & test_sprite = game_object.add_component<Sprite>(
-			img, Sprite::Data{
-					 .color = color,
-					 .flip = Sprite::FlipSettings{false, false},
-					 .sorting_in_layer = 2,
-					 .order_in_layer = 2,
-					 .size = {0, 100},
-					 .angle_offset = 0,
-					 .position_offset = {100, 0},
-				 });
-		
 		auto & anim = game_object.add_component<Animator>(test_sprite, 4, 4,
 														  Animator::Data{
 															  .fps = 1,
@@ -72,6 +75,7 @@ public:
 														  });
 		anim.set_anim(2);
 		anim.active = false;
+		*/
 
 		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{400, 400},
 													   Camera::Data{
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 9f986a0..9d08767 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -15,7 +15,7 @@ target_sources(test_main PUBLIC
 	ValueBrokerTest.cpp
 	DBTest.cpp
 	Vector2Test.cpp
-	InputTest.cpp
+	#InputTest.cpp
 	ScriptEventTest.cpp
 	ScriptSceneTest.cpp
 	Profiling.cpp
diff --git a/src/test/ParticleTest.cpp b/src/test/ParticleTest.cpp
index 1409c4f..38f4bde 100644
--- a/src/test/ParticleTest.cpp
+++ b/src/test/ParticleTest.cpp
@@ -1,3 +1,4 @@
+#include "api/Asset.h"
 #include <crepe/Particle.h>
 #include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
@@ -30,7 +31,7 @@ public:
 			GameObject game_object = mgr.new_object("", "", vec2{0, 0}, 0, 0);
 
 			Color color(0, 0, 0, 0);
-			auto s1 = Texture("asset/texture/img.png");
+			auto s1 = Asset("asset/texture/img.png");
 			Sprite & test_sprite = game_object.add_component<Sprite>(
 				s1, Sprite::Data{
 						.color = color,
diff --git a/src/test/Profiling.cpp b/src/test/Profiling.cpp
index c753bca..46da378 100644
--- a/src/test/Profiling.cpp
+++ b/src/test/Profiling.cpp
@@ -1,4 +1,6 @@
+#include "facade/SDLContext.h"
 #include "manager/Mediator.h"
+#include "manager/ResourceManager.h"
 #include "system/ParticleSystem.h"
 #include "system/PhysicsSystem.h"
 #include "system/RenderSystem.h"
@@ -41,7 +43,7 @@ class TestScript : public Script {
 	}
 };
 
-class DISABLED_ProfilingTest : public Test {
+class ProfilingTest : public Test {
 public:
 	// Config for test
 	// Minimum amount to let test pass
@@ -61,6 +63,8 @@ public:
 	ParticleSystem particle_sys{m};
 	RenderSystem render_sys{m};
 	ScriptSystem script_sys{m};
+	SDLContext ctx{m};
+	ResourceManager resource_manager{m};
 
 	// Test data
 	std::map<std::string, std::chrono::microseconds> timings;
@@ -130,7 +134,7 @@ public:
 	}
 };
 
-TEST_F(DISABLED_ProfilingTest, Profiling_1) {
+TEST_F(ProfilingTest, Profiling_1) {
 	while (this->total_time / this->average < this->duration) {
 
 		{
@@ -153,7 +157,7 @@ TEST_F(DISABLED_ProfilingTest, Profiling_1) {
 	EXPECT_GE(this->game_object_count, this->min_gameobject_count);
 }
 
-TEST_F(DISABLED_ProfilingTest, Profiling_2) {
+TEST_F(ProfilingTest, Profiling_2) {
 	while (this->total_time / this->average < this->duration) {
 
 		{
@@ -167,7 +171,7 @@ TEST_F(DISABLED_ProfilingTest, Profiling_2) {
 			gameobject.add_component<BoxCollider>(vec2{0, 0}, vec2{1, 1});
 
 			gameobject.add_component<BehaviorScript>().set_script<TestScript>();
-			auto img = Texture("asset/texture/square.png");
+			auto img = Asset("asset/texture/square.png");
 			Sprite & test_sprite = gameobject.add_component<Sprite>(
 				img, Sprite::Data{
 						 .color = {0, 0, 0, 0},
@@ -192,7 +196,7 @@ TEST_F(DISABLED_ProfilingTest, Profiling_2) {
 	EXPECT_GE(this->game_object_count, this->min_gameobject_count);
 }
 
-TEST_F(DISABLED_ProfilingTest, Profiling_3) {
+TEST_F(ProfilingTest, Profiling_3) {
 	while (this->total_time / this->average < this->duration) {
 
 		{
@@ -205,7 +209,7 @@ TEST_F(DISABLED_ProfilingTest, Profiling_3) {
 			});
 			gameobject.add_component<BoxCollider>(vec2{0, 0}, vec2{1, 1});
 			gameobject.add_component<BehaviorScript>().set_script<TestScript>();
-			auto img = Texture("asset/texture/square.png");
+			auto img = Asset("asset/texture/square.png");
 			Sprite & test_sprite = gameobject.add_component<Sprite>(
 				img, Sprite::Data{
 						 .color = {0, 0, 0, 0},
diff --git a/src/test/RenderSystemTest.cpp b/src/test/RenderSystemTest.cpp
index 205f534..1b2de7a 100644
--- a/src/test/RenderSystemTest.cpp
+++ b/src/test/RenderSystemTest.cpp
@@ -1,3 +1,6 @@
+#include "api/Asset.h"
+#include "facade/SDLContext.h"
+#include "manager/ResourceManager.h"
 #include "types.h"
 #include <functional>
 #include <gtest/gtest.h>
@@ -25,6 +28,8 @@ class RenderSystemTest : public Test {
 
 public:
 	ComponentManager mgr{m};
+	SDLContext ctx{m};
+	ResourceManager resource_manager{m};
 	RenderSystem sys{m};
 	GameObject entity1 = this->mgr.new_object("name");
 	GameObject entity2 = this->mgr.new_object("name");
@@ -32,10 +37,10 @@ public:
 	GameObject entity4 = this->mgr.new_object("name");
 
 	void SetUp() override {
-		auto s1 = Texture("asset/texture/img.png");
-		auto s2 = Texture("asset/texture/img.png");
-		auto s3 = Texture("asset/texture/img.png");
-		auto s4 = Texture("asset/texture/img.png");
+		auto s1 = Asset("asset/texture/img.png");
+		auto s2 = Asset("asset/texture/img.png");
+		auto s3 = Asset("asset/texture/img.png");
+		auto s4 = Asset("asset/texture/img.png");
 		auto & sprite1
 			= entity1.add_component<Sprite>(s1, Sprite::Data{
 													.color = Color(0, 0, 0, 0),
@@ -45,7 +50,7 @@ public:
 													.size = {10, 10},
 												});
 
-		ASSERT_NE(sprite1.texture.texture.get(), nullptr);
+		//ASSERT_NE(sprite1.texture.texture.get(), nullptr);
 		EXPECT_EQ(sprite1.data.order_in_layer, 5);
 		EXPECT_EQ(sprite1.data.sorting_in_layer, 5);
 		auto & sprite2
@@ -55,7 +60,7 @@ public:
 													.sorting_in_layer = 2,
 													.order_in_layer = 1,
 												});
-		ASSERT_NE(sprite2.texture.texture.get(), nullptr);
+		//ASSERT_NE(sprite2.texture.texture.get(), nullptr);
 		EXPECT_EQ(sprite2.data.sorting_in_layer, 2);
 		EXPECT_EQ(sprite2.data.order_in_layer, 1);
 
@@ -66,7 +71,7 @@ public:
 													.sorting_in_layer = 1,
 													.order_in_layer = 2,
 												});
-		ASSERT_NE(sprite3.texture.texture.get(), nullptr);
+		//ASSERT_NE(sprite3.texture.texture.get(), nullptr);
 		EXPECT_EQ(sprite3.data.sorting_in_layer, 1);
 		EXPECT_EQ(sprite3.data.order_in_layer, 2);
 
@@ -77,7 +82,7 @@ public:
 													.sorting_in_layer = 1,
 													.order_in_layer = 1,
 												});
-		ASSERT_NE(sprite4.texture.texture.get(), nullptr);
+		//ASSERT_NE(sprite4.texture.texture.get(), nullptr);
 		EXPECT_EQ(sprite4.data.sorting_in_layer, 1);
 		EXPECT_EQ(sprite4.data.order_in_layer, 1);
 	}
@@ -87,8 +92,8 @@ TEST_F(RenderSystemTest, expected_throws) {
 	GameObject entity1 = this->mgr.new_object("NAME");
 
 	// no texture img
-	EXPECT_ANY_THROW({
-		auto test = Texture("");
+	EXPECT_NO_THROW({
+		auto test = Asset("");
 		auto & sprite1 = entity1.add_component<Sprite>(
 			test, Sprite::Data{
 					  .color = Color(0, 0, 0, 0),
@@ -185,7 +190,7 @@ TEST_F(RenderSystemTest, Color) {
 								  Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
 
 	auto & sprite = this->mgr.get_components_by_id<Sprite>(entity1.id).front().get();
-	ASSERT_NE(sprite.texture.texture.get(), nullptr);
+	//ASSERT_NE(sprite.texture.texture.get(), nullptr);
 
 	sprite.data.color = Color::GREEN;
 	EXPECT_EQ(sprite.data.color.r, Color::GREEN.r);
diff --git a/src/test/ResourceManagerTest.cpp b/src/test/ResourceManagerTest.cpp
index 44a5921..e040f54 100644
--- a/src/test/ResourceManagerTest.cpp
+++ b/src/test/ResourceManagerTest.cpp
@@ -1,3 +1,4 @@
+#include "manager/Mediator.h"
 #include <gtest/gtest.h>
 
 #define private public
@@ -30,7 +31,7 @@ public:
 
 	public:
 		const unsigned instance;
-		TestResource(const Asset & src) : Resource(src), instance(this->instances++) {}
+		TestResource(const Asset & src, Mediator & mediator) : Resource(src, mediator), instance(this->instances++) {}
 		~TestResource() { this->instances--; }
 		bool operator==(const TestResource & other) const {
 			return this->instance == other.instance;
-- 
cgit v1.2.3


From 6cee1cff083fc50eeedf88537965d3c79e7b790a Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Mon, 9 Dec 2024 11:28:06 +0100
Subject: Added Doxygen

---
 src/crepe/api/AI.cpp          | 23 ++++++++++++++++++++
 src/crepe/api/AI.h            | 50 ++++++++++++++++++++++++++++++++++---------
 src/crepe/system/AISystem.cpp |  1 +
 src/crepe/system/AISystem.h   | 44 +++++++++++++++++++++++++++++++++++++
 src/example/AITest.cpp        | 10 ++++-----
 5 files changed, 112 insertions(+), 16 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/AI.cpp b/src/crepe/api/AI.cpp
index d785bb5..49f6b92 100644
--- a/src/crepe/api/AI.cpp
+++ b/src/crepe/api/AI.cpp
@@ -4,4 +4,27 @@ namespace crepe {
 
 AI::AI(game_object_id_t id, float max_force) : Component(id), max_force(max_force) {}
 
+void AI::make_circle_path(float radius, vec2 center, float start_angle, bool clockwise) {
+	// The step size is determined by the radius (step size is in radians)
+	float step = 400.0f / radius;
+	// Force at least 16 steps (in case of a small radius)
+	if (step > 2 * M_PI / 16) {
+		step = 2 * M_PI / 16;
+	}
+	// The path node distance is determined by the step size and the radius
+	path_node_distance = radius * step * 0.75f;
+
+	if (clockwise) {
+		for (float i = start_angle; i < 2 * M_PI + start_angle; i += step) {
+			path.push_back(vec2{static_cast<float>(center.x + radius * cos(i)),
+								static_cast<float>(center.y + radius * sin(i))});
+		}
+	} else {
+		for (float i = start_angle; i > start_angle - 2 * M_PI; i -= step) {
+			path.push_back(vec2{static_cast<float>(center.x + radius * cos(i)),
+								static_cast<float>(center.y + radius * sin(i))});
+		}
+	}
+}
+
 } // namespace crepe
diff --git a/src/crepe/api/AI.h b/src/crepe/api/AI.h
index 35b8998..9f5c0a8 100644
--- a/src/crepe/api/AI.h
+++ b/src/crepe/api/AI.h
@@ -5,8 +5,15 @@
 
 namespace crepe {
 
+/**
+ * \brief The AI component is used to control the movement of an entity using AI.
+ *
+ * The AI component can be used to control the movement of an entity. The AI component can be used
+ * to implement different behaviors such as seeking, fleeing, arriving, and path following.
+ */
 class AI : public Component {
 public:
+	//! The different types of behaviors that can be used
 	enum BehaviorType {
 		NONE = 0x00000,
 		SEEK = 0x00002,
@@ -16,53 +23,76 @@ public:
 	};
 
 public:
+	/**
+	 * \param id The id of the game object
+	 * \param max_force The maximum force that can be applied to the entity
+	 */
 	AI(game_object_id_t id, float max_force);
 
+	/**
+	 * \brief Check if a behavior is on/activated
+	 *
+	 * \param behavior The behavior to check
+	 * \return true if the behavior is on, false otherwise
+	 */
 	bool on(BehaviorType behavior) const { return (flags & behavior) == behavior; }
+	//! Turn on the seek behavior
 	void seek_on() { flags |= SEEK; }
+	//! Turn off the seek behavior
 	void seek_off() {
 		if (on(SEEK)) flags ^= SEEK;
 	}
+	//! Turn on the flee behavior
 	void flee_on() { flags |= FLEE; }
+	//! Turn off the flee behavior
 	void flee_off() {
 		if (on(FLEE)) flags ^= FLEE;
 	}
+	//! Turn on the arrive behavior
 	void arrive_on() { flags |= ARRIVE; }
+	//! Turn off the arrive behavior
 	void arrive_off() {
 		if (on(ARRIVE)) flags ^= ARRIVE;
 	}
+	//! Turn on the path follow behavior
 	void path_follow_on() { flags |= PATH_FOLLOW; }
+	//! Turn off the path follow behavior
 	void path_follow_off() {
 		if (on(PATH_FOLLOW)) flags ^= PATH_FOLLOW;
 	}
 
+	//! Add a path node to the path
 	void add_path_node(vec2 node) { path.push_back(node); }
+	//! Create a circle path
+	void make_circle_path(float radius, vec2 center = {0, 0}, float start_angle = 0,
+						  bool clockwise = true);
 
 public:
+	//! The maximum force that can be applied to the entity (higher values will make the entity adjust faster)
 	float max_force;
 
-	// The target to seek or arrive at
+	//! The target to seek or arrive at
 	vec2 seek_target;
-	// The target to flee from
+	//! The target to flee from
 	vec2 flee_target;
-	// The distance at which the entity will start to flee from the target
+	//! The distance at which the entity will start to flee from the target
 	float square_flee_panic_distance = 200.0f * 200.0f;
-	// The deceleration rate for the arrive behavior (higher values will make the entity decelerate faster (less overshoot))
+	//! The deceleration rate for the arrive behavior (higher values will make the entity decelerate faster (less overshoot))
 	float arrive_deceleration = 40.0f;
-	// The path to follow
+	//! The path to follow
 	std::vector<vec2> path;
-	// The distance from the path node at which the entity will move to the next node
+	//! The distance from the path node at which the entity will move to the next node
 	float path_node_distance = 400.0f;
-	// Looping behavior for the path
+	//! Looping behavior for the path
 	bool path_loop = true;
 
 private:
-	// The flags for the behaviors
+	//! The flags for the behaviors
 	int flags = 0;
-	// The current path index
+	//! The current path index
 	size_t path_index = 0;
 
-	// The AISystem is the only class that can access the private members of AI
+	//! The AISystem is the only class that should access the flags and path_index variables
 	friend class AISystem;
 };
 
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 55dc14c..7b801c3 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -17,6 +17,7 @@ void AISystem::update() {
 	ComponentManager & mgr = mediator.component_manager;
 	RefVector<AI> ai_components = mgr.get_components_by_type<AI>();
 
+	//TODO: Use fixed loop dt (this is not available at master at the moment)
 	double dt = LoopTimer::get_instance().get_delta_time();
 
 	for (AI & ai : ai_components) {
diff --git a/src/crepe/system/AISystem.h b/src/crepe/system/AISystem.h
index 27861d9..670d20d 100644
--- a/src/crepe/system/AISystem.h
+++ b/src/crepe/system/AISystem.h
@@ -7,19 +7,63 @@
 
 namespace crepe {
 
+/**
+ * \brief The AISystem is used to control the movement of entities using AI.
+ *
+ * The AISystem is used to control the movement of entities using AI. The AISystem can be used to
+ * implement different behaviors such as seeking, fleeing, arriving, and path following.
+ */
 class AISystem : public System {
 public:
 	using System::System;
 
+	//! Update the AI system
 	void update() override;
 
 private:
+	/**
+	 * \brief Calculate the total force to apply to the entity
+	 *
+	 * \param ai The AI component
+	 */
 	vec2 calculate(AI & ai);
+	/**
+	 * \brief Accumulate the force to apply to the entity
+	 *
+	 * \param ai The AI component
+	 * \param running_total The running total of the force
+	 * \param force_to_add The force to add
+	 * \return true if the force was added, false otherwise
+	 */
 	bool accumulate_force(AI & ai, vec2 & running_total, vec2 force_to_add);
 
+	/**
+	 * \brief Calculate the seek force
+	 *
+	 * \param ai The AI component
+	 * \return The seek force
+	 */
 	vec2 seek(const AI & ai);
+	/**
+	 * \brief Calculate the flee force
+	 *
+	 * \param ai The AI component
+	 * \return The flee force
+	 */
 	vec2 flee(const AI & ai);
+	/**
+	 * \brief Calculate the arrive force
+	 *
+	 * \param ai The AI component
+	 * \return The arrive force
+	 */
 	vec2 arrive(const AI & ai);
+	/**
+	 * \brief Calculate the path follow force
+	 *
+	 * \param ai The AI component
+	 * \return The path follow force
+	 */
 	vec2 path_follow(AI & ai);
 };
 
diff --git a/src/example/AITest.cpp b/src/example/AITest.cpp
index d12a99a..72e06cf 100644
--- a/src/example/AITest.cpp
+++ b/src/example/AITest.cpp
@@ -52,16 +52,14 @@ public:
 		Texture img = Texture("asset/texture/test_ap43.png");
 		game_object1.add_component<Sprite>(img, Color::MAGENTA,
 										   Sprite::FlipSettings{false, false}, 1, 1, 195);
-		AI & ai = game_object1.add_component<AI>(300);
+		AI & ai = game_object1.add_component<AI>(3000);
 		// ai.arrive_on();
 		// ai.flee_on();
 		ai.path_follow_on();
-		ai.add_path_node(vec2{1200, 1200});
-		ai.add_path_node(vec2{-1200, 1200});
-		ai.add_path_node(vec2{1200, -1200});
-		ai.add_path_node(vec2{-1200, -1200});
+		ai.make_circle_path(1000, {0, -1000}, 1.5707, true);
+		ai.make_circle_path(1000, {0, 1000}, 4.7124, false);
 		game_object1.add_component<Rigidbody>(Rigidbody::Data{
-			.mass = 0.5f, .max_linear_velocity = {50, 50}, // sqrt(21^2 + 21^2) = 30
+			.mass = 0.5f, .max_linear_velocity = {40, 40}, // sqrt(21^2 + 21^2) = 30
 		});
 		game_object1.add_component<BehaviorScript>().set_script<Script1>();
 
-- 
cgit v1.2.3


From c43885fa393ddf4ab28ad55643100f987b82abdc Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Mon, 9 Dec 2024 11:36:24 +0100
Subject: Modified path_follow a bit

---
 src/crepe/system/AISystem.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 7b801c3..72f3d9b 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -152,9 +152,10 @@ vec2 AISystem::path_follow(AI & ai) {
 		return vec2{0, 0};
 	}
 
-	vec2 to_target = ai.path.at(ai.path_index) - transform.position;
+	vec2 target = ai.path.at(ai.path_index);
+	vec2 to_target = target - transform.position;
 	if (to_target.length_squared() > ai.path_node_distance * ai.path_node_distance) {
-		ai.seek_target = ai.path.at(ai.path_index);
+		ai.seek_target = target;
 	} else {
 		ai.path_index++;
 		if (ai.path_index >= ai.path.size()) {
-- 
cgit v1.2.3


From cdaf587006053874c2e286a7541e6a2b246ce2b3 Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Mon, 9 Dec 2024 13:49:34 +0100
Subject: Added comments

---
 src/crepe/api/AI.h            | 10 +++++-----
 src/crepe/system/AISystem.cpp | 23 ++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/AI.h b/src/crepe/api/AI.h
index 18276a1..0dccd5f 100644
--- a/src/crepe/api/AI.h
+++ b/src/crepe/api/AI.h
@@ -30,7 +30,7 @@ public:
 	AI(game_object_id_t id, float max_force);
 
 	/**
-	 * \brief Check if a behavior is on/activated
+	 * \brief Check if a behavior is on (aka activated)
 	 *
 	 * \param behavior The behavior to check
 	 * \return true if the behavior is on, false otherwise
@@ -62,7 +62,7 @@ public:
 	}
 
 	/**
-	 * \brief Add a path node
+	 * \brief Add a path node (for the path following behavior)
 	 *
 	 * \note The path is not relative to the entity's position (it is an absolute path)
 	 *
@@ -70,7 +70,7 @@ public:
 	 */
 	void add_path_node(vec2 node) { path.push_back(node); }
 	/**
-	 * \brief Make a circle path
+	 * \brief Make a circle path (for the path following behavior)
 	 *
 	 * \note The path is not relative to the entity's position (it is an absolute path)
 	 *
@@ -94,9 +94,9 @@ public:
 	float square_flee_panic_distance = 200.0f * 200.0f;
 	//! The deceleration rate for the arrive behavior (higher values will make the entity decelerate faster (less overshoot))
 	float arrive_deceleration = 40.0f;
-	//! The path to follow
+	//! The path to follow (for the path following behavior)
 	std::vector<vec2> path;
-	//! The distance from the path node at which the entity will move to the next node
+	//! The distance from the path node at which the entity will move to the next node (automatically set by make_circle_path())
 	float path_node_distance = 400.0f;
 	//! Looping behavior for the path
 	bool path_loop = true;
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 72f3d9b..8be5ddc 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -20,13 +20,21 @@ void AISystem::update() {
 	//TODO: Use fixed loop dt (this is not available at master at the moment)
 	double dt = LoopTimer::get_instance().get_delta_time();
 
+	// Loop through all AI components
 	for (AI & ai : ai_components) {
+		if (!ai.active) {
+			continue;
+		}
+
 		RefVector<Rigidbody> rigidbodies
 			= mgr.get_components_by_id<Rigidbody>(ai.game_object_id);
 		Rigidbody & rigidbody = rigidbodies.front().get();
 
+		// Calculate the force to apply to the entity
 		vec2 force = this->calculate(ai);
+		// Calculate the acceleration (using the above calculated force)
 		vec2 acceleration = force / rigidbody.data.mass;
+		// Finally, update Rigidbody's velocity
 		rigidbody.data.linear_velocity += acceleration * dt;
 	}
 }
@@ -34,6 +42,7 @@ void AISystem::update() {
 vec2 AISystem::calculate(AI & ai) {
 	vec2 force;
 
+	// Run all the behaviors that are on, and stop if the force gets too high
 	if (ai.on(AI::BehaviorType::FLEE)) {
 		vec2 force_to_add = this->flee(ai);
 
@@ -71,13 +80,16 @@ bool AISystem::accumulate_force(AI & ai, vec2 & running_total, vec2 force_to_add
 	float magnitude_remaining = ai.max_force - magnitude;
 
 	if (magnitude_remaining <= 0.0f) {
+		// If the force is already at/above the max force, return false
 		return false;
 	}
 
 	float magnitude_to_add = force_to_add.length();
 	if (magnitude_to_add < magnitude_remaining) {
+		// If the force to add is less than the remaining force, add it
 		running_total += force_to_add;
 	} else {
+		// If the force to add is greater than the remaining force, add a fraction of it
 		force_to_add.normalize();
 		running_total += force_to_add * magnitude_remaining;
 	}
@@ -93,6 +105,7 @@ vec2 AISystem::seek(const AI & ai) {
 	RefVector<Rigidbody> rigidbodies = mgr.get_components_by_id<Rigidbody>(ai.game_object_id);
 	Rigidbody & rigidbody = rigidbodies.front().get();
 
+	// Calculate the desired velocity
 	vec2 desired_velocity = ai.seek_target - transform.position;
 	desired_velocity.normalize();
 	desired_velocity *= rigidbody.data.max_linear_velocity;
@@ -108,11 +121,11 @@ vec2 AISystem::flee(const AI & ai) {
 	RefVector<Rigidbody> rigidbodies = mgr.get_components_by_id<Rigidbody>(ai.game_object_id);
 	Rigidbody & rigidbody = rigidbodies.front().get();
 
+	// Calculate the desired velocity if the entity is within the panic distance
 	vec2 desired_velocity = transform.position - ai.flee_target;
 	if (desired_velocity.length_squared() > ai.square_flee_panic_distance) {
 		return vec2{0, 0};
 	}
-
 	desired_velocity.normalize();
 	desired_velocity *= rigidbody.data.max_linear_velocity;
 
@@ -127,6 +140,7 @@ vec2 AISystem::arrive(const AI & ai) {
 	RefVector<Rigidbody> rigidbodies = mgr.get_components_by_id<Rigidbody>(ai.game_object_id);
 	Rigidbody & rigidbody = rigidbodies.front().get();
 
+	// Calculate the desired velocity (taking into account the deceleration rate)
 	vec2 to_target = ai.seek_target - transform.position;
 	float distance = to_target.length();
 	if (distance > 0.0f) {
@@ -152,21 +166,28 @@ vec2 AISystem::path_follow(AI & ai) {
 		return vec2{0, 0};
 	}
 
+	// Get the target node
 	vec2 target = ai.path.at(ai.path_index);
+	// Calculate the force to apply to the entity
 	vec2 to_target = target - transform.position;
 	if (to_target.length_squared() > ai.path_node_distance * ai.path_node_distance) {
+		// If the entity is not close enough to the target node, seek it
 		ai.seek_target = target;
 	} else {
+		// If the entity is close enough to the target node, move to the next node
 		ai.path_index++;
 		if (ai.path_index >= ai.path.size()) {
 			if (ai.path_loop) {
+				// If the path is looping, reset the path index
 				ai.path_index = 0;
 			} else {
+				// If the path is not looping, arrive at the last node
 				ai.path_index = ai.path.size() - 1;
 				return this->arrive(ai);
 			}
 		}
 	}
 
+	// Seek the target node
 	return this->seek(ai);
 }
-- 
cgit v1.2.3


From e5e2eefc7f0f6199fe2b36688b2ad64a97784717 Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Mon, 9 Dec 2024 14:15:24 +0100
Subject: Deleted header

---
 src/crepe/system/AISystem.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 8be5ddc..62fa553 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -8,7 +8,6 @@
 #include "manager/Mediator.h"
 
 #include "AISystem.h"
-#include "types.h"
 
 using namespace crepe;
 
-- 
cgit v1.2.3


From a597b0059f30e9d56331c6ece34fdcabb4028616 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Mon, 9 Dec 2024 20:15:41 +0100
Subject: making rendering fonts and UI

---
 src/crepe/facade/SDLContext.cpp    | 43 +++++++++++++++++++++++++++++---------
 src/crepe/facade/SDLContext.h      | 10 ++++++++-
 src/crepe/system/RenderSystem.cpp  |  4 ++--
 src/crepe/system/RenderSystem.h    |  2 +-
 src/example/rendering_particle.cpp | 18 ++++++++++++++--
 5 files changed, 61 insertions(+), 16 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 6becf60..297763d 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -1,4 +1,6 @@
 #include <SDL2/SDL.h>
+#include <SDL2/SDL_pixels.h>
+#include <SDL2/SDL_ttf.h>
 #include <SDL2/SDL_blendmode.h>
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_keycode.h>
@@ -62,6 +64,10 @@ SDLContext::SDLContext() {
 	if (!(IMG_Init(img_flags) & img_flags)) {
 		throw runtime_error("SDLContext: SDL_image could not initialize!");
 	}
+
+	if (TTF_Init() != 0) {
+		throw runtime_error("SDLContext: TTF could not initialize!");
+	}
 }
 
 SDLContext::~SDLContext() {
@@ -73,6 +79,7 @@ SDLContext::~SDLContext() {
 	// TODO: how are we going to ensure that these are called from the same
 	// thread that SDL_Init() was called on? This has caused problems for me
 	// before.
+	TTF_Quit();
 	IMG_Quit();
 	SDL_Quit();
 }
@@ -281,10 +288,9 @@ void SDLContext::draw(const RenderContext & ctx) {
 					  &dstrect, angle, NULL, render_flip);
 }
 
-SDLContext::CameraValues SDLContext::set_camera(const Camera & cam) {
+SDLContext::CameraValues & SDLContext::set_camera(const Camera & cam) {
 
 	const Camera::Data & cam_data = cam.data;
-	CameraValues ret_cam;
 	// resize window
 	int w, h;
 	SDL_GetWindowSize(this->game_window.get(), &w, &h);
@@ -292,9 +298,9 @@ SDLContext::CameraValues SDLContext::set_camera(const Camera & cam) {
 		SDL_SetWindowSize(this->game_window.get(), cam.screen.x, cam.screen.y);
 	}
 
-	vec2 & zoomed_viewport = ret_cam.zoomed_viewport;
-	vec2 & bar_size = ret_cam.bar_size;
-	vec2 & render_scale = ret_cam.render_scale;
+	vec2 & zoomed_viewport = this->camera_val.zoomed_viewport;
+	vec2 & bar_size = this->camera_val.bar_size;
+	vec2 & render_scale = this->camera_val.render_scale;
 
 	zoomed_viewport = cam.viewport_size * cam_data.zoom;
 	float screen_aspect = static_cast<float>(cam.screen.x) / cam.screen.y;
@@ -337,7 +343,7 @@ SDLContext::CameraValues SDLContext::set_camera(const Camera & cam) {
 	// fill bg color
 	SDL_RenderFillRect(this->game_renderer.get(), &bg);
 
-	return ret_cam;
+	return this->camera_val;
 }
 
 uint64_t SDLContext::get_ticks() const { return SDL_GetTicks64(); }
@@ -366,6 +372,19 @@ SDLContext::texture_from_path(const std::string & path) {
 	return img_texture;
 }
 
+std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>>
+SDLContext::font_from_path(const std::string & path) {
+
+	TTF_Font * lib_font = TTF_OpenFont(path.c_str(), 72);
+	if (!lib_font) {
+		throw runtime_error(format("SDLContext: font cannot be load from {}", path));
+	}
+	std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>> font;
+	font = {lib_font, [](TTF_Font * f){}};
+
+	return font;
+}
+
 ivec2 SDLContext::get_size(const Texture & ctx) {
 	ivec2 size;
 	SDL_QueryTexture(ctx.texture.get(), NULL, NULL, &size.x, &size.y);
@@ -377,7 +396,11 @@ void SDLContext::delay(int ms) const { SDL_Delay(ms); }
 std::vector<SDLContext::EventData> SDLContext::get_events() {
 	std::vector<SDLContext::EventData> event_list;
 	SDL_Event event;
+	const CameraValues & cam = this->camera_val;
 	while (SDL_PollEvent(&event)) {
+		ivec2 mouse_pos;
+		mouse_pos.x = (event.button.x - cam.bar_size.x) / cam.render_scale.x;
+		mouse_pos.y = (event.button.y - cam.bar_size.y) / cam.render_scale.y;
 		switch (event.type) {
 			case SDL_QUIT:
 				event_list.push_back(EventData{
@@ -401,7 +424,7 @@ std::vector<SDLContext::EventData> SDLContext::get_events() {
 				event_list.push_back(EventData{
 					.event_type = SDLContext::EventType::MOUSEDOWN,
 					.mouse_button = sdl_to_mousebutton(event.button.button),
-					.mouse_position = {event.button.x, event.button.y},
+					.mouse_position = mouse_pos,
 				});
 				break;
 			case SDL_MOUSEBUTTONUP: {
@@ -410,21 +433,21 @@ std::vector<SDLContext::EventData> SDLContext::get_events() {
 				event_list.push_back(EventData{
 					.event_type = SDLContext::EventType::MOUSEUP,
 					.mouse_button = sdl_to_mousebutton(event.button.button),
-					.mouse_position = {event.button.x, event.button.y},
+					.mouse_position = mouse_pos,
 				});
 			} break;
 
 			case SDL_MOUSEMOTION: {
 				event_list.push_back(
 					EventData{.event_type = SDLContext::EventType::MOUSEMOVE,
-							  .mouse_position = {event.motion.x, event.motion.y},
+							  .mouse_position = mouse_pos,
 							  .rel_mouse_move = {event.motion.xrel, event.motion.yrel}});
 			} break;
 
 			case SDL_MOUSEWHEEL: {
 				event_list.push_back(EventData{
 					.event_type = SDLContext::EventType::MOUSEWHEEL,
-					.mouse_position = {event.motion.x, event.motion.y},
+					.mouse_position = mouse_pos,
 					// TODO: why is this needed?
 					.scroll_direction = event.wheel.y < 0 ? -1 : 1,
 					.scroll_delta = event.wheel.preciseY,
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index e232511..b847c72 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -4,6 +4,7 @@
 #include <SDL2/SDL_keycode.h>
 #include <SDL2/SDL_rect.h>
 #include <SDL2/SDL_render.h>
+#include <SDL2/SDL_ttf.h>
 #include <SDL2/SDL_video.h>
 #include <cmath>
 #include <functional>
@@ -188,6 +189,9 @@ private:
 	 */
 	ivec2 get_size(const Texture & ctx);
 
+	std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>>
+	font_from_path(const std::string & path);
+
 private:
 	//! Will use draw,clear_screen, present_screen, camera.
 	friend class RenderSystem;
@@ -198,6 +202,8 @@ private:
 	 */
 	void draw(const RenderContext & ctx);
 
+	void draw_text(const 
+
 	//! Clears the screen, preparing for a new frame.
 	void clear_screen();
 
@@ -208,7 +214,7 @@ private:
 	 * \brief sets the background of the camera (will be adjusted in future PR)
 	 * \param camera Reference to the Camera object.
 	 */
-	CameraValues set_camera(const Camera & camera);
+	CameraValues & set_camera(const Camera & camera);
 
 private:
 	//! the data needed to construct a sdl dst rectangle
@@ -254,6 +260,8 @@ private:
 
 	//! black bars rectangle to draw
 	SDL_FRect black_bars[2] = {};
+
+	CameraValues camera_val;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 26f2c85..74fed26 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -27,7 +27,7 @@ void RenderSystem::present_screen() {
 	ctx.present_screen();
 }
 
-SDLContext::CameraValues RenderSystem::update_camera() {
+SDLContext::CameraValues & RenderSystem::update_camera() {
 	ComponentManager & mgr = this->mediator.component_manager;
 	SDLContext & ctx = this->mediator.sdl_context;
 	RefVector<Camera> cameras = mgr.get_components_by_type<Camera>();
@@ -38,7 +38,7 @@ SDLContext::CameraValues RenderSystem::update_camera() {
 		if (!cam.active) continue;
 		const Transform & transform
 			= mgr.get_components_by_id<Transform>(cam.game_object_id).front().get();
-		SDLContext::CameraValues cam_val = ctx.set_camera(cam);
+		SDLContext::CameraValues & cam_val = ctx.set_camera(cam);
 		cam_val.cam_pos = transform.position + cam.data.postion_offset;
 		return cam_val;
 	}
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index e270a6b..de26aa8 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -37,7 +37,7 @@ private:
 	void present_screen();
 
 	//! Updates the active camera used for rendering.
-	SDLContext::CameraValues update_camera();
+	SDLContext::CameraValues & update_camera();
 
 	//! Renders the whole screen
 	void render();
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 29d475d..b57ba04 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -1,3 +1,4 @@
+#include "api/Button.h"
 #include <crepe/Component.h>
 #include <crepe/api/Animator.h>
 #include <crepe/api/Camera.h>
@@ -12,6 +13,8 @@
 #include <crepe/manager/ComponentManager.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/types.h>
+#include <functional>
+#include <iostream>
 
 using namespace crepe;
 using namespace std;
@@ -57,7 +60,7 @@ public:
 					 .order_in_layer = 2,
 					 .size = {0, 100},
 					 .angle_offset = 0,
-					 .position_offset = {100, 0},
+					 .position_offset = {0, 0},
 				 });
 
 		auto & anim = game_object.add_component<Animator>(test_sprite, 4, 4,
@@ -66,12 +69,23 @@ public:
 															  .looping = false,
 														  });
 		anim.set_anim(2);
-		anim.active = false;
+		anim.pause();
 
 		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{400, 400},
 													   Camera::Data{
 														   .bg_color = Color::WHITE,
 													   });
+
+		function<void()> on_click = [&](){ cout << "button clicked" << std::endl; };
+		function<void()> on_enter = [&](){ cout << "enter" << std::endl; };
+		function<void()> on_exit = [&](){ cout << "exit" << std::endl; };
+
+		auto & button = game_object.add_component<Button>(vec2{200,200}, vec2{0,0}, on_click, false);
+		button.on_mouse_enter = on_enter;
+		button.on_mouse_exit = on_exit;
+		button.is_toggle = true;
+		button.active = true;
+
 	}
 
 	string get_name() const { return "TestScene"; };
-- 
cgit v1.2.3


From c8d05f759bb1be0ec99e8f23eaa65c80c36ce03d Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Tue, 10 Dec 2024 08:48:06 +0100
Subject: Implemented feedback

---
 src/crepe/api/AI.cpp          | 15 ++++++++++++--
 src/crepe/api/AI.h            |  6 +++---
 src/crepe/system/AISystem.cpp | 46 ++++++++++++++++++++++---------------------
 src/crepe/system/AISystem.h   | 18 +++++++++++------
 4 files changed, 52 insertions(+), 33 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/AI.cpp b/src/crepe/api/AI.cpp
index 00e5b37..472550b 100644
--- a/src/crepe/api/AI.cpp
+++ b/src/crepe/api/AI.cpp
@@ -1,10 +1,17 @@
+#include <stdexcept>
+
 #include "AI.h"
 
 namespace crepe {
 
 AI::AI(game_object_id_t id, float max_force) : Component(id), max_force(max_force) {}
 
-void AI::make_circle_path(float radius, vec2 center, float start_angle, bool clockwise) {
+void AI::make_circle_path(float radius, const vec2 & center, float start_angle,
+						  bool clockwise) {
+	if (radius <= 0) {
+		throw std::runtime_error("Radius must be greater than 0");
+	}
+
 	// The step size is determined by the radius (step size is in radians)
 	float step = 400.0f / radius;
 	// Force at least 16 steps (in case of a small radius)
@@ -27,8 +34,12 @@ void AI::make_circle_path(float radius, vec2 center, float start_angle, bool clo
 	}
 }
 
-void AI::make_oval_path(float radius_x, float radius_y, vec2 center, float start_angle,
+void AI::make_oval_path(float radius_x, float radius_y, const vec2 & center, float start_angle,
 						bool clockwise, float rotation) {
+	if (radius_x <= 0 && radius_y <= 0) {
+		throw std::runtime_error("Radius must be greater than 0");
+	}
+
 	float max_radius = std::max(radius_x, radius_y);
 	// The step size is determined by the radius (step size is in radians)
 	float step = 400.0f / max_radius;
diff --git a/src/crepe/api/AI.h b/src/crepe/api/AI.h
index c95924d..de574cd 100644
--- a/src/crepe/api/AI.h
+++ b/src/crepe/api/AI.h
@@ -68,7 +68,7 @@ public:
 	 *
 	 * \param node The path node to add
 	 */
-	void add_path_node(vec2 node) { path.push_back(node); }
+	void add_path_node(const vec2 & node) { path.push_back(node); }
 	/**
 	 * \brief Make a circle path (for the path following behavior)
 	 *
@@ -79,7 +79,7 @@ public:
 	 * \param start_angle The start angle of the circle (in radians)
 	 * \param clockwise The direction of the circle
 	 */
-	void make_circle_path(float radius, vec2 center = {0, 0}, float start_angle = 0,
+	void make_circle_path(float radius, const vec2 & center = {0, 0}, float start_angle = 0,
 						  bool clockwise = true);
 	/**
 	 * \brief Make an oval path (for the path following behavior)
@@ -93,7 +93,7 @@ public:
 	 * \param clockwise The direction of the oval
 	 * \param rotation The rotation of the oval (in radians)
 	 */
-	void make_oval_path(float radius_x, float radius_y, vec2 center = {0, 0},
+	void make_oval_path(float radius_x, float radius_y, const vec2 & center = {0, 0},
 						float start_angle = 0, bool clockwise = true, float rotation = 0);
 
 public:
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 62fa553..4d5039b 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -2,7 +2,6 @@
 #include <cmath>
 
 #include "api/LoopTimer.h"
-#include "api/Rigidbody.h"
 #include "api/Transform.h"
 #include "manager/ComponentManager.h"
 #include "manager/Mediator.h"
@@ -27,10 +26,17 @@ void AISystem::update() {
 
 		RefVector<Rigidbody> rigidbodies
 			= mgr.get_components_by_id<Rigidbody>(ai.game_object_id);
+		if (rigidbodies.empty()) {
+			throw std::runtime_error(
+				"AI component must be attached to a GameObject with a Rigidbody component");
+		}
 		Rigidbody & rigidbody = rigidbodies.front().get();
+		if (rigidbody.data.mass <= 0) {
+			throw std::runtime_error("Mass must be greater than 0");
+		}
 
 		// Calculate the force to apply to the entity
-		vec2 force = this->calculate(ai);
+		vec2 force = this->calculate(ai, rigidbody);
 		// Calculate the acceleration (using the above calculated force)
 		vec2 acceleration = force / rigidbody.data.mass;
 		// Finally, update Rigidbody's velocity
@@ -38,33 +44,33 @@ void AISystem::update() {
 	}
 }
 
-vec2 AISystem::calculate(AI & ai) {
+vec2 AISystem::calculate(AI & ai, const Rigidbody & rigidbody) {
 	vec2 force;
 
 	// Run all the behaviors that are on, and stop if the force gets too high
 	if (ai.on(AI::BehaviorType::FLEE)) {
-		vec2 force_to_add = this->flee(ai);
+		vec2 force_to_add = this->flee(ai, rigidbody);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
 		}
 	}
 	if (ai.on(AI::BehaviorType::ARRIVE)) {
-		vec2 force_to_add = this->arrive(ai);
+		vec2 force_to_add = this->arrive(ai, rigidbody);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
 		}
 	}
 	if (ai.on(AI::BehaviorType::SEEK)) {
-		vec2 force_to_add = this->seek(ai);
+		vec2 force_to_add = this->seek(ai, rigidbody);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
 		}
 	}
 	if (ai.on(AI::BehaviorType::PATH_FOLLOW)) {
-		vec2 force_to_add = this->path_follow(ai);
+		vec2 force_to_add = this->path_follow(ai, rigidbody);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
@@ -74,7 +80,7 @@ vec2 AISystem::calculate(AI & ai) {
 	return force;
 }
 
-bool AISystem::accumulate_force(AI & ai, vec2 & running_total, vec2 force_to_add) {
+bool AISystem::accumulate_force(const AI & ai, vec2 & running_total, vec2 force_to_add) {
 	float magnitude = running_total.length();
 	float magnitude_remaining = ai.max_force - magnitude;
 
@@ -96,13 +102,11 @@ bool AISystem::accumulate_force(AI & ai, vec2 & running_total, vec2 force_to_add
 	return true;
 }
 
-vec2 AISystem::seek(const AI & ai) {
+vec2 AISystem::seek(const AI & ai, const Rigidbody & rigidbody) const {
 	const Mediator & mediator = this->mediator;
 	ComponentManager & mgr = mediator.component_manager;
 	RefVector<Transform> transforms = mgr.get_components_by_id<Transform>(ai.game_object_id);
 	Transform & transform = transforms.front().get();
-	RefVector<Rigidbody> rigidbodies = mgr.get_components_by_id<Rigidbody>(ai.game_object_id);
-	Rigidbody & rigidbody = rigidbodies.front().get();
 
 	// Calculate the desired velocity
 	vec2 desired_velocity = ai.seek_target - transform.position;
@@ -112,13 +116,11 @@ vec2 AISystem::seek(const AI & ai) {
 	return desired_velocity - rigidbody.data.linear_velocity;
 }
 
-vec2 AISystem::flee(const AI & ai) {
+vec2 AISystem::flee(const AI & ai, const Rigidbody & rigidbody) const {
 	const Mediator & mediator = this->mediator;
 	ComponentManager & mgr = mediator.component_manager;
 	RefVector<Transform> transforms = mgr.get_components_by_id<Transform>(ai.game_object_id);
 	Transform & transform = transforms.front().get();
-	RefVector<Rigidbody> rigidbodies = mgr.get_components_by_id<Rigidbody>(ai.game_object_id);
-	Rigidbody & rigidbody = rigidbodies.front().get();
 
 	// Calculate the desired velocity if the entity is within the panic distance
 	vec2 desired_velocity = transform.position - ai.flee_target;
@@ -131,18 +133,20 @@ vec2 AISystem::flee(const AI & ai) {
 	return desired_velocity - rigidbody.data.linear_velocity;
 }
 
-vec2 AISystem::arrive(const AI & ai) {
+vec2 AISystem::arrive(const AI & ai, const Rigidbody & rigidbody) const {
 	const Mediator & mediator = this->mediator;
 	ComponentManager & mgr = mediator.component_manager;
 	RefVector<Transform> transforms = mgr.get_components_by_id<Transform>(ai.game_object_id);
 	Transform & transform = transforms.front().get();
-	RefVector<Rigidbody> rigidbodies = mgr.get_components_by_id<Rigidbody>(ai.game_object_id);
-	Rigidbody & rigidbody = rigidbodies.front().get();
 
 	// Calculate the desired velocity (taking into account the deceleration rate)
 	vec2 to_target = ai.seek_target - transform.position;
 	float distance = to_target.length();
 	if (distance > 0.0f) {
+		if (ai.arrive_deceleration <= 0.0f) {
+			throw std::runtime_error("Deceleration rate must be greater than 0");
+		}
+
 		float speed = distance / ai.arrive_deceleration;
 		speed = std::min(speed, rigidbody.data.max_linear_velocity.length());
 		vec2 desired_velocity = to_target * (speed / distance);
@@ -153,13 +157,11 @@ vec2 AISystem::arrive(const AI & ai) {
 	return vec2{0, 0};
 }
 
-vec2 AISystem::path_follow(AI & ai) {
+vec2 AISystem::path_follow(AI & ai, const Rigidbody & rigidbody) {
 	const Mediator & mediator = this->mediator;
 	ComponentManager & mgr = mediator.component_manager;
 	RefVector<Transform> transforms = mgr.get_components_by_id<Transform>(ai.game_object_id);
 	Transform & transform = transforms.front().get();
-	RefVector<Rigidbody> rigidbodies = mgr.get_components_by_id<Rigidbody>(ai.game_object_id);
-	Rigidbody & rigidbody = rigidbodies.front().get();
 
 	if (ai.path.empty()) {
 		return vec2{0, 0};
@@ -182,11 +184,11 @@ vec2 AISystem::path_follow(AI & ai) {
 			} else {
 				// If the path is not looping, arrive at the last node
 				ai.path_index = ai.path.size() - 1;
-				return this->arrive(ai);
+				return this->arrive(ai, rigidbody);
 			}
 		}
 	}
 
 	// Seek the target node
-	return this->seek(ai);
+	return this->seek(ai, rigidbody);
 }
diff --git a/src/crepe/system/AISystem.h b/src/crepe/system/AISystem.h
index 670d20d..160df01 100644
--- a/src/crepe/system/AISystem.h
+++ b/src/crepe/system/AISystem.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "api/AI.h"
+#include "api/Rigidbody.h"
 
 #include "System.h"
 #include "types.h"
@@ -25,8 +26,9 @@ private:
 	 * \brief Calculate the total force to apply to the entity
 	 *
 	 * \param ai The AI component
+	 * \param rigidbody The Rigidbody component
 	 */
-	vec2 calculate(AI & ai);
+	vec2 calculate(AI & ai, const Rigidbody & rigidbody);
 	/**
 	 * \brief Accumulate the force to apply to the entity
 	 *
@@ -35,36 +37,40 @@ private:
 	 * \param force_to_add The force to add
 	 * \return true if the force was added, false otherwise
 	 */
-	bool accumulate_force(AI & ai, vec2 & running_total, vec2 force_to_add);
+	bool accumulate_force(const AI & ai, vec2 & running_total, vec2 force_to_add);
 
 	/**
 	 * \brief Calculate the seek force
 	 *
 	 * \param ai The AI component
+	 * \param rigidbody The Rigidbody component
 	 * \return The seek force
 	 */
-	vec2 seek(const AI & ai);
+	vec2 seek(const AI & ai, const Rigidbody & rigidbody) const;
 	/**
 	 * \brief Calculate the flee force
 	 *
 	 * \param ai The AI component
+	 * \param rigidbody The Rigidbody component
 	 * \return The flee force
 	 */
-	vec2 flee(const AI & ai);
+	vec2 flee(const AI & ai, const Rigidbody & rigidbody) const;
 	/**
 	 * \brief Calculate the arrive force
 	 *
 	 * \param ai The AI component
+	 * \param rigidbody The Rigidbody component
 	 * \return The arrive force
 	 */
-	vec2 arrive(const AI & ai);
+	vec2 arrive(const AI & ai, const Rigidbody & rigidbody) const;
 	/**
 	 * \brief Calculate the path follow force
 	 *
 	 * \param ai The AI component
+	 * \param rigidbody The Rigidbody component
 	 * \return The path follow force
 	 */
-	vec2 path_follow(AI & ai);
+	vec2 path_follow(AI & ai, const Rigidbody & rigidbody);
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From 4e7ddc9d8eb396f7160e09da8c9b3d797274600a Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Tue, 10 Dec 2024 08:53:03 +0100
Subject: Replaced copy by reference

---
 src/crepe/system/AISystem.cpp | 2 +-
 src/crepe/system/AISystem.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 4d5039b..b42cb11 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -80,7 +80,7 @@ vec2 AISystem::calculate(AI & ai, const Rigidbody & rigidbody) {
 	return force;
 }
 
-bool AISystem::accumulate_force(const AI & ai, vec2 & running_total, vec2 force_to_add) {
+bool AISystem::accumulate_force(const AI & ai, vec2 & running_total, vec2 & force_to_add) {
 	float magnitude = running_total.length();
 	float magnitude_remaining = ai.max_force - magnitude;
 
diff --git a/src/crepe/system/AISystem.h b/src/crepe/system/AISystem.h
index 160df01..9a937d2 100644
--- a/src/crepe/system/AISystem.h
+++ b/src/crepe/system/AISystem.h
@@ -37,7 +37,7 @@ private:
 	 * \param force_to_add The force to add
 	 * \return true if the force was added, false otherwise
 	 */
-	bool accumulate_force(const AI & ai, vec2 & running_total, vec2 force_to_add);
+	bool accumulate_force(const AI & ai, vec2 & running_total, vec2 & force_to_add);
 
 	/**
 	 * \brief Calculate the seek force
-- 
cgit v1.2.3


From 6fc38e15e4b88d480d5fcb69eec36f7d8685e853 Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Tue, 10 Dec 2024 09:21:58 +0100
Subject: Passing transform by reference

---
 src/crepe/system/AISystem.cpp | 49 ++++++++++++++++---------------------------
 src/crepe/system/AISystem.h   | 13 ++++++++----
 2 files changed, 27 insertions(+), 35 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index b42cb11..d1ebeb5 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -2,7 +2,6 @@
 #include <cmath>
 
 #include "api/LoopTimer.h"
-#include "api/Transform.h"
 #include "manager/ComponentManager.h"
 #include "manager/Mediator.h"
 
@@ -45,32 +44,37 @@ void AISystem::update() {
 }
 
 vec2 AISystem::calculate(AI & ai, const Rigidbody & rigidbody) {
+	const Mediator & mediator = this->mediator;
+	ComponentManager & mgr = mediator.component_manager;
+	RefVector<Transform> transforms = mgr.get_components_by_id<Transform>(ai.game_object_id);
+	Transform & transform = transforms.front().get();
+
 	vec2 force;
 
 	// Run all the behaviors that are on, and stop if the force gets too high
 	if (ai.on(AI::BehaviorType::FLEE)) {
-		vec2 force_to_add = this->flee(ai, rigidbody);
+		vec2 force_to_add = this->flee(ai, rigidbody, transform);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
 		}
 	}
 	if (ai.on(AI::BehaviorType::ARRIVE)) {
-		vec2 force_to_add = this->arrive(ai, rigidbody);
+		vec2 force_to_add = this->arrive(ai, rigidbody, transform);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
 		}
 	}
 	if (ai.on(AI::BehaviorType::SEEK)) {
-		vec2 force_to_add = this->seek(ai, rigidbody);
+		vec2 force_to_add = this->seek(ai, rigidbody, transform);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
 		}
 	}
 	if (ai.on(AI::BehaviorType::PATH_FOLLOW)) {
-		vec2 force_to_add = this->path_follow(ai, rigidbody);
+		vec2 force_to_add = this->path_follow(ai, rigidbody, transform);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
@@ -102,12 +106,8 @@ bool AISystem::accumulate_force(const AI & ai, vec2 & running_total, vec2 & forc
 	return true;
 }
 
-vec2 AISystem::seek(const AI & ai, const Rigidbody & rigidbody) const {
-	const Mediator & mediator = this->mediator;
-	ComponentManager & mgr = mediator.component_manager;
-	RefVector<Transform> transforms = mgr.get_components_by_id<Transform>(ai.game_object_id);
-	Transform & transform = transforms.front().get();
-
+vec2 AISystem::seek(const AI & ai, const Rigidbody & rigidbody,
+					const Transform & transform) const {
 	// Calculate the desired velocity
 	vec2 desired_velocity = ai.seek_target - transform.position;
 	desired_velocity.normalize();
@@ -116,12 +116,8 @@ vec2 AISystem::seek(const AI & ai, const Rigidbody & rigidbody) const {
 	return desired_velocity - rigidbody.data.linear_velocity;
 }
 
-vec2 AISystem::flee(const AI & ai, const Rigidbody & rigidbody) const {
-	const Mediator & mediator = this->mediator;
-	ComponentManager & mgr = mediator.component_manager;
-	RefVector<Transform> transforms = mgr.get_components_by_id<Transform>(ai.game_object_id);
-	Transform & transform = transforms.front().get();
-
+vec2 AISystem::flee(const AI & ai, const Rigidbody & rigidbody,
+					const Transform & transform) const {
 	// Calculate the desired velocity if the entity is within the panic distance
 	vec2 desired_velocity = transform.position - ai.flee_target;
 	if (desired_velocity.length_squared() > ai.square_flee_panic_distance) {
@@ -133,12 +129,8 @@ vec2 AISystem::flee(const AI & ai, const Rigidbody & rigidbody) const {
 	return desired_velocity - rigidbody.data.linear_velocity;
 }
 
-vec2 AISystem::arrive(const AI & ai, const Rigidbody & rigidbody) const {
-	const Mediator & mediator = this->mediator;
-	ComponentManager & mgr = mediator.component_manager;
-	RefVector<Transform> transforms = mgr.get_components_by_id<Transform>(ai.game_object_id);
-	Transform & transform = transforms.front().get();
-
+vec2 AISystem::arrive(const AI & ai, const Rigidbody & rigidbody,
+					  const Transform & transform) const {
 	// Calculate the desired velocity (taking into account the deceleration rate)
 	vec2 to_target = ai.seek_target - transform.position;
 	float distance = to_target.length();
@@ -157,12 +149,7 @@ vec2 AISystem::arrive(const AI & ai, const Rigidbody & rigidbody) const {
 	return vec2{0, 0};
 }
 
-vec2 AISystem::path_follow(AI & ai, const Rigidbody & rigidbody) {
-	const Mediator & mediator = this->mediator;
-	ComponentManager & mgr = mediator.component_manager;
-	RefVector<Transform> transforms = mgr.get_components_by_id<Transform>(ai.game_object_id);
-	Transform & transform = transforms.front().get();
-
+vec2 AISystem::path_follow(AI & ai, const Rigidbody & rigidbody, const Transform & transform) {
 	if (ai.path.empty()) {
 		return vec2{0, 0};
 	}
@@ -184,11 +171,11 @@ vec2 AISystem::path_follow(AI & ai, const Rigidbody & rigidbody) {
 			} else {
 				// If the path is not looping, arrive at the last node
 				ai.path_index = ai.path.size() - 1;
-				return this->arrive(ai, rigidbody);
+				return this->arrive(ai, rigidbody, transform);
 			}
 		}
 	}
 
 	// Seek the target node
-	return this->seek(ai, rigidbody);
+	return this->seek(ai, rigidbody, transform);
 }
diff --git a/src/crepe/system/AISystem.h b/src/crepe/system/AISystem.h
index 9a937d2..d5f8a8e 100644
--- a/src/crepe/system/AISystem.h
+++ b/src/crepe/system/AISystem.h
@@ -4,6 +4,7 @@
 #include "api/Rigidbody.h"
 
 #include "System.h"
+#include "api/Transform.h"
 #include "types.h"
 
 namespace crepe {
@@ -44,33 +45,37 @@ private:
 	 *
 	 * \param ai The AI component
 	 * \param rigidbody The Rigidbody component
+	 * \param transform The Transform component
 	 * \return The seek force
 	 */
-	vec2 seek(const AI & ai, const Rigidbody & rigidbody) const;
+	vec2 seek(const AI & ai, const Rigidbody & rigidbody, const Transform & transform) const;
 	/**
 	 * \brief Calculate the flee force
 	 *
 	 * \param ai The AI component
 	 * \param rigidbody The Rigidbody component
+	 * \param transform The Transform component
 	 * \return The flee force
 	 */
-	vec2 flee(const AI & ai, const Rigidbody & rigidbody) const;
+	vec2 flee(const AI & ai, const Rigidbody & rigidbody, const Transform & transform) const;
 	/**
 	 * \brief Calculate the arrive force
 	 *
 	 * \param ai The AI component
 	 * \param rigidbody The Rigidbody component
+	 * \param transform The Transform component
 	 * \return The arrive force
 	 */
-	vec2 arrive(const AI & ai, const Rigidbody & rigidbody) const;
+	vec2 arrive(const AI & ai, const Rigidbody & rigidbody, const Transform & transform) const;
 	/**
 	 * \brief Calculate the path follow force
 	 *
 	 * \param ai The AI component
 	 * \param rigidbody The Rigidbody component
+	 * \param transform The Transform component
 	 * \return The path follow force
 	 */
-	vec2 path_follow(AI & ai, const Rigidbody & rigidbody);
+	vec2 path_follow(AI & ai, const Rigidbody & rigidbody, const Transform & transform);
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From 7b8de90699aea153e73b5f2cee05c69b966b81be Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Tue, 10 Dec 2024 16:21:05 +0100
Subject: implemented feedback wouter, improved animator. however if
 spritesheet aspect_ratio is not the same as the single frame then the scaling
 is wrong

---
 src/crepe/api/Animator.cpp          | 18 +++++-----
 src/crepe/api/Animator.h            | 12 +++----
 src/crepe/api/CMakeLists.txt        |  2 --
 src/crepe/api/LoopManager.cpp       |  1 -
 src/crepe/api/Texture.cpp           | 35 ------------------
 src/crepe/api/Texture.h             | 71 ------------------------------------
 src/crepe/facade/CMakeLists.txt     |  2 ++
 src/crepe/facade/SDLContext.cpp     |  4 +--
 src/crepe/facade/Texture.cpp        | 34 ++++++++++++++++++
 src/crepe/facade/Texture.h          | 72 +++++++++++++++++++++++++++++++++++++
 src/crepe/system/AnimatorSystem.cpp |  2 +-
 src/crepe/system/RenderSystem.cpp   |  5 +--
 src/example/rendering_particle.cpp  | 16 ++-------
 13 files changed, 130 insertions(+), 144 deletions(-)
 delete mode 100644 src/crepe/api/Texture.cpp
 delete mode 100644 src/crepe/api/Texture.h
 create mode 100644 src/crepe/facade/Texture.cpp
 create mode 100644 src/crepe/facade/Texture.h

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index ad1778d..4c72cc0 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -7,20 +7,18 @@
 
 using namespace crepe;
 
-Animator::Animator(game_object_id_t id, Sprite & spritesheet, unsigned int pixel_frame_x,
-				   unsigned int pixel_frame_y, unsigned int max_row, unsigned int max_col,
-				   const Animator::Data & data)
+Animator::Animator(game_object_id_t id, Sprite & spritesheet, const ivec2 & single_frame_size,
+				   const uvec2 & max_cell_size, const Animator::Data & data)
 	: Component(id),
 	  spritesheet(spritesheet),
-	  max_rows(max_row),
-	  max_columns(max_col),
+	  max_cell_size(max_cell_size),
 	  data(data) {
 	dbg_trace();
 
-	this->spritesheet.mask.h = this->max_columns * pixel_frame_y;
-	this->spritesheet.mask.w /= this->max_rows * pixel_frame_x;
-	this->spritesheet.mask.x = this->data.row * this->spritesheet.mask.w;
-	this->spritesheet.mask.y = this->data.col * this->spritesheet.mask.h;
+	this->spritesheet.mask.w = single_frame_size.x;
+	this->spritesheet.mask.h = single_frame_size.y;
+	this->spritesheet.mask.x = 0;
+	this->spritesheet.mask.y = 0;
 }
 
 Animator::~Animator() { dbg_trace(); }
@@ -51,6 +49,6 @@ void Animator::set_anim(int col) {
 
 void Animator::next_anim() {
 	Animator::Data & ctx = this->data;
-	ctx.row = ctx.row++ % this->max_rows;
+	ctx.row = ctx.row++ % this->max_cell_size.x;
 	this->spritesheet.mask.x = ctx.row * this->spritesheet.mask.w;
 }
diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index 8ceddad..9a26bf0 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -82,16 +82,14 @@ public:
 	 * This constructor sets up the Animator with the given parameters, and initializes the
 	 * animation system.
 	 */
-	Animator(game_object_id_t id, Sprite & spritesheet, unsigned int pixel_frame_x,
-			 unsigned int pixel_frame_y, unsigned int max_row, unsigned int max_col,
-			 const Animator::Data & data);
+	Animator(game_object_id_t id, Sprite & spritesheet, const ivec2 & single_frame_size,
+			 const uvec2 & max_cell_size, const Animator::Data & data);
 	~Animator(); // dbg_trace
 
 public:
-	//! The maximum number of columns in the sprite sheet.
-	const unsigned int max_columns;
-	//! The maximum number of rows in the sprite sheet.
-	const unsigned int max_rows;
+	//! The maximum number of rows and columns size
+	const uvec2 max_cell_size;
+
 	Animator::Data data;
 
 private:
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index a163faf..718e497 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -6,7 +6,6 @@ target_sources(crepe PUBLIC
 	ParticleEmitter.cpp
 	Transform.cpp
 	Color.cpp
-	Texture.cpp
 	Sprite.cpp
 	Config.cpp
 	Metadata.cpp
@@ -38,7 +37,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Vector2.h
 	Vector2.hpp
 	Color.h
-	Texture.h
 	Scene.h
 	Metadata.h
 	Camera.h
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 044f096..88243c4 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -65,7 +65,6 @@ void LoopManager::setup() {
 	this->scene_manager.load_next_scene();
 	timer.start();
 	timer.set_fps(200);
-	this->scene_manager.load_next_scene();
 }
 
 void LoopManager::render() {
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
deleted file mode 100644
index b0863cb..0000000
--- a/src/crepe/api/Texture.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "../util/Log.h"
-#include "manager/Mediator.h"
-#include "facade/SDLContext.h"
-
-#include "Asset.h"
-#include "Resource.h"
-#include "Texture.h"
-#include "types.h"
-
-using namespace crepe;
-using namespace std;
-
-Texture::Texture(const Asset & src, Mediator & mediator) : Resource(src, mediator){
-	dbg_trace();
-	SDLContext & ctx = mediator.sdl_context;
-	this->texture = ctx.texture_from_path(src.get_path());
-	this->size = ctx.get_size(*this);
-	this->aspect_ratio = static_cast<float>(this->size.x) / this->size.y;
-}
-
-Texture::~Texture() {
-	dbg_trace();
-	this->texture.reset();
-}
-
-const ivec2 & Texture::get_size() const noexcept{
-	return this->size;
-}
-const float & Texture::get_ratio() const noexcept{
-	return this->aspect_ratio;
-}
-
-SDL_Texture * Texture::get_img() const noexcept{
-	return this->texture.get();
-}
diff --git a/src/crepe/api/Texture.h b/src/crepe/api/Texture.h
deleted file mode 100644
index c33d9e5..0000000
--- a/src/crepe/api/Texture.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-
-// FIXME: this header can't be included because this is an API header, and SDL2 development
-// headers won't be bundled with crepe. Why is this facade in the API namespace?
-
-#include <SDL2/SDL_render.h>
-#include <memory>
-
-#include "Asset.h"
-#include "Resource.h"
-#include "types.h"
-
-namespace crepe {
-
-class Mediator;
-
-/**
- * \class Texture
- * \brief Manages texture loading and properties.
- *
- * The Texture class is responsible for loading an image from a source and providing access to
- * its dimensions. Textures can be used for rendering.
- */
-class Texture : public Resource {
-
-public:
-	/**
-	 * \brief Constructs a Texture from an Asset resource.
-	 * \param src Asset with texture data to load.
-	 * \param mediator use the SDLContext reference to load the image
-	 */
-	Texture(const Asset & src, Mediator & mediator);
-
-	/**
-	 * \brief Destroys the Texture instance
-	 */
-	~Texture();
-
-	/**
-	 * \brief get width and height of image in pixels
-	 * \return pixel size width and height
-	 *
-	 */
-	const ivec2 & get_size() const noexcept;
-
-	/**
-	 * \brief aspect_ratio of image
-	 * \return ratio
-	 *
-	 */
-	const float & get_ratio() const noexcept;
-
-	/**
-	 * \brief get the image texture
-	 * \return SDL_Texture
-	 *
-	 */
-	SDL_Texture * get_img() const noexcept;
-
-private:
-	//! The texture of the class from the library
-	std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> texture;
-
-	// texture size in pixel
-	ivec2 size;
-
-	//! ratio of image
-	float aspect_ratio;
-};
-
-} // namespace crepe
diff --git a/src/crepe/facade/CMakeLists.txt b/src/crepe/facade/CMakeLists.txt
index 4cc53bc..0598e16 100644
--- a/src/crepe/facade/CMakeLists.txt
+++ b/src/crepe/facade/CMakeLists.txt
@@ -1,5 +1,6 @@
 target_sources(crepe PUBLIC
 	Sound.cpp
+	Texture.cpp
 	SoundContext.cpp
 	SDLContext.cpp
 	DB.cpp
@@ -7,6 +8,7 @@ target_sources(crepe PUBLIC
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Sound.h
+	Texture.h
 	SoundContext.h
 	SDLContext.h
 	DB.h
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index ac21d15..a92ec8b 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -19,12 +19,12 @@
 #include "../api/Color.h"
 #include "../api/Config.h"
 #include "../api/Sprite.h"
-#include "../api/Texture.h"
 #include "../util/Log.h"
 #include "manager/Manager.h"
 #include "manager/Mediator.h"
 
 #include "SDLContext.h"
+#include "Texture.h"
 #include "types.h"
 
 using namespace crepe;
@@ -273,7 +273,7 @@ void SDLContext::draw(const RenderContext & ctx) {
 		.img_scale = ctx.scale,
 	});
 
-	cout << dstrect.w << " " << dstrect.h << " " << dstrect.x << " " << dstrect.y << endl;
+	cout << srcrect->w << " " << srcrect->h << " " << srcrect->x << " " << srcrect->y << endl;
 	double angle = ctx.angle + data.angle_offset;
 
 	this->set_color_texture(ctx.texture, ctx.sprite.data.color);
diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp
new file mode 100644
index 0000000..7224cb8
--- /dev/null
+++ b/src/crepe/facade/Texture.cpp
@@ -0,0 +1,34 @@
+#include "../util/Log.h"
+#include "manager/Mediator.h"
+#include "facade/SDLContext.h"
+
+#include "Resource.h"
+#include "Texture.h"
+#include "types.h"
+
+using namespace crepe;
+using namespace std;
+
+Texture::Texture(const Asset & src, Mediator & mediator) : Resource(src, mediator){
+	dbg_trace();
+	SDLContext & ctx = mediator.sdl_context;
+	this->texture = ctx.texture_from_path(src.get_path());
+	this->size = ctx.get_size(*this);
+	this->aspect_ratio = static_cast<float>(this->size.x) / this->size.y;
+}
+
+Texture::~Texture() {
+	dbg_trace();
+	this->texture.reset();
+}
+
+const ivec2 & Texture::get_size() const noexcept{
+	return this->size;
+}
+const float & Texture::get_ratio() const noexcept{
+	return this->aspect_ratio;
+}
+
+SDL_Texture * Texture::get_img() const noexcept{
+	return this->texture.get();
+}
diff --git a/src/crepe/facade/Texture.h b/src/crepe/facade/Texture.h
new file mode 100644
index 0000000..255e14b
--- /dev/null
+++ b/src/crepe/facade/Texture.h
@@ -0,0 +1,72 @@
+#pragma once
+
+// FIXME: this header can't be included because this is an API header, and SDL2 development
+// headers won't be bundled with crepe. Why is this facade in the API namespace?
+
+#include <SDL2/SDL_render.h>
+#include <memory>
+
+#include "../Resource.h"
+
+#include "types.h"
+
+namespace crepe {
+
+class Mediator;
+class Asset;
+
+/**
+ * \class Texture
+ * \brief Manages texture loading and properties.
+ *
+ * The Texture class is responsible for loading an image from a source and providing access to
+ * its dimensions. Textures can be used for rendering.
+ */
+class Texture : public Resource {
+
+public:
+	/**
+	 * \brief Constructs a Texture from an Asset resource.
+	 * \param src Asset with texture data to load.
+	 * \param mediator use the SDLContext reference to load the image
+	 */
+	Texture(const Asset & src, Mediator & mediator);
+
+	/**
+	 * \brief Destroys the Texture instance
+	 */
+	~Texture();
+
+	/**
+	 * \brief get width and height of image in pixels
+	 * \return pixel size width and height
+	 *
+	 */
+	const ivec2 & get_size() const noexcept;
+
+	/**
+	 * \brief aspect_ratio of image
+	 * \return ratio
+	 *
+	 */
+	const float & get_ratio() const noexcept;
+
+	/**
+	 * \brief get the image texture
+	 * \return SDL_Texture
+	 *
+	 */
+	SDL_Texture * get_img() const noexcept;
+
+private:
+	//! The texture of the class from the library
+	std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> texture;
+
+	// texture size in pixel
+	ivec2 size;
+
+	//! ratio of image
+	float aspect_ratio;
+};
+
+} // namespace crepe
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index 549c35d..bb22b62 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -23,7 +23,7 @@ void AnimatorSystem::update() {
 
 		int last_frame = ctx.row;
 
-		int cycle_end = (ctx.cycle_end == -1) ? a.max_rows : ctx.cycle_end;
+		int cycle_end = (ctx.cycle_end == -1) ? a.max_cell_size.x : ctx.cycle_end;
 		int total_frames = cycle_end - ctx.cycle_start;
 
 		int curr_frame = static_cast<int>(elapsed_time / frame_duration) % total_frames;
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index daf71c5..51340fb 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -10,9 +10,10 @@
 #include "../api/Sprite.h"
 #include "../api/Transform.h"
 #include "../facade/SDLContext.h"
+#include "../facade/Texture.h"
 #include "../manager/ComponentManager.h"
-#include "api/Texture.h"
-#include "manager/ResourceManager.h"
+#include "../manager/ResourceManager.h"
+
 #include "RenderSystem.h"
 
 using namespace crepe;
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index cfc5a84..44bd96a 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -1,5 +1,4 @@
 #include "api/Asset.h"
-#include "manager/ResourceManager.h"
 #include <crepe/Component.h>
 #include <crepe/api/Animator.h>
 #include <crepe/api/Camera.h>
@@ -9,7 +8,6 @@
 #include <crepe/api/ParticleEmitter.h>
 #include <crepe/api/Rigidbody.h>
 #include <crepe/api/Sprite.h>
-#include <crepe/api/Texture.h>
 #include <crepe/api/Transform.h>
 #include <crepe/manager/ComponentManager.h>
 #include <crepe/manager/Mediator.h>
@@ -52,7 +50,7 @@ public:
 
 		Color color(255, 255, 255, 255);
 
-		Asset img{"asset/texture/test_ap43.png"};
+		Asset img{"asset/spritesheet/spritesheet_test.png"};
 
 		Sprite & test_sprite = game_object.add_component<Sprite>(
 			img, Sprite::Data{
@@ -65,16 +63,8 @@ public:
 					 .position_offset = {0, 0},
 				 });
 
-		/*
-
-		auto & anim = game_object.add_component<Animator>(test_sprite, 4, 4,
-														  Animator::Data{
-															  .fps = 1,
-															  .looping = false,
-														  });
-		anim.set_anim(2);
-		anim.active = false;
-		*/
+		auto & anim = game_object.add_component<Animator>(test_sprite,ivec2{32, 64}, uvec2{4,1}, Animator::Data{});
+		anim.set_anim(0);
 
 		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{400, 400},
 													   Camera::Data{
-- 
cgit v1.2.3


From 543dc375228b520605bb099bc95a23918f75e9f8 Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Tue, 10 Dec 2024 17:52:46 +0100
Subject: Implemented feedback

---
 src/crepe/api/AI.h            |  9 +++++----
 src/crepe/system/AISystem.cpp | 14 +++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/AI.h b/src/crepe/api/AI.h
index d48d9df..80feda5 100644
--- a/src/crepe/api/AI.h
+++ b/src/crepe/api/AI.h
@@ -14,8 +14,7 @@ namespace crepe {
 class AI : public Component {
 public:
 	//! The different types of behaviors that can be used
-	enum BehaviorType {
-		NONE = 0x00000,
+	enum BehaviorTypeMask {
 		SEEK = 0x00002,
 		FLEE = 0x00004,
 		ARRIVE = 0x00008,
@@ -35,7 +34,7 @@ public:
 	 * \param behavior The behavior to check
 	 * \return true if the behavior is on, false otherwise
 	 */
-	bool on(BehaviorType behavior) const { return (flags & behavior) == behavior; }
+	bool on(BehaviorTypeMask behavior) const { return (flags & behavior); }
 	//! Turn on the seek behavior
 	void seek_on() { flags |= SEEK; }
 	//! Turn off the seek behavior
@@ -92,8 +91,10 @@ public:
 	//! The maximum force that can be applied to the entity (higher values will make the entity adjust faster)
 	float max_force;
 
-	//! The target to seek or arrive at
+	//! The target to seek at
 	vec2 seek_target;
+	//! The target to arrive at
+	vec2 arrive_target;
 	//! The target to flee from
 	vec2 flee_target;
 	//! The distance at which the entity will start to flee from the target
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index d1ebeb5..e2e36a5 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -30,6 +30,9 @@ void AISystem::update() {
 				"AI component must be attached to a GameObject with a Rigidbody component");
 		}
 		Rigidbody & rigidbody = rigidbodies.front().get();
+		if (!rigidbody.active) {
+			continue;
+		}
 		if (rigidbody.data.mass <= 0) {
 			throw std::runtime_error("Mass must be greater than 0");
 		}
@@ -52,28 +55,28 @@ vec2 AISystem::calculate(AI & ai, const Rigidbody & rigidbody) {
 	vec2 force;
 
 	// Run all the behaviors that are on, and stop if the force gets too high
-	if (ai.on(AI::BehaviorType::FLEE)) {
+	if (ai.on(AI::BehaviorTypeMask::FLEE)) {
 		vec2 force_to_add = this->flee(ai, rigidbody, transform);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
 		}
 	}
-	if (ai.on(AI::BehaviorType::ARRIVE)) {
+	if (ai.on(AI::BehaviorTypeMask::ARRIVE)) {
 		vec2 force_to_add = this->arrive(ai, rigidbody, transform);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
 		}
 	}
-	if (ai.on(AI::BehaviorType::SEEK)) {
+	if (ai.on(AI::BehaviorTypeMask::SEEK)) {
 		vec2 force_to_add = this->seek(ai, rigidbody, transform);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
 			return force;
 		}
 	}
-	if (ai.on(AI::BehaviorType::PATH_FOLLOW)) {
+	if (ai.on(AI::BehaviorTypeMask::PATH_FOLLOW)) {
 		vec2 force_to_add = this->path_follow(ai, rigidbody, transform);
 
 		if (!this->accumulate_force(ai, force, force_to_add)) {
@@ -132,7 +135,7 @@ vec2 AISystem::flee(const AI & ai, const Rigidbody & rigidbody,
 vec2 AISystem::arrive(const AI & ai, const Rigidbody & rigidbody,
 					  const Transform & transform) const {
 	// Calculate the desired velocity (taking into account the deceleration rate)
-	vec2 to_target = ai.seek_target - transform.position;
+	vec2 to_target = ai.arrive_target - transform.position;
 	float distance = to_target.length();
 	if (distance > 0.0f) {
 		if (ai.arrive_deceleration <= 0.0f) {
@@ -161,6 +164,7 @@ vec2 AISystem::path_follow(AI & ai, const Rigidbody & rigidbody, const Transform
 	if (to_target.length_squared() > ai.path_node_distance * ai.path_node_distance) {
 		// If the entity is not close enough to the target node, seek it
 		ai.seek_target = target;
+		ai.arrive_target = target;
 	} else {
 		// If the entity is close enough to the target node, move to the next node
 		ai.path_index++;
-- 
cgit v1.2.3


From 7cbc577e94ed048f2a8146fab6972ae6ff290be7 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 10 Dec 2024 18:57:03 +0100
Subject: fix AudioSystem bug + add regression test

---
 src/crepe/system/AudioSystem.cpp | 6 +++---
 src/test/AudioTest.cpp           | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index b2c1dc6..ddba268 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -26,12 +26,12 @@ void AudioSystem::diff_update(AudioSource & component, Sound & resource) {
 	SoundContext & context = this->get_context();
 
 	if (component.active != component.last_active) {
-		if (component.active) {
-			component.oneshot_play = component.play_on_awake;
-		} else {
+		if (!component.active) {
 			context.stop(component.voice);
 			return;
 		}
+		if (component.play_on_awake)
+			component.oneshot_play = true;
 	}
 	if (!component.active) return;
 
diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index 774fdb8..48bba1b 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -150,3 +150,12 @@ TEST_F(AudioTest, PlayOnActive) {
 		system.update();
 	}
 }
+
+TEST_F(AudioTest, PlayImmediately) {
+	component.play_on_awake = false;
+	component.play();
+
+	EXPECT_CALL(context, play(_)).Times(1);
+
+	system.update();
+}
-- 
cgit v1.2.3


From bea86a6fcea272d7cc7fba44d6c489bd70587578 Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Wed, 11 Dec 2024 13:27:24 +0100
Subject: Make format

---
 src/crepe/api/LoopManager.h       | 2 +-
 src/crepe/manager/SaveManager.cpp | 6 ++----
 src/crepe/manager/SaveManager.h   | 5 +++--
 src/crepe/system/AudioSystem.cpp  | 3 +--
 4 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 33a61a3..700afe4 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -5,8 +5,8 @@
 #include "../facade/SDLContext.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/ResourceManager.h"
-#include "../manager/SceneManager.h"
 #include "../manager/SaveManager.h"
+#include "../manager/SceneManager.h"
 #include "../system/System.h"
 
 #include "LoopTimer.h"
diff --git a/src/crepe/manager/SaveManager.cpp b/src/crepe/manager/SaveManager.cpp
index 39b92d4..691ea2f 100644
--- a/src/crepe/manager/SaveManager.cpp
+++ b/src/crepe/manager/SaveManager.cpp
@@ -14,10 +14,8 @@ SaveManager::SaveManager(Mediator & mediator) : Manager(mediator) {
 DB & SaveManager::get_db() {
 	if (this->db == nullptr) {
 		Config & cfg = Config::get_instance();
-		this->db = {
-			new DB(cfg.savemgr.location),
-			[](void * db){ delete static_cast<DB *>(db); }
-		};
+		this->db
+			= {new DB(cfg.savemgr.location), [](void * db) { delete static_cast<DB *>(db); }};
 	}
 	return *static_cast<DB *>(this->db.get());
 }
diff --git a/src/crepe/manager/SaveManager.h b/src/crepe/manager/SaveManager.h
index 27e625c..61a978d 100644
--- a/src/crepe/manager/SaveManager.h
+++ b/src/crepe/manager/SaveManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <memory>
 #include <functional>
+#include <memory>
 
 #include "../ValueBroker.h"
 
@@ -95,9 +95,10 @@ private:
 protected:
 	//! Create or return DB
 	virtual DB & get_db();
+
 private:
 	//! Database
-	std::unique_ptr<void, std::function<void(void*)>> db = nullptr;
+	std::unique_ptr<void, std::function<void(void *)>> db = nullptr;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index ddba268..b1aa0f8 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -30,8 +30,7 @@ void AudioSystem::diff_update(AudioSource & component, Sound & resource) {
 			context.stop(component.voice);
 			return;
 		}
-		if (component.play_on_awake)
-			component.oneshot_play = true;
+		if (component.play_on_awake) component.oneshot_play = true;
 	}
 	if (!component.active) return;
 
-- 
cgit v1.2.3


From f64b793ad8e796458c8e175f298e8d13eb3b3459 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 11 Dec 2024 14:16:40 +0100
Subject: feedback

---
 src/crepe/api/LoopManager.cpp          | 45 ++++++++++++------------
 src/crepe/api/LoopManager.h            | 18 ++--------
 src/crepe/manager/LoopTimerManager.cpp | 56 ++++++++++++++---------------
 src/crepe/manager/LoopTimerManager.h   | 64 +++++++++++++++++-----------------
 src/crepe/manager/Mediator.h           |  1 +
 src/crepe/system/AnimatorSystem.cpp    |  2 +-
 src/test/LoopManagerTest.cpp           | 12 ++-----
 src/test/LoopTimerTest.cpp             | 20 +++++------
 8 files changed, 99 insertions(+), 119 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 46a7635..a1da8be 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -7,7 +7,8 @@
 #include "../system/PhysicsSystem.h"
 #include "../system/RenderSystem.h"
 #include "../system/ScriptSystem.h"
-#include "manager/EventManager.h"
+#include "../manager/EventManager.h"
+#include "../util/Log.h"
 
 #include "LoopManager.h"
 
@@ -25,56 +26,56 @@ LoopManager::LoopManager() {
 	this->event_manager.subscribe<ShutDownEvent>(
 		[this](const ShutDownEvent & event) { return this->on_shutdown(event); });
 }
-
-void LoopManager::process_input() {
-	this->get_system<InputSystem>().update();
-	this->event_manager.dispatch_events();
-}
-
 void LoopManager::start() {
 	this->setup();
 	this->loop();
 }
 
-void LoopManager::fixed_update() {
-	this->get_system<ScriptSystem>().update();
-	this->get_system<PhysicsSystem>().update();
-	this->get_system<CollisionSystem>().update();
+void LoopManager::setup() {
+	this->game_running = true;
+	this->loop_timer.start();
+	this->scene_manager.load_next_scene();
 }
 
 void LoopManager::loop() {
+	try {
 
 	while (game_running) {
 		this->loop_timer.update();
 
 		while (this->loop_timer.get_lag() >= this->loop_timer.get_fixed_delta_time()) {
-			this->process_input();
 			this->fixed_update();
 			this->loop_timer.advance_fixed_elapsed_time();
 		}
 
 		this->frame_update();
-		this->render();
 		this->loop_timer.enforce_frame_rate();
 	}
+	}catch(const exception & e){
+		Log::logf(Log::Level::ERROR, "Exception caught in main loop: %s", e.what());
+		this->event_manager.trigger_event<ShutDownEvent>(ShutDownEvent{});
+	}
 }
 
-void LoopManager::setup() {
-	this->game_running = true;
-	this->loop_timer.start();
-	this->scene_manager.load_next_scene();
+// will be called at a fixed interval
+void LoopManager::fixed_update() {
+	this->get_system<InputSystem>().update();
+	this->event_manager.dispatch_events();
+	this->get_system<ScriptSystem>().update();
+	this->get_system<PhysicsSystem>().update();
+	this->get_system<CollisionSystem>().update();
 }
 
-void LoopManager::render() {
-	if (!this->game_running) return;
-
+// will be called every frame
+void LoopManager::frame_update() { 
+	this->scene_manager.load_next_scene();
 	this->get_system<AnimatorSystem>().update();
+	//render
 	this->get_system<RenderSystem>().update();
 }
 
 bool LoopManager::on_shutdown(const ShutDownEvent & e) {
 	this->game_running = false;
+	// propagate to possible user ShutDownEvent listeners
 	return false;
 }
-
-void LoopManager::frame_update() { this->scene_manager.load_next_scene(); }
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index f94cea1..2319d65 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -25,7 +25,7 @@ public:
 	 * \brief Start the gameloop
 	 *
 	 * This is the start of the engine where the setup is called and then the loop keeps running until the game stops running.
-	 * Developers need to call this function to run the game.
+	 * The Game programmer needs to call this function to run the game. This should be done after creating and adding all scenes.
 	 */
 	void start();
 
@@ -51,13 +51,6 @@ private:
 	 */
 	void loop();
 
-	/**
-	 * \brief Function for handling input-related system calls.
-	 *
-	 * Processes user inputs from keyboard and mouse.
-	 */
-	void process_input();
-
 	/**
 	 * \brief Per-frame update.
 	 *
@@ -71,15 +64,9 @@ private:
 	 * This function updates physics and game logic based on LoopTimer's fixed_delta_time.
 	 */
 	virtual void fixed_update();
-	/**
-	 * \brief Function for executing render-related systems.
-	 *
-	 * Renders the current state of the game to the screen.
-	 */
-	virtual void render();
 
+	//! Indicates whether the game is running.
 	bool game_running = false;
-
 private:
 	//! Global context
 	Mediator mediator;
@@ -97,6 +84,7 @@ private:
 	SDLContext & sdl_context = SDLContext::get_instance();
 
 private:
+	
 	/**
 	 * \brief Callback function for ShutDownEvent
 	 *
diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp
index 8725c33..a306eb7 100644
--- a/src/crepe/manager/LoopTimerManager.cpp
+++ b/src/crepe/manager/LoopTimerManager.cpp
@@ -6,7 +6,7 @@
 #include "LoopTimerManager.h"
 
 using namespace crepe;
-
+using namespace std::chrono_literals;
 LoopTimerManager::LoopTimerManager(Mediator & mediator) : Manager(mediator) {
 	this->mediator.loop_timer = *this;
 	dbg_trace();
@@ -15,62 +15,57 @@ LoopTimerManager::LoopTimerManager(Mediator & mediator) : Manager(mediator) {
 void LoopTimerManager::start() {
 	this->last_frame_time = std::chrono::steady_clock::now();
 
-	this->elapsed_time = std::chrono::milliseconds(0);
+	this->elapsed_time = 0s;
 	// by starting the elapsed_fixed_time at (0 - fixed_delta_time) in milliseconds it calls a fixed update at the start of the loop.
 	this->elapsed_fixed_time
-		= -std::chrono::duration_cast<std::chrono::milliseconds>(fixed_delta_time);
-	this->delta_time = std::chrono::milliseconds(0);
+		= -std::chrono::duration_cast<ElapsedTime_t>(this->fixed_delta_time);
+	this->delta_time = 0s;
 }
 
 void LoopTimerManager::update() {
-	std::chrono::steady_clock::time_point current_frame_time
+	TimePoint_t current_frame_time
 		= std::chrono::steady_clock::now();
 	// Convert to duration in seconds for delta time
-	this->delta_time = std::chrono::duration_cast<std::chrono::duration<double>>(
-		current_frame_time - last_frame_time);
+	this->delta_time = current_frame_time - last_frame_time;
 
 	if (this->delta_time > this->maximum_delta_time) {
 		this->delta_time = this->maximum_delta_time;
 	}
-	if (this->delta_time.count() > 0.0) {
+	if (this->delta_time > 0s) {
 		this->actual_fps = 1.0 / this->delta_time.count();
 	} else {
 		this->actual_fps = 0;
 	}
-
-	this->elapsed_time += this->delta_time;
+	this->elapsed_time += std::chrono::duration_cast<ElapsedTime_t>(this->delta_time);
 	this->last_frame_time = current_frame_time;
 }
 
-double LoopTimerManager::get_delta_time() const {
-	return this->delta_time.count() * this->time_scale;
-}
+Duration_t LoopTimerManager::get_delta_time() const {return this->delta_time * this->time_scale;}
 
-double LoopTimerManager::get_current_time() const { return this->elapsed_time.count(); }
+ElapsedTime_t LoopTimerManager::get_elapsed_time() const { return this->elapsed_time; }
 
 void LoopTimerManager::advance_fixed_elapsed_time() {
-	this->elapsed_fixed_time += this->fixed_delta_time;
+	this->elapsed_fixed_time += std::chrono::duration_cast<ElapsedTime_t>(this->fixed_delta_time);
 }
 
-void LoopTimerManager::set_target_fps(int fps) {
+void LoopTimerManager::set_target_framerate(unsigned fps) {
 	this->target_fps = fps;
 	//check if fps is lower or equals 0
 	if (fps <= 0) return;
 	// target time per frame in seconds
-	this->frame_target_time = std::chrono::duration<double>(1.0) / this->target_fps;
+	this->frame_target_time = Duration_t(1s) / this->target_fps;
 }
 
-int LoopTimerManager::get_fps() const { return this->actual_fps; }
+unsigned LoopTimerManager::get_fps() const { return this->actual_fps; }
 
 void LoopTimerManager::set_time_scale(double value) { this->time_scale = value; }
 
-double LoopTimerManager::get_time_scale() const { return this->time_scale; }
+float LoopTimerManager::get_time_scale() const { return this->time_scale; }
 
 void LoopTimerManager::enforce_frame_rate() {
-	std::chrono::steady_clock::time_point current_frame_time
+	TimePoint_t current_frame_time
 		= std::chrono::steady_clock::now();
-	std::chrono::duration<double> frame_duration = current_frame_time - this->last_frame_time;
-
+	Duration_t frame_duration = current_frame_time - this->last_frame_time;
 	// Check if frame duration is less than the target frame time
 	if (frame_duration < this->frame_target_time) {
 		std::chrono::microseconds delay_time
@@ -83,16 +78,17 @@ void LoopTimerManager::enforce_frame_rate() {
 	}
 }
 
-double LoopTimerManager::get_lag() const {
-	return (this->elapsed_time - this->elapsed_fixed_time).count();
+Duration_t LoopTimerManager::get_lag() const {
+	return (this->elapsed_time - this->elapsed_fixed_time);
 }
-double LoopTimerManager::get_scaled_fixed_delta_time() const {
-	return this->fixed_delta_time.count() * this->time_scale;
+
+Duration_t LoopTimerManager::get_scaled_fixed_delta_time() const {
+	return this->fixed_delta_time * this->time_scale;
 }
-void LoopTimerManager::set_fixed_delta_time(double seconds) {
-	this->fixed_delta_time = std::chrono::duration<double>(seconds);
+void LoopTimerManager::set_fixed_delta_time(float seconds) {
+	this->fixed_delta_time = Duration_t(seconds);
 }
 
-double LoopTimerManager::get_fixed_delta_time() const {
-	return this->fixed_delta_time.count();
+Duration_t LoopTimerManager::get_fixed_delta_time() const {
+	return this->fixed_delta_time;
 }
diff --git a/src/crepe/manager/LoopTimerManager.h b/src/crepe/manager/LoopTimerManager.h
index ec44d52..c5f3cb0 100644
--- a/src/crepe/manager/LoopTimerManager.h
+++ b/src/crepe/manager/LoopTimerManager.h
@@ -5,7 +5,9 @@
 #include "Manager.h"
 
 namespace crepe {
-
+typedef std::chrono::duration<float> Duration_t;
+typedef std::chrono::duration<unsigned long long, std::micro> ElapsedTime_t;
+typedef std::chrono::steady_clock::time_point TimePoint_t;
 /**
  * \brief Manages timing and frame rate for the game loop.
  * 
@@ -28,31 +30,31 @@ public:
 	 * 
 	 * \return Delta time in seconds since the last frame.
 	 */
-	double get_delta_time() const;
+	Duration_t get_delta_time() const;
 
 	/**
-	 * \brief Get the current game time.
+	 * \brief Get the current elapsed time (total time passed )
 	 *
 	 * \note The current game time may vary from real-world elapsed time. It is the cumulative
 	 * sum of each frame's delta time.
 	 *
 	 * \return Elapsed game time in seconds.
 	 */
-	double get_current_time() const;
+	ElapsedTime_t get_elapsed_time() const;
 
 	/**
 	 * \brief Set the target frames per second (FPS).
 	 *
 	 * \param fps The desired frames rendered per second.
 	 */
-	void set_target_fps(int fps);
+	void set_target_framerate(unsigned fps);
 
 	/**
 	 * \brief Get the current frames per second (FPS).
 	 *
 	 * \return Current FPS.
 	 */
-	int get_fps() const;
+	unsigned get_fps() const;
 
 	/**
 	 * \brief Get the current time scale.
@@ -60,7 +62,7 @@ public:
 	 * \return The current time scale, where (0 = pause, < 1 = slow down, 1 = normal speed, > 1 = speed up).
 	 * up the game.
 	 */
-	double get_time_scale() const;
+	float get_time_scale() const;
 
 	/**
 	 * \brief Set the time scale.
@@ -76,11 +78,10 @@ public:
 	 *
 	 * This value is used in the LoopManager to determine how many times 
 	 * the fixed_update should be called within a given interval.
-	 * This value is also the timing value which is used in the fixed_loop to convert pixels to time.
 	 *
 	 * \return The unscaled fixed delta time in seconds.
 	 */
-	double get_fixed_delta_time() const;
+	Duration_t get_fixed_delta_time() const;
 
 	/**
 	 * \brief Set the fixed_delta_time in seconds.
@@ -88,9 +89,9 @@ public:
 	 * \param seconds fixed_delta_time in seconds.
 	 * 
 	 * The fixed_delta_time value is used to determine how many times per second the fixed_update and process_input functions are called.
-	 * This value is also the timing value which is used in the fixed_loop to convert pixels to time.
+	 * 
 	 */
-	void set_fixed_delta_time(double seconds);
+	void set_fixed_delta_time(float seconds);
 
 	/**
 	 * \brief Retrieves the scaled fixed delta time in seconds.
@@ -101,12 +102,11 @@ public:
 	 *
 	 * \return The fixed delta time, scaled by the current time scale, in seconds.
 	 */
-	double get_scaled_fixed_delta_time() const;
+	Duration_t get_scaled_fixed_delta_time() const;
 
 private:
 	//! Friend relation to use start,enforce_frame_rate,get_lag,update,advance_fixed_update.
 	friend class LoopManager;
-
 	/**
 	 * \brief Start the loop timer.
 	 *
@@ -128,7 +128,7 @@ private:
 	 *
 	 * \return Accumulated lag in seconds.
 	 */
-	double get_lag() const;
+	Duration_t get_lag() const;
 
 	/**
 	 * \brief Update the timer to the current frame.
@@ -147,27 +147,27 @@ private:
 	void advance_fixed_elapsed_time();
 
 private:
-	//! Target frames per second
+	//! Target frames per second.
 	int target_fps = 60;
-	//! Actual frames per second
+	//! Actual frames per second.
 	int actual_fps = 0;
-	//! Time scale for speeding up or slowing down the game (0 = pause, < 1 = slow down, 1 = normal speed, > 1 = speed up)
-	double time_scale = 1;
-	//! Maximum delta time in seconds to avoid large jumps
-	std::chrono::duration<double> maximum_delta_time{0.25};
-	//! Delta time for the current frame in seconds
-	std::chrono::duration<double> delta_time{0.0};
+	//! Time scale for speeding up or slowing down the game (0 = pause, < 1 = slow down, 1 = normal speed, > 1 = speed up).
+	float time_scale = 1;
+	//! Maximum delta time in seconds to avoid large jumps.
+	Duration_t maximum_delta_time{0.25};
+	//! Delta time for the current frame in seconds.
+	Duration_t delta_time{0.0};
 	//! Target time per frame in seconds
-	std::chrono::duration<double> frame_target_time
-		= std::chrono::duration<double>(1.0) / target_fps;
-	//! Fixed delta time for fixed updates in seconds
-	std::chrono::duration<double> fixed_delta_time = std::chrono::duration<double>(1.0) / 50.0;
-	//! Total elapsed game time in seconds
-	std::chrono::duration<double> elapsed_time{0.0};
-	//! Total elapsed time for fixed updates in seconds
-	std::chrono::duration<double> elapsed_fixed_time{0.0};
-	//! Time of the last frame
-	std::chrono::steady_clock::time_point last_frame_time;
+	Duration_t frame_target_time
+		= Duration_t(1.0) / target_fps;
+	//! Fixed delta time for fixed updates in seconds.
+	Duration_t fixed_delta_time = Duration_t(1.0) / 50.0;
+	//! Total elapsed game time in microseconds.
+	ElapsedTime_t elapsed_time{0};
+	//! Total elapsed time for fixed updates in microseconds.
+	ElapsedTime_t elapsed_fixed_time{0};
+	//! Time of the last frame.
+	TimePoint_t last_frame_time;
 };
 
 } // namespace crepe
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index eb8a7a5..ad51cc6 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -11,6 +11,7 @@ namespace crepe {
 
 class ComponentManager;
 class SceneManager;
+
 class LoopTimerManager;
 class EventManager;
 /**
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index 499f618..690b45b 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -13,7 +13,7 @@ void AnimatorSystem::update() {
 	LoopTimerManager & timer = this->mediator.loop_timer;
 	RefVector<Animator> animations = mgr.get_components_by_type<Animator>();
 
-	double elapsed_time = timer.get_current_time();
+	unsigned long long elapsed_time = timer.get_elapsed_time().count();
 
 	for (Animator & a : animations) {
 		if (!a.active) continue;
diff --git a/src/test/LoopManagerTest.cpp b/src/test/LoopManagerTest.cpp
index c44ebda..4e0ecdc 100644
--- a/src/test/LoopManagerTest.cpp
+++ b/src/test/LoopManagerTest.cpp
@@ -16,7 +16,6 @@ protected:
 	public:
 		MOCK_METHOD(void, fixed_update, (), (override));
 		MOCK_METHOD(void, frame_update, (), (override));
-		MOCK_METHOD(void, render, (), (override));
 	};
 
 	TestGameLoop test_loop;
@@ -25,10 +24,9 @@ protected:
 
 TEST_F(LoopManagerTest, FixedUpdate) {
 	// Arrange
-	test_loop.loop_timer.set_target_fps(60);
+	test_loop.loop_timer.set_target_framerate(60);
 
 	// Set expectations for the mock calls
-	EXPECT_CALL(test_loop, render).Times(::testing::Exactly(60));
 	EXPECT_CALL(test_loop, frame_update).Times(::testing::Exactly(60));
 	EXPECT_CALL(test_loop, fixed_update).Times(::testing::Exactly(50));
 
@@ -47,10 +45,9 @@ TEST_F(LoopManagerTest, FixedUpdate) {
 }
 TEST_F(LoopManagerTest, ScaledFixedUpdate) {
 	// Arrange
-	test_loop.loop_timer.set_target_fps(60);
+	test_loop.loop_timer.set_target_framerate(60);
 
 	// Set expectations for the mock calls
-	EXPECT_CALL(test_loop, render).Times(::testing::Exactly(60));
 	EXPECT_CALL(test_loop, frame_update).Times(::testing::Exactly(60));
 	EXPECT_CALL(test_loop, fixed_update).Times(::testing::Exactly(50));
 
@@ -69,9 +66,8 @@ TEST_F(LoopManagerTest, ScaledFixedUpdate) {
 }
 TEST_F(LoopManagerTest, ShutDown) {
 	// Arrange
-	test_loop.loop_timer.set_target_fps(60);
+	test_loop.loop_timer.set_target_framerate(60);
 
-	EXPECT_CALL(test_loop, render).Times(::testing::AtLeast(1));
 	EXPECT_CALL(test_loop, frame_update).Times(::testing::AtLeast(1));
 	EXPECT_CALL(test_loop, fixed_update).Times(::testing::AtLeast(1));
 	// Start the loop in a separate thread
@@ -80,6 +76,4 @@ TEST_F(LoopManagerTest, ShutDown) {
 	test_loop.event_manager.trigger_event<ShutDownEvent>(ShutDownEvent{});
 	// Wait for the loop thread to finish
 	loop_thread.join();
-
-	// Test finished
 }
diff --git a/src/test/LoopTimerTest.cpp b/src/test/LoopTimerTest.cpp
index c6655d9..1216e5e 100644
--- a/src/test/LoopTimerTest.cpp
+++ b/src/test/LoopTimerTest.cpp
@@ -17,7 +17,7 @@ protected:
 };
 TEST_F(LoopTimerTest, EnforcesTargetFrameRate) {
 	// Set the target FPS to 60 (which gives a target time per frame of ~16.67 ms)
-	loop_timer.set_target_fps(60);
+	loop_timer.set_target_framerate(60);
 
 	auto start_time = steady_clock::now();
 	loop_timer.enforce_frame_rate();
@@ -30,33 +30,33 @@ TEST_F(LoopTimerTest, EnforcesTargetFrameRate) {
 }
 TEST_F(LoopTimerTest, SetTargetFps) {
 	// Set the target FPS to 120
-	loop_timer.set_target_fps(120);
+	loop_timer.set_target_framerate(120);
 
 	// Calculate the expected frame time (~8.33ms per frame)
-	auto expected_frame_time = std::chrono::duration<double>(1.0 / 120.0);
+	Duration_t expected_frame_time = std::chrono::duration<float>(1.0 / 120.0);
 
 	ASSERT_NEAR(loop_timer.frame_target_time.count(), expected_frame_time.count(), 0.001);
 }
 TEST_F(LoopTimerTest, DeltaTimeCalculation) {
 	// Set the target FPS to 60 (16.67 ms per frame)
-	loop_timer.set_target_fps(60);
+	loop_timer.set_target_framerate(60);
 
 	auto start_time = steady_clock::now();
 	loop_timer.update();
 	auto end_time = steady_clock::now();
 
 	// Check the delta time
-	double delta_time = loop_timer.get_delta_time();
+	Duration_t delta_time = loop_timer.get_delta_time();
 
 	auto elapsed_time = duration_cast<seconds>(end_time - start_time).count();
 
 	// Assert that delta_time is close to the elapsed time
-	ASSERT_NEAR(delta_time, elapsed_time, 1);
+	ASSERT_NEAR(delta_time.count(), elapsed_time, 1);
 }
 
 TEST_F(LoopTimerTest, getCurrentTime) {
 	// Set the target FPS to 60 (16.67 ms per frame)
-	loop_timer.set_target_fps(60);
+	loop_timer.set_target_framerate(60);
 
 	auto start_time = steady_clock::now();
 
@@ -68,8 +68,8 @@ TEST_F(LoopTimerTest, getCurrentTime) {
 	auto end_time = steady_clock::now();
 
 	// Get the elapsed time in seconds as a double
-	auto elapsed_time
-		= duration_cast<std::chrono::duration<double>>(end_time - start_time).count();
+	auto elapsed_time = std::chrono::duration_cast<ElapsedTime_t>(end_time - start_time).count();
 
-	ASSERT_NEAR(loop_timer.get_current_time(), elapsed_time, 0.001);
+
+	ASSERT_NEAR(loop_timer.get_elapsed_time().count(), elapsed_time, 5);
 }
-- 
cgit v1.2.3


From 2bcd6ece912ab0a140f9d925718e8787879d1ed7 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 11 Dec 2024 14:36:44 +0100
Subject: adjusted aspect ratio

---
 src/crepe/api/Animator.cpp         |  2 ++
 src/crepe/api/Animator.h           | 11 ++++----
 src/crepe/api/Sprite.h             |  9 +++++++
 src/crepe/facade/SDLContext.cpp    |  7 ++---
 src/crepe/manager/Mediator.h       |  2 --
 src/crepe/system/AISystem.cpp      |  3 ++-
 src/example/rendering_particle.cpp |  4 +--
 src/example/sound.cpp              | 54 ++++++++++++++++++++++++++++++++++++++
 src/test/ParticleTest.cpp          |  1 -
 src/test/RenderSystemTest.cpp      |  1 -
 10 files changed, 79 insertions(+), 15 deletions(-)
 create mode 100644 src/example/sound.cpp

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 4c72cc0..123f0e7 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -19,6 +19,8 @@ Animator::Animator(game_object_id_t id, Sprite & spritesheet, const ivec2 & sing
 	this->spritesheet.mask.h = single_frame_size.y;
 	this->spritesheet.mask.x = 0;
 	this->spritesheet.mask.y = 0;
+
+	this->spritesheet.aspect_ratio = static_cast<float>(single_frame_size.x) / single_frame_size.y;
 }
 
 Animator::~Animator() { dbg_trace(); }
diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index 9a26bf0..09f0134 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -75,8 +75,9 @@ public:
 	 *
 	 * \param id The unique identifier for the component, typically assigned automatically.
 	 * \param spritesheet the reference to the spritesheet
-	 * \param max_row maximum of rows inside the given spritesheet
-	 * \param max_col maximum of columns inside the given spritesheet
+	 * \param single_frame_size the width and height in pixels of a single frame inside the
+	 * spritesheet
+	 * \param max_cell_size the max rows and columns inside the given spritesheet
 	 * \param data extra animation data for more control
 	 *
 	 * This constructor sets up the Animator with the given parameters, and initializes the
@@ -87,15 +88,15 @@ public:
 	~Animator(); // dbg_trace
 
 public:
-	//! The maximum number of rows and columns size
-	const uvec2 max_cell_size;
-
 	Animator::Data data;
 
 private:
 	//! A reference to the Sprite sheet containing.
 	Sprite & spritesheet;
 
+	//! The maximum number of rows and columns size
+	const uvec2 max_cell_size;
+
 	//! Uses the spritesheet
 	friend AnimatorSystem;
 };
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index 7e9812d..14a873b 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -92,6 +92,15 @@ private:
 	//! Reads the all the variables plus the  mask
 	friend class AnimatorSystem;
 
+
+	/**
+	 * \aspect_ratio the ratio of the sprite image
+	 *
+	 * - this value will only be set by the \c Animator component for the ratio of the Animation
+	 * - if \c Animator component is not added it will not use this ratio (because 0) and will use aspect_ratio of the Asset.
+	 */
+	float aspect_ratio = 0;
+
 	struct Rect {
 		int w = 0;
 		int h = 0;
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index a0d7f04..0566ecf 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -233,12 +233,14 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 
 	const Sprite::Data & data = ctx.sprite.data;
 
+	float aspect_ratio = (ctx.sprite.aspect_ratio == 0) ? ctx.texture.get_ratio() : ctx.sprite.aspect_ratio;
+
 	vec2 size = data.size;
 	if (data.size.x == 0 && data.size.y != 0) {
-		size.x = data.size.y * ctx.texture.get_ratio();
+		size.x = data.size.y * aspect_ratio;
 	}
 	if (data.size.y == 0 && data.size.x != 0) {
-		size.y = data.size.x / ctx.texture.get_ratio();
+		size.y = data.size.x / aspect_ratio;
 	}
 
 	const CameraValues & cam = ctx.cam;
@@ -273,7 +275,6 @@ void SDLContext::draw(const RenderContext & ctx) {
 		.img_scale = ctx.scale,
 	});
 
-	cout << srcrect->w << " " << srcrect->h << " " << srcrect->x << " " << srcrect->y << endl;
 	double angle = ctx.angle + data.angle_offset;
 
 	this->set_color_texture(ctx.texture, ctx.sprite.data.color);
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index d5f7e00..628154a 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -4,8 +4,6 @@
 
 // TODO: remove these singletons:
 #include "EventManager.h"
-#include "SaveManager.h"
-#include "api/LoopTimer.h"
 
 namespace crepe {
 
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index e2e36a5..7f04432 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -12,10 +12,11 @@ using namespace crepe;
 void AISystem::update() {
 	const Mediator & mediator = this->mediator;
 	ComponentManager & mgr = mediator.component_manager;
+	LoopTimer & timer = mediator.timer;
 	RefVector<AI> ai_components = mgr.get_components_by_type<AI>();
 
 	//TODO: Use fixed loop dt (this is not available at master at the moment)
-	double dt = LoopTimer::get_instance().get_delta_time();
+	double dt = timer.get_delta_time();
 
 	// Loop through all AI components
 	for (AI & ai : ai_components) {
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 44bd96a..bd4ef95 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -63,8 +63,8 @@ public:
 					 .position_offset = {0, 0},
 				 });
 
-		auto & anim = game_object.add_component<Animator>(test_sprite,ivec2{32, 64}, uvec2{4,1}, Animator::Data{});
-		anim.set_anim(0);
+		//auto & anim = game_object.add_component<Animator>(test_sprite,ivec2{32, 64}, uvec2{4,1}, Animator::Data{});
+		//anim.set_anim(0);
 
 		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{400, 400},
 													   Camera::Data{
diff --git a/src/example/sound.cpp b/src/example/sound.cpp
new file mode 100644
index 0000000..a9b0930
--- /dev/null
+++ b/src/example/sound.cpp
@@ -0,0 +1,54 @@
+
+
+#include "api/Asset.h"
+#include "api/AudioSource.h"
+#include "api/BehaviorScript.h"
+#include "api/Camera.h"
+#include "api/GameObject.h"
+#include "api/LoopManager.h"
+#include "api/Scene.h"
+#include "api/Script.h"
+#include "manager/ComponentManager.h"
+#include "types.h"
+#include <string>
+
+using namespace crepe;
+
+
+class ScriptTest : public Script {
+	void init(){
+		auto & audio = this->get_component<AudioSource>();
+		audio.play();
+	}
+	void update(){
+	}
+};
+
+
+class TestSound : public Scene {
+public: 
+	void load_scene(){
+		Mediator & mediator = this->mediator;
+		ComponentManager & mgr = mediator.component_manager;
+
+		GameObject obj = mgr.new_object("SOUND");
+		GameObject cam = mgr.new_object("cam");
+		cam.add_component<Camera>(ivec2{100,100},vec2{100,100}, Camera::Data{});
+
+		Asset asset{"asset/audio/sample.ogg"};
+		auto & test = obj.add_component<AudioSource>(asset);
+		obj.add_component<BehaviorScript>().set_script<ScriptTest>();
+
+
+	}
+
+	std::string get_name() const { return "TestScene"; };
+
+};
+
+int main(){
+	LoopManager engine;
+	engine.add_scene<TestSound>();
+	engine.start();
+	return 0;
+}
diff --git a/src/test/ParticleTest.cpp b/src/test/ParticleTest.cpp
index 38f4bde..9112a3f 100644
--- a/src/test/ParticleTest.cpp
+++ b/src/test/ParticleTest.cpp
@@ -5,7 +5,6 @@
 #include <crepe/api/ParticleEmitter.h>
 #include <crepe/api/Rigidbody.h>
 #include <crepe/api/Sprite.h>
-#include <crepe/api/Texture.h>
 #include <crepe/api/Transform.h>
 #include <crepe/manager/ComponentManager.h>
 #include <crepe/system/ParticleSystem.h>
diff --git a/src/test/RenderSystemTest.cpp b/src/test/RenderSystemTest.cpp
index 1b2de7a..eb5033b 100644
--- a/src/test/RenderSystemTest.cpp
+++ b/src/test/RenderSystemTest.cpp
@@ -14,7 +14,6 @@
 #include <crepe/api/Color.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Sprite.h>
-#include <crepe/api/Texture.h>
 #include <crepe/manager/ComponentManager.h>
 
 #include <crepe/system/RenderSystem.h>
-- 
cgit v1.2.3


From e49893e8de74534494792955c50ea0eabaf3ba38 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 11 Dec 2024 15:01:46 +0100
Subject: WIP fix LoopTimerManager

---
 src/crepe/api/LoopManager.cpp          | 19 +++++++-------
 src/crepe/manager/LoopTimerManager.cpp | 47 +++++++++++++++++-----------------
 src/crepe/manager/LoopTimerManager.h   | 34 ++++++++++++------------
 src/crepe/manager/Mediator.h           |  6 ++---
 src/crepe/system/AISystem.cpp          |  8 +++---
 src/test/LoopTimerTest.cpp             | 10 +++++---
 6 files changed, 64 insertions(+), 60 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 4ca9928..aa4a21a 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -43,20 +43,19 @@ void LoopManager::setup() {
 
 void LoopManager::loop() {
 	try {
+		while (game_running) {
+			this->loop_timer.update();
 
-	while (game_running) {
-		this->loop_timer.update();
+			while (this->loop_timer.get_lag() >= this->loop_timer.get_fixed_delta_time()) {
+				this->fixed_update();
+				this->loop_timer.advance_fixed_elapsed_time();
+			}
 
-		while (this->loop_timer.get_lag() >= this->loop_timer.get_fixed_delta_time()) {
-			this->fixed_update();
-			this->loop_timer.advance_fixed_elapsed_time();
+			this->frame_update();
+			this->loop_timer.enforce_frame_rate();
 		}
-
-		this->frame_update();
-		this->loop_timer.enforce_frame_rate();
-	}
 	}catch(const exception & e){
-		Log::logf(Log::Level::ERROR, "Exception caught in main loop: %s", e.what());
+		Log::logf(Log::Level::ERROR, "Exception caught in main loop: {}", e.what());
 		this->event_manager.trigger_event<ShutDownEvent>(ShutDownEvent{});
 	}
 }
diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp
index a306eb7..92a2150 100644
--- a/src/crepe/manager/LoopTimerManager.cpp
+++ b/src/crepe/manager/LoopTimerManager.cpp
@@ -6,7 +6,9 @@
 #include "LoopTimerManager.h"
 
 using namespace crepe;
+using namespace std::chrono;
 using namespace std::chrono_literals;
+
 LoopTimerManager::LoopTimerManager(Mediator & mediator) : Manager(mediator) {
 	this->mediator.loop_timer = *this;
 	dbg_trace();
@@ -15,15 +17,14 @@ LoopTimerManager::LoopTimerManager(Mediator & mediator) : Manager(mediator) {
 void LoopTimerManager::start() {
 	this->last_frame_time = std::chrono::steady_clock::now();
 
-	this->elapsed_time = 0s;
+	this->elapsed_time = elapsed_time_t{0};
 	// by starting the elapsed_fixed_time at (0 - fixed_delta_time) in milliseconds it calls a fixed update at the start of the loop.
-	this->elapsed_fixed_time
-		= -std::chrono::duration_cast<ElapsedTime_t>(this->fixed_delta_time);
-	this->delta_time = 0s;
+	// this->elapsed_fixed_time = -this->fixed_delta_time;
+	this->delta_time = duration_t{0};
 }
 
 void LoopTimerManager::update() {
-	TimePoint_t current_frame_time
+	time_point_t current_frame_time
 		= std::chrono::steady_clock::now();
 	// Convert to duration in seconds for delta time
 	this->delta_time = current_frame_time - last_frame_time;
@@ -32,20 +33,20 @@ void LoopTimerManager::update() {
 		this->delta_time = this->maximum_delta_time;
 	}
 	if (this->delta_time > 0s) {
-		this->actual_fps = 1.0 / this->delta_time.count();
+		this->actual_fps = 1.0 / duration_cast<seconds>(this->delta_time).count();
 	} else {
 		this->actual_fps = 0;
 	}
-	this->elapsed_time += std::chrono::duration_cast<ElapsedTime_t>(this->delta_time);
+	this->elapsed_time += duration_cast<elapsed_time_t>(this->delta_time);
 	this->last_frame_time = current_frame_time;
 }
 
-Duration_t LoopTimerManager::get_delta_time() const {return this->delta_time * this->time_scale;}
+duration_t LoopTimerManager::get_delta_time() const {return this->delta_time * this->time_scale;}
 
-ElapsedTime_t LoopTimerManager::get_elapsed_time() const { return this->elapsed_time; }
+elapsed_time_t LoopTimerManager::get_elapsed_time() const { return this->elapsed_time; }
 
 void LoopTimerManager::advance_fixed_elapsed_time() {
-	this->elapsed_fixed_time += std::chrono::duration_cast<ElapsedTime_t>(this->fixed_delta_time);
+	this->elapsed_fixed_time += std::chrono::duration_cast<elapsed_time_t>(this->fixed_delta_time);
 }
 
 void LoopTimerManager::set_target_framerate(unsigned fps) {
@@ -53,7 +54,7 @@ void LoopTimerManager::set_target_framerate(unsigned fps) {
 	//check if fps is lower or equals 0
 	if (fps <= 0) return;
 	// target time per frame in seconds
-	this->frame_target_time = Duration_t(1s) / this->target_fps;
+	this->frame_target_time = duration_t(1s) / this->target_fps;
 }
 
 unsigned LoopTimerManager::get_fps() const { return this->actual_fps; }
@@ -63,32 +64,30 @@ void LoopTimerManager::set_time_scale(double value) { this->time_scale = value;
 float LoopTimerManager::get_time_scale() const { return this->time_scale; }
 
 void LoopTimerManager::enforce_frame_rate() {
-	TimePoint_t current_frame_time
-		= std::chrono::steady_clock::now();
-	Duration_t frame_duration = current_frame_time - this->last_frame_time;
+	time_point_t current_frame_time = std::chrono::steady_clock::now();
+	duration_t frame_duration = current_frame_time - this->last_frame_time;
+
 	// Check if frame duration is less than the target frame time
 	if (frame_duration < this->frame_target_time) {
-		std::chrono::microseconds delay_time
-			= std::chrono::duration_cast<std::chrono::microseconds>(this->frame_target_time
-																	- frame_duration);
-
-		if (delay_time.count() > 0) {
+		duration_t delay_time = this->frame_target_time - frame_duration;
+		if (delay_time > 0s) {
 			std::this_thread::sleep_for(delay_time);
 		}
 	}
 }
 
-Duration_t LoopTimerManager::get_lag() const {
-	return (this->elapsed_time - this->elapsed_fixed_time);
+duration_t LoopTimerManager::get_lag() const {
+	return this->elapsed_time - this->elapsed_fixed_time;
 }
 
-Duration_t LoopTimerManager::get_scaled_fixed_delta_time() const {
+duration_t LoopTimerManager::get_scaled_fixed_delta_time() const {
 	return this->fixed_delta_time * this->time_scale;
 }
+
 void LoopTimerManager::set_fixed_delta_time(float seconds) {
-	this->fixed_delta_time = Duration_t(seconds);
+	this->fixed_delta_time = duration_t(seconds);
 }
 
-Duration_t LoopTimerManager::get_fixed_delta_time() const {
+duration_t LoopTimerManager::get_fixed_delta_time() const {
 	return this->fixed_delta_time;
 }
diff --git a/src/crepe/manager/LoopTimerManager.h b/src/crepe/manager/LoopTimerManager.h
index c5f3cb0..ad522f7 100644
--- a/src/crepe/manager/LoopTimerManager.h
+++ b/src/crepe/manager/LoopTimerManager.h
@@ -5,9 +5,10 @@
 #include "Manager.h"
 
 namespace crepe {
-typedef std::chrono::duration<float> Duration_t;
-typedef std::chrono::duration<unsigned long long, std::micro> ElapsedTime_t;
-typedef std::chrono::steady_clock::time_point TimePoint_t;
+
+typedef std::chrono::duration<float> duration_t;
+typedef std::chrono::duration<unsigned long long, std::micro> elapsed_time_t;
+
 /**
  * \brief Manages timing and frame rate for the game loop.
  * 
@@ -30,7 +31,7 @@ public:
 	 * 
 	 * \return Delta time in seconds since the last frame.
 	 */
-	Duration_t get_delta_time() const;
+	duration_t get_delta_time() const;
 
 	/**
 	 * \brief Get the current elapsed time (total time passed )
@@ -40,7 +41,7 @@ public:
 	 *
 	 * \return Elapsed game time in seconds.
 	 */
-	ElapsedTime_t get_elapsed_time() const;
+	elapsed_time_t get_elapsed_time() const;
 
 	/**
 	 * \brief Set the target frames per second (FPS).
@@ -81,7 +82,7 @@ public:
 	 *
 	 * \return The unscaled fixed delta time in seconds.
 	 */
-	Duration_t get_fixed_delta_time() const;
+	duration_t get_fixed_delta_time() const;
 
 	/**
 	 * \brief Set the fixed_delta_time in seconds.
@@ -102,7 +103,7 @@ public:
 	 *
 	 * \return The fixed delta time, scaled by the current time scale, in seconds.
 	 */
-	Duration_t get_scaled_fixed_delta_time() const;
+	duration_t get_scaled_fixed_delta_time() const;
 
 private:
 	//! Friend relation to use start,enforce_frame_rate,get_lag,update,advance_fixed_update.
@@ -128,7 +129,7 @@ private:
 	 *
 	 * \return Accumulated lag in seconds.
 	 */
-	Duration_t get_lag() const;
+	duration_t get_lag() const;
 
 	/**
 	 * \brief Update the timer to the current frame.
@@ -154,20 +155,21 @@ private:
 	//! Time scale for speeding up or slowing down the game (0 = pause, < 1 = slow down, 1 = normal speed, > 1 = speed up).
 	float time_scale = 1;
 	//! Maximum delta time in seconds to avoid large jumps.
-	Duration_t maximum_delta_time{0.25};
+	duration_t maximum_delta_time{0.25};
 	//! Delta time for the current frame in seconds.
-	Duration_t delta_time{0.0};
+	duration_t delta_time{0.0};
 	//! Target time per frame in seconds
-	Duration_t frame_target_time
-		= Duration_t(1.0) / target_fps;
+	duration_t frame_target_time{1.0 / target_fps};
 	//! Fixed delta time for fixed updates in seconds.
-	Duration_t fixed_delta_time = Duration_t(1.0) / 50.0;
+	duration_t fixed_delta_time{1.0 / 50.0};
 	//! Total elapsed game time in microseconds.
-	ElapsedTime_t elapsed_time{0};
+	elapsed_time_t elapsed_time{0};
 	//! Total elapsed time for fixed updates in microseconds.
-	ElapsedTime_t elapsed_fixed_time{0};
+	elapsed_time_t elapsed_fixed_time{0};
+
+	typedef std::chrono::steady_clock::time_point time_point_t;
 	//! Time of the last frame.
-	TimePoint_t last_frame_time;
+	time_point_t last_frame_time;
 };
 
 } // namespace crepe
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index dfb37dc..b529f2c 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -5,17 +5,15 @@
 // TODO: remove these singletons:
 #include "../facade/SDLContext.h"
 
-#include "SaveManager.h"
-
 namespace crepe {
 
 class ComponentManager;
 class SceneManager;
+class EventManager;
+class LoopTimerManager;
 class SaveManager;
 class ResourceManager;
 
-class LoopTimerManager;
-class EventManager;
 /**
  * Struct to pass references to classes that would otherwise need to be singletons down to
  * other classes within the engine hierarchy. Made to prevent constant changes to subclasses to
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index e2e36a5..ffb1bcd 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -1,21 +1,23 @@
 #include <algorithm>
 #include <cmath>
 
-#include "api/LoopTimer.h"
+#include "manager/LoopTimerManager.h"
 #include "manager/ComponentManager.h"
 #include "manager/Mediator.h"
 
 #include "AISystem.h"
 
 using namespace crepe;
+using namespace std::chrono;
 
 void AISystem::update() {
 	const Mediator & mediator = this->mediator;
 	ComponentManager & mgr = mediator.component_manager;
 	RefVector<AI> ai_components = mgr.get_components_by_type<AI>();
+	LoopTimerManager & loop_timer = mediator.loop_timer;
 
 	//TODO: Use fixed loop dt (this is not available at master at the moment)
-	double dt = LoopTimer::get_instance().get_delta_time();
+	duration_t dt = loop_timer.get_delta_time();
 
 	// Loop through all AI components
 	for (AI & ai : ai_components) {
@@ -42,7 +44,7 @@ void AISystem::update() {
 		// Calculate the acceleration (using the above calculated force)
 		vec2 acceleration = force / rigidbody.data.mass;
 		// Finally, update Rigidbody's velocity
-		rigidbody.data.linear_velocity += acceleration * dt;
+		rigidbody.data.linear_velocity += acceleration * duration_cast<seconds>(dt).count();
 	}
 }
 
diff --git a/src/test/LoopTimerTest.cpp b/src/test/LoopTimerTest.cpp
index 1216e5e..f99f109 100644
--- a/src/test/LoopTimerTest.cpp
+++ b/src/test/LoopTimerTest.cpp
@@ -15,6 +15,7 @@ protected:
 
 	void SetUp() override { loop_timer.start(); }
 };
+
 TEST_F(LoopTimerTest, EnforcesTargetFrameRate) {
 	// Set the target FPS to 60 (which gives a target time per frame of ~16.67 ms)
 	loop_timer.set_target_framerate(60);
@@ -28,15 +29,17 @@ TEST_F(LoopTimerTest, EnforcesTargetFrameRate) {
 	// For 60 FPS, the target frame time is around 16.67ms
 	ASSERT_NEAR(elapsed_ms, 16.7, 1);
 }
+
 TEST_F(LoopTimerTest, SetTargetFps) {
 	// Set the target FPS to 120
 	loop_timer.set_target_framerate(120);
 
 	// Calculate the expected frame time (~8.33ms per frame)
-	Duration_t expected_frame_time = std::chrono::duration<float>(1.0 / 120.0);
+	duration_t expected_frame_time = std::chrono::duration<float>(1.0 / 120.0);
 
 	ASSERT_NEAR(loop_timer.frame_target_time.count(), expected_frame_time.count(), 0.001);
 }
+
 TEST_F(LoopTimerTest, DeltaTimeCalculation) {
 	// Set the target FPS to 60 (16.67 ms per frame)
 	loop_timer.set_target_framerate(60);
@@ -46,7 +49,7 @@ TEST_F(LoopTimerTest, DeltaTimeCalculation) {
 	auto end_time = steady_clock::now();
 
 	// Check the delta time
-	Duration_t delta_time = loop_timer.get_delta_time();
+	duration_t delta_time = loop_timer.get_delta_time();
 
 	auto elapsed_time = duration_cast<seconds>(end_time - start_time).count();
 
@@ -68,8 +71,9 @@ TEST_F(LoopTimerTest, getCurrentTime) {
 	auto end_time = steady_clock::now();
 
 	// Get the elapsed time in seconds as a double
-	auto elapsed_time = std::chrono::duration_cast<ElapsedTime_t>(end_time - start_time).count();
+	auto elapsed_time = std::chrono::duration_cast<elapsed_time_t>(end_time - start_time).count();
 
 
 	ASSERT_NEAR(loop_timer.get_elapsed_time().count(), elapsed_time, 5);
 }
+
-- 
cgit v1.2.3


From 68c9e7511ea52c6ee70d052bbdf2923cd68bfa8a Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 11 Dec 2024 15:01:58 +0100
Subject: `make format`

---
 mwe/events/include/event.h             |  2 +-
 src/crepe/api/LoopManager.cpp          |  8 ++++----
 src/crepe/api/LoopManager.h            |  2 +-
 src/crepe/manager/LoopTimerManager.cpp | 14 +++++++-------
 src/crepe/system/AISystem.cpp          |  2 +-
 src/test/LoopTimerTest.cpp             |  5 ++---
 6 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'src/crepe/system')

diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index e1b220b..ee1bf52 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -148,7 +148,7 @@ private:
 };
 class ShutDownEvent : public Event {
 public:
-	ShutDownEvent() : Event("ShutDownEvent"){};
+	ShutDownEvent() : Event("ShutDownEvent") {};
 
 	REGISTER_EVENT_TYPE(ShutDownEvent)
 
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index aa4a21a..b5e5ff7 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -1,4 +1,6 @@
 #include "../facade/SDLContext.h"
+#include "../manager/EventManager.h"
+#include "../manager/LoopTimerManager.h"
 #include "../system/AISystem.h"
 #include "../system/AnimatorSystem.h"
 #include "../system/AudioSystem.h"
@@ -8,8 +10,6 @@
 #include "../system/PhysicsSystem.h"
 #include "../system/RenderSystem.h"
 #include "../system/ScriptSystem.h"
-#include "../manager/EventManager.h"
-#include "../manager/LoopTimerManager.h"
 #include "../util/Log.h"
 
 #include "LoopManager.h"
@@ -54,7 +54,7 @@ void LoopManager::loop() {
 			this->frame_update();
 			this->loop_timer.enforce_frame_rate();
 		}
-	}catch(const exception & e){
+	} catch (const exception & e) {
 		Log::logf(Log::Level::ERROR, "Exception caught in main loop: {}", e.what());
 		this->event_manager.trigger_event<ShutDownEvent>(ShutDownEvent{});
 	}
@@ -72,7 +72,7 @@ void LoopManager::fixed_update() {
 }
 
 // will be called every frame
-void LoopManager::frame_update() { 
+void LoopManager::frame_update() {
 	this->scene_manager.load_next_scene();
 	this->get_system<AnimatorSystem>().update();
 	//render
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 0110695..487f07a 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -69,6 +69,7 @@ private:
 
 	//! Indicates whether the game is running.
 	bool game_running = false;
+
 private:
 	//! Global context
 	Mediator mediator;
@@ -90,7 +91,6 @@ private:
 	SDLContext & sdl_context = SDLContext::get_instance();
 
 private:
-	
 	/**
 	 * \brief Callback function for ShutDownEvent
 	 *
diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp
index 92a2150..ccca950 100644
--- a/src/crepe/manager/LoopTimerManager.cpp
+++ b/src/crepe/manager/LoopTimerManager.cpp
@@ -24,8 +24,7 @@ void LoopTimerManager::start() {
 }
 
 void LoopTimerManager::update() {
-	time_point_t current_frame_time
-		= std::chrono::steady_clock::now();
+	time_point_t current_frame_time = std::chrono::steady_clock::now();
 	// Convert to duration in seconds for delta time
 	this->delta_time = current_frame_time - last_frame_time;
 
@@ -41,12 +40,15 @@ void LoopTimerManager::update() {
 	this->last_frame_time = current_frame_time;
 }
 
-duration_t LoopTimerManager::get_delta_time() const {return this->delta_time * this->time_scale;}
+duration_t LoopTimerManager::get_delta_time() const {
+	return this->delta_time * this->time_scale;
+}
 
 elapsed_time_t LoopTimerManager::get_elapsed_time() const { return this->elapsed_time; }
 
 void LoopTimerManager::advance_fixed_elapsed_time() {
-	this->elapsed_fixed_time += std::chrono::duration_cast<elapsed_time_t>(this->fixed_delta_time);
+	this->elapsed_fixed_time
+		+= std::chrono::duration_cast<elapsed_time_t>(this->fixed_delta_time);
 }
 
 void LoopTimerManager::set_target_framerate(unsigned fps) {
@@ -88,6 +90,4 @@ void LoopTimerManager::set_fixed_delta_time(float seconds) {
 	this->fixed_delta_time = duration_t(seconds);
 }
 
-duration_t LoopTimerManager::get_fixed_delta_time() const {
-	return this->fixed_delta_time;
-}
+duration_t LoopTimerManager::get_fixed_delta_time() const { return this->fixed_delta_time; }
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index ffb1bcd..ed22203 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -1,8 +1,8 @@
 #include <algorithm>
 #include <cmath>
 
-#include "manager/LoopTimerManager.h"
 #include "manager/ComponentManager.h"
+#include "manager/LoopTimerManager.h"
 #include "manager/Mediator.h"
 
 #include "AISystem.h"
diff --git a/src/test/LoopTimerTest.cpp b/src/test/LoopTimerTest.cpp
index f99f109..5e1eccf 100644
--- a/src/test/LoopTimerTest.cpp
+++ b/src/test/LoopTimerTest.cpp
@@ -71,9 +71,8 @@ TEST_F(LoopTimerTest, getCurrentTime) {
 	auto end_time = steady_clock::now();
 
 	// Get the elapsed time in seconds as a double
-	auto elapsed_time = std::chrono::duration_cast<elapsed_time_t>(end_time - start_time).count();
-
+	auto elapsed_time
+		= std::chrono::duration_cast<elapsed_time_t>(end_time - start_time).count();
 
 	ASSERT_NEAR(loop_timer.get_elapsed_time().count(), elapsed_time, 5);
 }
-
-- 
cgit v1.2.3


From 045c263f5bc432ff0758dd0928e4a0f5e5eed85d Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 11 Dec 2024 15:46:17 +0100
Subject: updated the code so that get_events() calculates pixel units to game
 units

---
 src/crepe/facade/SDLContext.cpp   | 43 +++++++++------------------------------
 src/crepe/facade/SDLContext.h     | 27 ++++++++++++------------
 src/crepe/system/RenderSystem.cpp | 23 +++++++++------------
 src/crepe/system/RenderSystem.h   | 10 +++------
 4 files changed, 37 insertions(+), 66 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 297763d..8597f06 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -1,6 +1,5 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_pixels.h>
-#include <SDL2/SDL_ttf.h>
 #include <SDL2/SDL_blendmode.h>
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_keycode.h>
@@ -64,10 +63,6 @@ SDLContext::SDLContext() {
 	if (!(IMG_Init(img_flags) & img_flags)) {
 		throw runtime_error("SDLContext: SDL_image could not initialize!");
 	}
-
-	if (TTF_Init() != 0) {
-		throw runtime_error("SDLContext: TTF could not initialize!");
-	}
 }
 
 SDLContext::~SDLContext() {
@@ -79,7 +74,6 @@ SDLContext::~SDLContext() {
 	// TODO: how are we going to ensure that these are called from the same
 	// thread that SDL_Init() was called on? This has caused problems for me
 	// before.
-	TTF_Quit();
 	IMG_Quit();
 	SDL_Quit();
 }
@@ -249,14 +243,12 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 		size.y = data.size.x / ctx.sprite.aspect_ratio;
 	}
 
-	const CameraValues & cam = ctx.cam;
-
-	size *= cam.render_scale * ctx.img_scale * data.scale_offset;
+	size *= cam_aux_data.render_scale * ctx.img_scale * data.scale_offset;
 
 	vec2 screen_pos
-		= (ctx.pos + data.position_offset - cam.cam_pos + (cam.zoomed_viewport) / 2)
-			  * cam.render_scale
-		  - size / 2 + cam.bar_size;
+		= (ctx.pos + data.position_offset - cam_aux_data.cam_pos + (cam_aux_data.zoomed_viewport) / 2)
+			  * cam_aux_data.render_scale
+		  - size / 2 + cam_aux_data.bar_size;
 
 	return SDL_FRect{
 		.x = screen_pos.x,
@@ -276,7 +268,6 @@ void SDLContext::draw(const RenderContext & ctx) {
 	SDL_Rect srcrect = this->get_src_rect(ctx.sprite);
 	SDL_FRect dstrect = this->get_dst_rect(SDLContext::DestinationRectangleData{
 		.sprite = ctx.sprite,
-		.cam = ctx.cam,
 		.pos = ctx.pos,
 		.img_scale = ctx.scale,
 	});
@@ -288,7 +279,7 @@ void SDLContext::draw(const RenderContext & ctx) {
 					  &dstrect, angle, NULL, render_flip);
 }
 
-SDLContext::CameraValues & SDLContext::set_camera(const Camera & cam) {
+void SDLContext::update_camera_view(const Camera & cam, const vec2 & new_pos) {
 
 	const Camera::Data & cam_data = cam.data;
 	// resize window
@@ -298,9 +289,10 @@ SDLContext::CameraValues & SDLContext::set_camera(const Camera & cam) {
 		SDL_SetWindowSize(this->game_window.get(), cam.screen.x, cam.screen.y);
 	}
 
-	vec2 & zoomed_viewport = this->camera_val.zoomed_viewport;
-	vec2 & bar_size = this->camera_val.bar_size;
-	vec2 & render_scale = this->camera_val.render_scale;
+	vec2 & zoomed_viewport = this->cam_aux_data.zoomed_viewport;
+	vec2 & bar_size = this->cam_aux_data.bar_size;
+	vec2 & render_scale = this->cam_aux_data.render_scale;
+	this->cam_aux_data.cam_pos = new_pos;
 
 	zoomed_viewport = cam.viewport_size * cam_data.zoom;
 	float screen_aspect = static_cast<float>(cam.screen.x) / cam.screen.y;
@@ -342,8 +334,6 @@ SDLContext::CameraValues & SDLContext::set_camera(const Camera & cam) {
 
 	// fill bg color
 	SDL_RenderFillRect(this->game_renderer.get(), &bg);
-
-	return this->camera_val;
 }
 
 uint64_t SDLContext::get_ticks() const { return SDL_GetTicks64(); }
@@ -372,19 +362,6 @@ SDLContext::texture_from_path(const std::string & path) {
 	return img_texture;
 }
 
-std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>>
-SDLContext::font_from_path(const std::string & path) {
-
-	TTF_Font * lib_font = TTF_OpenFont(path.c_str(), 72);
-	if (!lib_font) {
-		throw runtime_error(format("SDLContext: font cannot be load from {}", path));
-	}
-	std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>> font;
-	font = {lib_font, [](TTF_Font * f){}};
-
-	return font;
-}
-
 ivec2 SDLContext::get_size(const Texture & ctx) {
 	ivec2 size;
 	SDL_QueryTexture(ctx.texture.get(), NULL, NULL, &size.x, &size.y);
@@ -396,7 +373,7 @@ void SDLContext::delay(int ms) const { SDL_Delay(ms); }
 std::vector<SDLContext::EventData> SDLContext::get_events() {
 	std::vector<SDLContext::EventData> event_list;
 	SDL_Event event;
-	const CameraValues & cam = this->camera_val;
+	const CameraAuxiliaryData & cam = this->cam_aux_data;
 	while (SDL_PollEvent(&event)) {
 		ivec2 mouse_pos;
 		mouse_pos.x = (event.button.x - cam.bar_size.x) / cam.render_scale.x;
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index b847c72..6d50ab0 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -4,7 +4,6 @@
 #include <SDL2/SDL_keycode.h>
 #include <SDL2/SDL_rect.h>
 #include <SDL2/SDL_render.h>
-#include <SDL2/SDL_ttf.h>
 #include <SDL2/SDL_video.h>
 #include <cmath>
 #include <functional>
@@ -33,7 +32,7 @@ class InputSystem;
 class SDLContext {
 public:
 	//! data that the camera component cannot hold
-	struct CameraValues {
+	struct CameraAuxiliaryData {
 
 		//! zoomed in viewport in game_units
 		vec2 zoomed_viewport;
@@ -63,7 +62,6 @@ public:
 	//! rendering data needed to render on screen
 	struct RenderContext {
 		const Sprite & sprite;
-		const CameraValues & cam;
 		const vec2 & pos;
 		const double & angle;
 		const double & scale;
@@ -189,9 +187,6 @@ private:
 	 */
 	ivec2 get_size(const Texture & ctx);
 
-	std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>>
-	font_from_path(const std::string & path);
-
 private:
 	//! Will use draw,clear_screen, present_screen, camera.
 	friend class RenderSystem;
@@ -202,8 +197,6 @@ private:
 	 */
 	void draw(const RenderContext & ctx);
 
-	void draw_text(const 
-
 	//! Clears the screen, preparing for a new frame.
 	void clear_screen();
 
@@ -211,16 +204,19 @@ private:
 	void present_screen();
 
 	/**
-	 * \brief sets the background of the camera (will be adjusted in future PR)
-	 * \param camera Reference to the Camera object.
+	 * \brief calculates camera view settings. such as black_bars, zoomed_viewport, scaling and
+	 * adjusting window size.
+	 *
+	 * \note only supports windowed mode.
+	 * \param camera Reference to the current Camera object in the scene.
+	 * \param new_pos new camera position from transform and offset
 	 */
-	CameraValues & set_camera(const Camera & camera);
+	void update_camera_view(const Camera & camera, const vec2 & new_pos);
 
 private:
 	//! the data needed to construct a sdl dst rectangle
 	struct DestinationRectangleData {
 		const Sprite & sprite;
-		const CameraValues & cam;
 		const vec2 & pos;
 		const double & img_scale;
 	};
@@ -261,7 +257,12 @@ private:
 	//! black bars rectangle to draw
 	SDL_FRect black_bars[2] = {};
 
-	CameraValues camera_val;
+	/**
+	 * \cam_aux_data extra data that the component cannot hold.
+	 *
+	 * - this is defined in this class because get_events() needs this information aswell
+	 */
+	CameraAuxiliaryData cam_aux_data;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 74fed26..1ce9059 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -11,6 +11,7 @@
 #include "../api/Transform.h"
 #include "../facade/SDLContext.h"
 #include "../manager/ComponentManager.h"
+#include "types.h"
 
 #include "RenderSystem.h"
 
@@ -27,7 +28,7 @@ void RenderSystem::present_screen() {
 	ctx.present_screen();
 }
 
-SDLContext::CameraValues & RenderSystem::update_camera() {
+void RenderSystem::update_camera() {
 	ComponentManager & mgr = this->mediator.component_manager;
 	SDLContext & ctx = this->mediator.sdl_context;
 	RefVector<Camera> cameras = mgr.get_components_by_type<Camera>();
@@ -38,9 +39,9 @@ SDLContext::CameraValues & RenderSystem::update_camera() {
 		if (!cam.active) continue;
 		const Transform & transform
 			= mgr.get_components_by_id<Transform>(cam.game_object_id).front().get();
-		SDLContext::CameraValues & cam_val = ctx.set_camera(cam);
-		cam_val.cam_pos = transform.position + cam.data.postion_offset;
-		return cam_val;
+		vec2 new_camera_pos = transform.position + cam.data.postion_offset;
+		ctx.update_camera_view(cam, new_camera_pos);
+		return;
 	}
 	throw std::runtime_error("No active cameras in current scene");
 }
@@ -67,8 +68,7 @@ void RenderSystem::update() {
 	this->present_screen();
 }
 
-bool RenderSystem::render_particle(const Sprite & sprite, const SDLContext::CameraValues & cam,
-								   const double & scale) {
+bool RenderSystem::render_particle(const Sprite & sprite, const double & scale) {
 
 	ComponentManager & mgr = this->mediator.component_manager;
 	SDLContext & ctx = this->mediator.sdl_context;
@@ -88,7 +88,6 @@ bool RenderSystem::render_particle(const Sprite & sprite, const SDLContext::Came
 
 			ctx.draw(SDLContext::RenderContext{
 				.sprite = sprite,
-				.cam = cam,
 				.pos = p.position,
 				.angle = p.angle,
 				.scale = scale,
@@ -97,12 +96,10 @@ bool RenderSystem::render_particle(const Sprite & sprite, const SDLContext::Came
 	}
 	return rendering_particles;
 }
-void RenderSystem::render_normal(const Sprite & sprite, const SDLContext::CameraValues & cam,
-								 const Transform & tm) {
+void RenderSystem::render_normal(const Sprite & sprite, const Transform & tm) {
 	SDLContext & ctx = this->mediator.sdl_context;
 	ctx.draw(SDLContext::RenderContext{
 		.sprite = sprite,
-		.cam = cam,
 		.pos = tm.position,
 		.angle = tm.rotation,
 		.scale = tm.scale,
@@ -111,7 +108,7 @@ void RenderSystem::render_normal(const Sprite & sprite, const SDLContext::Camera
 
 void RenderSystem::render() {
 	ComponentManager & mgr = this->mediator.component_manager;
-	const SDLContext::CameraValues & cam = this->update_camera();
+	this->update_camera();
 
 	RefVector<Sprite> sprites = mgr.get_components_by_type<Sprite>();
 	RefVector<Sprite> sorted_sprites = this->sort(sprites);
@@ -121,10 +118,10 @@ void RenderSystem::render() {
 		const Transform & transform
 			= mgr.get_components_by_id<Transform>(sprite.game_object_id).front().get();
 
-		bool rendered_particles = this->render_particle(sprite, cam, transform.scale);
+		bool rendered_particles = this->render_particle(sprite, transform.scale);
 
 		if (rendered_particles) continue;
 
-		this->render_normal(sprite, cam, transform);
+		this->render_normal(sprite, transform);
 	}
 }
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index de26aa8..8e61072 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -2,8 +2,6 @@
 
 #include <cmath>
 
-#include "facade/SDLContext.h"
-
 #include "System.h"
 #include "types.h"
 
@@ -37,7 +35,7 @@ private:
 	void present_screen();
 
 	//! Updates the active camera used for rendering.
-	SDLContext::CameraValues & update_camera();
+	void update_camera();
 
 	//! Renders the whole screen
 	void render();
@@ -52,8 +50,7 @@ private:
 	 *  constructor is now protected i cannot make tmp inside
 	 * \return true if particles have been rendered
 	 */
-	bool render_particle(const Sprite & sprite, const SDLContext::CameraValues & cam,
-						 const double & scale);
+	bool render_particle(const Sprite & sprite, const double & scale);
 
 	/**
 	 * \brief renders a sprite with a Transform component on the screen
@@ -61,8 +58,7 @@ private:
 	 * \param sprite  the sprite component that holds all the data
 	 * \param tm the Transform component that holds the position,rotation and scale
 	 */
-	void render_normal(const Sprite & sprite, const SDLContext::CameraValues & cam,
-					   const Transform & tm);
+	void render_normal(const Sprite & sprite, const Transform & tm);
 
 	/**
 	 * \brief sort a vector sprite objects with
-- 
cgit v1.2.3


From 2153593f3a684a6b771c98a8e0c385b50a1e8886 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 11 Dec 2024 16:09:21 +0100
Subject: implemented feedback

---
 src/crepe/api/Animator.cpp          |  6 +++---
 src/crepe/api/Animator.h            |  8 ++++----
 src/crepe/api/Config.h              |  2 +-
 src/crepe/api/LoopManager.h         |  7 ++-----
 src/crepe/api/LoopTimer.h           |  2 --
 src/crepe/facade/SDLContext.cpp     | 30 ++++++++++++++----------------
 src/crepe/facade/SDLContext.h       | 12 +-----------
 src/crepe/facade/Texture.h          |  3 ---
 src/crepe/system/AnimatorSystem.cpp |  2 +-
 9 files changed, 26 insertions(+), 46 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 644363e..4ce4bf0 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -8,10 +8,10 @@
 using namespace crepe;
 
 Animator::Animator(game_object_id_t id, Sprite & spritesheet, const ivec2 & single_frame_size,
-				   const uvec2 & max_cell_size, const Animator::Data & data)
+				   const uvec2 & grid_size, const Animator::Data & data)
 	: Component(id),
 	  spritesheet(spritesheet),
-	  max_cell_size(max_cell_size),
+	  grid_size(grid_size),
 	  data(data) {
 	dbg_trace();
 
@@ -52,6 +52,6 @@ void Animator::set_anim(int col) {
 
 void Animator::next_anim() {
 	Animator::Data & ctx = this->data;
-	ctx.row = ctx.row++ % this->max_cell_size.x;
+	ctx.row = ctx.row++ % this->grid_size.x;
 	this->spritesheet.mask.x = ctx.row * this->spritesheet.mask.w;
 }
diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index 09f0134..5918800 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -77,14 +77,14 @@ public:
 	 * \param spritesheet the reference to the spritesheet
 	 * \param single_frame_size the width and height in pixels of a single frame inside the
 	 * spritesheet
-	 * \param max_cell_size the max rows and columns inside the given spritesheet
+	 * \param grid_size the max rows and columns inside the given spritesheet
 	 * \param data extra animation data for more control
 	 *
 	 * This constructor sets up the Animator with the given parameters, and initializes the
 	 * animation system.
 	 */
 	Animator(game_object_id_t id, Sprite & spritesheet, const ivec2 & single_frame_size,
-			 const uvec2 & max_cell_size, const Animator::Data & data);
+			 const uvec2 & grid_size, const Animator::Data & data);
 	~Animator(); // dbg_trace
 
 public:
@@ -94,8 +94,8 @@ private:
 	//! A reference to the Sprite sheet containing.
 	Sprite & spritesheet;
 
-	//! The maximum number of rows and columns size
-	const uvec2 max_cell_size;
+	//! The maximum number of rows and columns inside the spritesheet
+	const uvec2 grid_size;
 
 	//! Uses the spritesheet
 	friend AnimatorSystem;
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 73c9a4e..6472270 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -26,7 +26,7 @@ struct Config final {
 		 *
 		 * Only messages with equal or higher priority than this value will be logged.
 		 */
-		Log::Level level = Log::Level::TRACE;
+		Log::Level level = Log::Level::INFO;
 		/**
 		 * \brief Colored log output
 		 *
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index bf1a9f9..1bafa56 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -102,12 +102,9 @@ private:
 	ResourceManager resource_manager{mediator};
 	//! Save manager instance
 	SaveManager save_manager{mediator};
-
+	//! SDLContext instance
 	SDLContext sdl_context{mediator};
-
-	ResourceManager res_man{mediator};
-
-	//! Loop timer \todo no more singletons!
+	//! LoopTimer instance
 	LoopTimer loop_timer{mediator};
 
 private:
diff --git a/src/crepe/api/LoopTimer.h b/src/crepe/api/LoopTimer.h
index 2a0b2a5..0a73a4c 100644
--- a/src/crepe/api/LoopTimer.h
+++ b/src/crepe/api/LoopTimer.h
@@ -5,8 +5,6 @@
 
 namespace crepe {
 
-class Mediator;
-
 class LoopTimer : public Manager {
 public:
 	/**
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 1699b53..1dbd6a5 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -11,7 +11,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
-#include <iostream>
 #include <memory>
 #include <stdexcept>
 
@@ -20,7 +19,6 @@
 #include "../api/Config.h"
 #include "../api/Sprite.h"
 #include "../util/Log.h"
-#include "manager/Manager.h"
 #include "manager/Mediator.h"
 
 #include "SDLContext.h"
@@ -30,9 +28,8 @@
 using namespace crepe;
 using namespace std;
 
-SDLContext::SDLContext(Mediator & mediator) : Manager(mediator) {
+SDLContext::SDLContext(Mediator & mediator) {
 	dbg_trace();
-	mediator.sdl_context = *this;
 	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
 		throw runtime_error(format("SDLContext: SDL_Init error: {}", SDL_GetError()));
 	}
@@ -60,6 +57,8 @@ SDLContext::SDLContext(Mediator & mediator) : Manager(mediator) {
 	if (!(IMG_Init(img_flags) & img_flags)) {
 		throw runtime_error("SDLContext: SDL_image could not initialize!");
 	}
+
+	mediator.sdl_context = *this;
 }
 
 SDLContext::~SDLContext() {
@@ -219,16 +218,6 @@ void SDLContext::present_screen() {
 	SDL_RenderPresent(this->game_renderer.get());
 }
 
-SDL_Rect * SDLContext::get_src_rect(const Sprite & sprite) {
-	if (sprite.mask.w == 0 && sprite.mask.h == 0) return NULL;
-
-	this->mask.x = sprite.mask.x;
-	this->mask.y = sprite.mask.y;
-	this->mask.w = sprite.mask.w;
-	this->mask.h = sprite.mask.h;
-	return &this->mask;
-}
-
 SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 
 	const Sprite::Data & data = ctx.sprite.data;
@@ -267,7 +256,16 @@ void SDLContext::draw(const RenderContext & ctx) {
 		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * data.flip.flip_x)
 							  | (SDL_FLIP_VERTICAL * data.flip.flip_y));
 
-	SDL_Rect * srcrect = this->get_src_rect(ctx.sprite);
+	SDL_Rect srcrect;
+	SDL_Rect * srcrect_ptr = NULL;
+	if (ctx.sprite.mask.w != 0 || ctx.sprite.mask.h != 0) {
+		srcrect.w = ctx.sprite.mask.w;
+		srcrect.h = ctx.sprite.mask.h;
+		srcrect.x = ctx.sprite.mask.x;
+		srcrect.y = ctx.sprite.mask.y;
+		srcrect_ptr = &srcrect;
+	}
+
 	SDL_FRect dstrect = this->get_dst_rect(SDLContext::DestinationRectangleData{
 		.sprite = ctx.sprite,
 		.texture = ctx.texture,
@@ -279,7 +277,7 @@ void SDLContext::draw(const RenderContext & ctx) {
 	double angle = ctx.angle + data.angle_offset;
 
 	this->set_color_texture(ctx.texture, ctx.sprite.data.color);
-	SDL_RenderCopyExF(this->game_renderer.get(), ctx.texture.get_img(), srcrect, &dstrect,
+	SDL_RenderCopyExF(this->game_renderer.get(), ctx.texture.get_img(), srcrect_ptr, &dstrect,
 					  angle, NULL, render_flip);
 }
 
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 36e6e97..46b779f 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -15,7 +15,6 @@
 #include "api/KeyCodes.h"
 #include "api/Sprite.h"
 #include "api/Transform.h"
-#include "manager/Manager.h"
 
 #include "types.h"
 
@@ -31,7 +30,7 @@ class Mediator;
  * SDLContext is a singleton that handles the SDL window and renderer, provides methods for
  * event handling, and rendering to the screen. It is never used directly by the user
  */
-class SDLContext : public Manager {
+class SDLContext {
 public:
 	//! data that the camera component cannot hold
 	struct CameraValues {
@@ -209,13 +208,6 @@ public:
 		const vec2 & pos;
 		const double & img_scale;
 	};
-	/**
-	 * \brief calculates the sqaure size of the image
-	 *
-	 * \param sprite Reference to the sprite to calculate the rectangle
-	 * \return sdl rectangle to draw a src image
-	 */
-	SDL_Rect * get_src_rect(const Sprite & sprite);
 
 	/**
 	 * \brief calculates the sqaure size of the image for destination
@@ -239,8 +231,6 @@ private:
 	//! renderer for the crepe engine
 	std::unique_ptr<SDL_Renderer, std::function<void(SDL_Renderer *)>> game_renderer;
 
-	SDL_Rect mask = {};
-
 	//! black bars rectangle to draw
 	SDL_FRect black_bars[2] = {};
 };
diff --git a/src/crepe/facade/Texture.h b/src/crepe/facade/Texture.h
index 255e14b..cdacac4 100644
--- a/src/crepe/facade/Texture.h
+++ b/src/crepe/facade/Texture.h
@@ -1,8 +1,5 @@
 #pragma once
 
-// FIXME: this header can't be included because this is an API header, and SDL2 development
-// headers won't be bundled with crepe. Why is this facade in the API namespace?
-
 #include <SDL2/SDL_render.h>
 #include <memory>
 
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index bb22b62..d61ba35 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -23,7 +23,7 @@ void AnimatorSystem::update() {
 
 		int last_frame = ctx.row;
 
-		int cycle_end = (ctx.cycle_end == -1) ? a.max_cell_size.x : ctx.cycle_end;
+		int cycle_end = (ctx.cycle_end == -1) ? a.grid_size.x : ctx.cycle_end;
 		int total_frames = cycle_end - ctx.cycle_start;
 
 		int curr_frame = static_cast<int>(elapsed_time / frame_duration) % total_frames;
-- 
cgit v1.2.3


From bcb2e9d7a802680598085ad04ac06926f1e448a2 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 11 Dec 2024 16:12:46 +0100
Subject: reverted to master

---
 src/crepe/manager/EventManager.cpp |  2 --
 src/crepe/manager/SceneManager.cpp |  3 ---
 src/crepe/system/ScriptSystem.cpp  |  2 +-
 src/test/CMakeLists.txt            |  2 +-
 src/test/Profiling.cpp             | 16 ++++++----------
 5 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/manager/EventManager.cpp b/src/crepe/manager/EventManager.cpp
index 17fe528..20f0dd3 100644
--- a/src/crepe/manager/EventManager.cpp
+++ b/src/crepe/manager/EventManager.cpp
@@ -1,11 +1,9 @@
 #include "EventManager.h"
-#include "util/Log.h"
 
 using namespace crepe;
 using namespace std;
 
 EventManager & EventManager::get_instance() {
-	dbg_trace();
 	static EventManager instance;
 	return instance;
 }
diff --git a/src/crepe/manager/SceneManager.cpp b/src/crepe/manager/SceneManager.cpp
index a788c51..50a9fbb 100644
--- a/src/crepe/manager/SceneManager.cpp
+++ b/src/crepe/manager/SceneManager.cpp
@@ -4,13 +4,10 @@
 #include "ComponentManager.h"
 #include "SceneManager.h"
 
-#include "util/Log.h"
-
 using namespace crepe;
 using namespace std;
 
 SceneManager::SceneManager(Mediator & mediator) : Manager(mediator) {
-	dbg_trace();
 	mediator.scene_manager = *this;
 }
 
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index df358e6..d6b2ca1 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -8,7 +8,7 @@ using namespace std;
 using namespace crepe;
 
 void ScriptSystem::update() {
-	//dbg_trace();
+	dbg_trace();
 
 	ComponentManager & mgr = this->mediator.component_manager;
 	RefVector<BehaviorScript> behavior_scripts = mgr.get_components_by_type<BehaviorScript>();
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 15937af..7196404 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -15,7 +15,7 @@ target_sources(test_main PUBLIC
 	ValueBrokerTest.cpp
 	DBTest.cpp
 	Vector2Test.cpp
-	#InputTest.cpp
+	InputTest.cpp
 	ScriptEventTest.cpp
 	ScriptSceneTest.cpp
 	Profiling.cpp
diff --git a/src/test/Profiling.cpp b/src/test/Profiling.cpp
index 46da378..c753bca 100644
--- a/src/test/Profiling.cpp
+++ b/src/test/Profiling.cpp
@@ -1,6 +1,4 @@
-#include "facade/SDLContext.h"
 #include "manager/Mediator.h"
-#include "manager/ResourceManager.h"
 #include "system/ParticleSystem.h"
 #include "system/PhysicsSystem.h"
 #include "system/RenderSystem.h"
@@ -43,7 +41,7 @@ class TestScript : public Script {
 	}
 };
 
-class ProfilingTest : public Test {
+class DISABLED_ProfilingTest : public Test {
 public:
 	// Config for test
 	// Minimum amount to let test pass
@@ -63,8 +61,6 @@ public:
 	ParticleSystem particle_sys{m};
 	RenderSystem render_sys{m};
 	ScriptSystem script_sys{m};
-	SDLContext ctx{m};
-	ResourceManager resource_manager{m};
 
 	// Test data
 	std::map<std::string, std::chrono::microseconds> timings;
@@ -134,7 +130,7 @@ public:
 	}
 };
 
-TEST_F(ProfilingTest, Profiling_1) {
+TEST_F(DISABLED_ProfilingTest, Profiling_1) {
 	while (this->total_time / this->average < this->duration) {
 
 		{
@@ -157,7 +153,7 @@ TEST_F(ProfilingTest, Profiling_1) {
 	EXPECT_GE(this->game_object_count, this->min_gameobject_count);
 }
 
-TEST_F(ProfilingTest, Profiling_2) {
+TEST_F(DISABLED_ProfilingTest, Profiling_2) {
 	while (this->total_time / this->average < this->duration) {
 
 		{
@@ -171,7 +167,7 @@ TEST_F(ProfilingTest, Profiling_2) {
 			gameobject.add_component<BoxCollider>(vec2{0, 0}, vec2{1, 1});
 
 			gameobject.add_component<BehaviorScript>().set_script<TestScript>();
-			auto img = Asset("asset/texture/square.png");
+			auto img = Texture("asset/texture/square.png");
 			Sprite & test_sprite = gameobject.add_component<Sprite>(
 				img, Sprite::Data{
 						 .color = {0, 0, 0, 0},
@@ -196,7 +192,7 @@ TEST_F(ProfilingTest, Profiling_2) {
 	EXPECT_GE(this->game_object_count, this->min_gameobject_count);
 }
 
-TEST_F(ProfilingTest, Profiling_3) {
+TEST_F(DISABLED_ProfilingTest, Profiling_3) {
 	while (this->total_time / this->average < this->duration) {
 
 		{
@@ -209,7 +205,7 @@ TEST_F(ProfilingTest, Profiling_3) {
 			});
 			gameobject.add_component<BoxCollider>(vec2{0, 0}, vec2{1, 1});
 			gameobject.add_component<BehaviorScript>().set_script<TestScript>();
-			auto img = Asset("asset/texture/square.png");
+			auto img = Texture("asset/texture/square.png");
 			Sprite & test_sprite = gameobject.add_component<Sprite>(
 				img, Sprite::Data{
 						 .color = {0, 0, 0, 0},
-- 
cgit v1.2.3


From 0369f5b46c16190137b08280858d3376eb0223e5 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 11 Dec 2024 19:36:16 +0100
Subject: include order fixed

---
 src/crepe/system/RenderSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 7de2673..c2c9fdd 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -13,8 +13,8 @@
 #include "../facade/Texture.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/ResourceManager.h"
-#include "types.h"
 
+#include "types.h"
 #include "RenderSystem.h"
 
 using namespace crepe;
-- 
cgit v1.2.3


From 9732dd4d51fa4a5115b639b090cca96574719380 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 11 Dec 2024 19:36:41 +0100
Subject: make format

---
 src/crepe/system/RenderSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index c2c9fdd..afd9548 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -14,8 +14,8 @@
 #include "../manager/ComponentManager.h"
 #include "../manager/ResourceManager.h"
 
-#include "types.h"
 #include "RenderSystem.h"
+#include "types.h"
 
 using namespace crepe;
 using namespace std;
-- 
cgit v1.2.3


From 942fd5adcd3e7f73404601933359d22587843f25 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 11 Dec 2024 19:55:27 +0100
Subject: removed \class rendersystem

---
 src/crepe/system/RenderSystem.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index 8e61072..fc7b46e 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -12,7 +12,6 @@ class Sprite;
 class Transform;
 
 /**
- * \class RenderSystem
  * \brief Manages rendering operations for all game objects.
  *
  * RenderSystem is responsible for rendering, clearing and presenting the screen, and
-- 
cgit v1.2.3