Merge branch 'master' into niels/rendering_fixes

13 files changed, 125 insertions, 113 deletions

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
index 305922c..40153c9 100644
--- a/src/crepe/api/Button.cpp
+++ b/src/crepe/api/Button.cpp
@@ -2,9 +2,7 @@
 
 namespace crepe {
 
-Button::Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
-			   const std::function<void()> & on_click)
-	: UIObject(id, dimensions, offset),
-	  on_click(on_click) {}
+Button::Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset)
+	: UIObject(id, dimensions, offset) {}
 
 } // namespace crepe
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 08f5dec..d42527e 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -2,11 +2,23 @@
 
 #include <functional>
 
+#include "Event.h"
 #include "UIObject.h"
 
 namespace crepe {
 
-//! Represents a clickable UI button, derived from the UiObject class.
+/**
+ * \brief Button component.
+ * 
+ * This component creates a clickable surface at the transform location with the specified width and height.
+ * 
+ * The Button can be used in scripts by subscribing a EventHandler to the following events:
+ * - ButtonPressEvent
+ * - ButtonEnterEvent
+ * - ButtonExitEvent
+ * \see EventManager
+ * 
+ */
 class Button : public UIObject {
 public:
 	/**
@@ -15,43 +27,22 @@ public:
 	 * \param id The unique ID of the game object associated with this button.
 	 * \param dimensions The width and height of the UIObject
 	 * \param offset The offset relative this GameObjects Transform
-	 * \param on_click callback function that will be invoked when the button is clicked.
 	 */
-	Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
-		   const std::function<void()> & on_click);
-
-	// TODO: create separate toggle button class
-	/**
-	 * \brief The callback function to be executed when the button is clicked.
-	 *
-	 * This function is invoked whenever the button is clicked. It can be set to any
-	 * function that matches the signature `void()`.
-	 */
-	std::function<void()> on_click = nullptr;
-
+	Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset);
 	/**
-	 * \brief Callback function to be executed when the mouse enters the button's boundaries.
+	 * \brief Get the maximum number of instances for this component
 	 *
-	 * This function is triggered when the mouse cursor moves over the button, allowing
-	 * custom actions like visual effects, highlighting, or sound effects.
+	 * Since the button Event transfers the GameObject Metadata it will be the same for each button so only one button is allowed per GameObject	
+	 * 
+	 * \return 1
 	 */
-	std::function<void()> on_mouse_enter = nullptr;
-
-	/**
-	 * \brief Callback function to be executed when the mouse exits the button's boundaries.
-	 *
-	 * This function is triggered when the mouse cursor moves out of the button's area,
-	 * allowing custom actions like resetting visual effects or playing exit-related effects.
-	 */
-	std::function<void()> on_mouse_exit = nullptr;
+	virtual int get_instances_max() const { return 1; }
 
 private:
-	//! friend relation for is_pressed and hover variables
+	//! friend relation hover variable
 	friend class InputSystem;
 	//! Indicates whether the mouse is currently hovering over the button
 	bool hover = false;
-
-public:
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index 73bf461..8e38280 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -3,9 +3,10 @@
 
 #include <string>
 
-#include "api/KeyCodes.h"
 #include "types.h"
 
+#include "KeyCodes.h"
+
 namespace crepe {
 
 /**
@@ -95,15 +96,6 @@ public:
 };
 
 /**
- * \brief Event triggered when text is submitted, e.g., from a text input.
- */
-class TextSubmitEvent : public Event {
-public:
-	//! The submitted text.
-	std::string text = "";
-};
-
-/**
  * \brief Event triggered to indicate the application is shutting down.
  */
 class ShutDownEvent : public Event {};
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 1d23cbf..124cd3a 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -71,9 +71,19 @@ private:
 private:
 	//! Global context
 	Mediator mediator;
+	/**
+	 * \brief Collection of System instances
+	 *
+	 * This map holds System instances indexed by the system's class typeid. It is filled in the
+	 * constructor of LoopManager using LoopManager::load_system.
+	 */
+	std::unordered_map<std::type_index, std::unique_ptr<System>> systems;
 
 	//! SDLContext instance
 	SDLContext sdl_context{mediator};
+	//! Resource manager instance
+	ResourceManager resource_manager{mediator};
+
 	//! Component manager instance
 	ComponentManager component_manager{mediator};
 	//! Scene manager instance
@@ -82,8 +92,6 @@ private:
 	LoopTimerManager loop_timer{mediator};
 	//! EventManager instance
 	EventManager event_manager{mediator};
-	//! Resource manager instance
-	ResourceManager resource_manager{mediator};
 	//! Save manager instance
 	SaveManager save_manager{mediator};
 
@@ -95,13 +103,6 @@ private:
 	 */
 	bool on_shutdown(const ShutDownEvent & e);
 	/**
-	 * \brief Collection of System instances
-	 *
-	 * This map holds System instances indexed by the system's class typeid. It is filled in the
-	 * constructor of LoopManager using LoopManager::load_system.
-	 */
-	std::unordered_map<std::type_index, std::unique_ptr<System>> systems;
-	/**
 	 * \brief Initialize a system
 	 * \tparam T System type (must be derivative of \c System)
 	 */
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 583c04f..85016f5 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -26,6 +26,8 @@ void Script::set_next_scene(const string & name) {
 
 SaveManager & Script::get_save_manager() const { return this->mediator->save_manager; }
 
+LoopTimerManager & Script::get_loop_timer() const { return this->mediator->loop_timer; }
+
 const keyboard_state_t & Script::get_keyboard_state() const {
 	SDLContext & sdl_context = this->mediator->sdl_context;
 	return sdl_context.get_keyboard_state();
@@ -38,3 +40,4 @@ bool Script::get_key_state(Keycode key) const noexcept {
 		return false;
 	}
 }
+
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 65306cd..a87af4e 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -4,6 +4,7 @@
 
 #include "../api/KeyCodes.h"
 #include "../manager/EventManager.h"
+#include "../manager/LoopTimerManager.h"
 #include "../manager/Mediator.h"
 #include "../system/CollisionSystem.h"
 #include "../types.h"
@@ -47,10 +48,12 @@ protected:
 	/**
 	 * \brief Script update function (empty by default)
 	 *
+	 * \param delta_time Time since last fixed update
+	 *
 	 * This function is called during the ScriptSystem::update() routine if the \c BehaviorScript
 	 * component holding this script instance is active.
 	 */
-	virtual void update() {}
+	virtual void update(duration_t delta_time) {}
 	//! \}
 
 	//! ScriptSystem calls \c init() and \c update()
@@ -135,6 +138,10 @@ protected:
 
 	//! Retrieve SaveManager reference
 	SaveManager & get_save_manager() const;
+
+	//! Retrieve LoopTimerManager reference
+	LoopTimerManager & get_loop_timer() const;
+
 	/**
 	 * \brief Utility function to retrieve the keyboard state
 	 * \see SDLContext::get_keyboard_state
@@ -151,7 +158,6 @@ protected:
 	 * 
 	 */
 	bool get_key_state(Keycode key) const noexcept;
-	//! \}
 
 private:
 	/**
diff --git a/src/crepe/facade/DB.cpp b/src/crepe/facade/DB.cpp
index 95cf606..ae2d4bc 100644
--- a/src/crepe/facade/DB.cpp
+++ b/src/crepe/facade/DB.cpp
@@ -21,12 +21,6 @@ DB::DB(const string & path) {
 	const char * file = path.empty() ? NULL : path.c_str();
 	ret = this->db->open(this->db.get(), NULL, file, NULL, libdb::DB_BTREE, DB_CREATE, 0);
 	if (ret != 0) throw runtime_error(format("db->open: {}", libdb::db_strerror(ret)));
-
-	// create cursor
-	libdb::DBC * cursor;
-	ret = this->db->cursor(this->db.get(), NULL, &cursor, 0);
-	if (ret != 0) throw runtime_error(format("db->cursor: {}", libdb::db_strerror(ret)));
-	this->cursor = {cursor, [](libdb::DBC * cursor) { cursor->close(cursor); }};
 }
 
 libdb::DBT DB::to_thing(const string & thing) const noexcept {
@@ -42,10 +36,10 @@ string DB::get(const string & key) {
 	libdb::DBT db_val;
 	memset(&db_val, 0, sizeof(libdb::DBT));
 
-	int ret = this->cursor->get(this->cursor.get(), &db_key, &db_val, DB_FIRST);
+	int ret = this->db->get(this->db.get(), NULL, &db_key, &db_val, 0);
 	if (ret == 0) return {static_cast<char *>(db_val.data), db_val.size};
 
-	string err = format("cursor->get: {}", libdb::db_strerror(ret));
+	string err = format("db->get: {}", libdb::db_strerror(ret));
 	if (ret == DB_NOTFOUND) throw out_of_range(err);
 	else throw runtime_error(err);
 }
@@ -54,7 +48,7 @@ void DB::set(const string & key, const string & value) {
 	libdb::DBT db_key = this->to_thing(key);
 	libdb::DBT db_val = this->to_thing(value);
 	int ret = this->db->put(this->db.get(), NULL, &db_key, &db_val, 0);
-	if (ret != 0) throw runtime_error(format("cursor->get: {}", libdb::db_strerror(ret)));
+	if (ret != 0) throw runtime_error(format("db->get: {}", libdb::db_strerror(ret)));
 }
 
 bool DB::has(const std::string & key) {
diff --git a/src/crepe/facade/DB.h b/src/crepe/facade/DB.h
index 115c0f1..84cdf19 100644
--- a/src/crepe/facade/DB.h
+++ b/src/crepe/facade/DB.h
@@ -61,8 +61,6 @@ public:
 private:
 	//! RAII wrapper around \c DB struct
 	std::unique_ptr<libdb::DB, std::function<void(libdb::DB *)>> db;
-	//! RAII wrapper around \c DBC struct
-	std::unique_ptr<libdb::DBC, std::function<void(libdb::DBC *)>> cursor;
 
 private:
 	/**
diff --git a/src/crepe/manager/SaveManager.cpp b/src/crepe/manager/SaveManager.cpp
index 691ea2f..f313ed2 100644
--- a/src/crepe/manager/SaveManager.cpp
+++ b/src/crepe/manager/SaveManager.cpp
@@ -129,9 +129,32 @@ template void SaveManager::set(const string &, const float &);
 template void SaveManager::set(const string &, const double &);
 
 template <typename T>
+T SaveManager::get(const string & key) {
+	return this->deserialize<T>(this->get_db().get(key));
+}
+template uint8_t SaveManager::get(const string &);
+template int8_t SaveManager::get(const string &);
+template uint16_t SaveManager::get(const string &);
+template int16_t SaveManager::get(const string &);
+template uint32_t SaveManager::get(const string &);
+template int32_t SaveManager::get(const string &);
+template uint64_t SaveManager::get(const string &);
+template int64_t SaveManager::get(const string &);
+template float SaveManager::get(const string &);
+template double SaveManager::get(const string &);
+template string SaveManager::get(const string &);
+
+template <typename T>
 ValueBroker<T> SaveManager::get(const string & key, const T & default_value) {
 	if (!this->has(key)) this->set<T>(key, default_value);
-	return this->get<T>(key);
+	T value;
+	return {
+		[this, key](const T & target) { this->set<T>(key, target); },
+		[this, key, value]() mutable -> const T & {
+			value = this->get<T>(key);
+			return value;
+		},
+	};
 }
 template ValueBroker<uint8_t> SaveManager::get(const string &, const uint8_t &);
 template ValueBroker<int8_t> SaveManager::get(const string &, const int8_t &);
@@ -144,27 +167,3 @@ template ValueBroker<int64_t> SaveManager::get(const string &, const int64_t &);
 template ValueBroker<float> SaveManager::get(const string &, const float &);
 template ValueBroker<double> SaveManager::get(const string &, const double &);
 template ValueBroker<string> SaveManager::get(const string &, const string &);
-
-template <typename T>
-ValueBroker<T> SaveManager::get(const string & key) {
-	T value;
-	return {
-		[this, key](const T & target) { this->set<T>(key, target); },
-		[this, key, value]() mutable -> const T & {
-			DB & db = this->get_db();
-			value = this->deserialize<T>(db.get(key));
-			return value;
-		},
-	};
-}
-template ValueBroker<uint8_t> SaveManager::get(const string &);
-template ValueBroker<int8_t> SaveManager::get(const string &);
-template ValueBroker<uint16_t> SaveManager::get(const string &);
-template ValueBroker<int16_t> SaveManager::get(const string &);
-template ValueBroker<uint32_t> SaveManager::get(const string &);
-template ValueBroker<int32_t> SaveManager::get(const string &);
-template ValueBroker<uint64_t> SaveManager::get(const string &);
-template ValueBroker<int64_t> SaveManager::get(const string &);
-template ValueBroker<float> SaveManager::get(const string &);
-template ValueBroker<double> SaveManager::get(const string &);
-template ValueBroker<string> SaveManager::get(const string &);
diff --git a/src/crepe/manager/SaveManager.h b/src/crepe/manager/SaveManager.h
index 61a978d..1e34bc0 100644
--- a/src/crepe/manager/SaveManager.h
+++ b/src/crepe/manager/SaveManager.h
@@ -36,17 +36,17 @@ public:
 	ValueBroker<T> get(const std::string & key, const T & default_value);
 
 	/**
-	 * \brief Get a read/write reference to a value
+	 * \brief Get a value directly
 	 *
 	 * \param key  The value key
 	 *
-	 * \return Read/write reference to the value
+	 * \return The value
 	 *
 	 * \note Attempting to read this value before it is initialized (i.e. set) will result in an
 	 * exception
 	 */
 	template <typename T>
-	ValueBroker<T> get(const std::string & key);
+	T get(const std::string & key);
 
 	/**
 	 * \brief Set a value directly
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index fca540f..60daa55 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -10,10 +10,8 @@ using namespace crepe;
 
 void InputSystem::update() {
 	ComponentManager & mgr = this->mediator.component_manager;
-
 	SDLContext & context = this->mediator.sdl_context;
 	std::vector<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;
 
@@ -155,28 +153,25 @@ void InputSystem::handle_non_mouse_event(const EventData & event) {
 
 void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_pos) {
 	ComponentManager & mgr = this->mediator.component_manager;
-
+	EventManager & event_mgr = this->mediator.event_manager;
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
 
 	for (Button & button : buttons) {
 		if (!button.active) continue;
-		RefVector<Transform> transform_vec
-			= mgr.get_components_by_id<Transform>(button.game_object_id);
-		Transform & transform(transform_vec.front().get());
-
+		Metadata & metadata
+			= mgr.get_components_by_id<Metadata>(button.game_object_id).front();
+		Transform & transform
+			= mgr.get_components_by_id<Transform>(button.game_object_id).front();
 		bool was_hovering = button.hover;
 		if (this->is_mouse_inside_button(mouse_pos, button, transform)) {
 			button.hover = true;
-			if (!button.on_mouse_enter) continue;
 			if (!was_hovering) {
-				button.on_mouse_enter();
+				event_mgr.trigger_event<ButtonEnterEvent>(metadata);
 			}
 		} else {
 			button.hover = false;
-			// Trigger the on_exit callback if the hover state just changed to false
-			if (!button.on_mouse_exit) continue;
 			if (was_hovering) {
-				button.on_mouse_exit();
+				event_mgr.trigger_event<ButtonExitEvent>(metadata);
 			}
 		}
 	}
@@ -184,19 +179,18 @@ void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_p
 
 void InputSystem::handle_click(const MouseButton & mouse_button, const vec2 & mouse_pos) {
 	ComponentManager & mgr = this->mediator.component_manager;
-
+	EventManager & event_mgr = this->mediator.event_manager;
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
 
 	for (Button & button : buttons) {
 		if (!button.active) continue;
-		if (!button.on_click) continue;
-		RefVector<Transform> transform_vec
-			= mgr.get_components_by_id<Transform>(button.game_object_id);
-		Transform & transform = transform_vec.front().get();
+		Metadata & metadata
+			= mgr.get_components_by_id<Metadata>(button.game_object_id).front();
+		Transform & transform
+			= mgr.get_components_by_id<Transform>(button.game_object_id).front();
 
 		if (this->is_mouse_inside_button(mouse_pos, button, transform)) {
-
-			button.on_click();
+			event_mgr.trigger_event<ButtonPressEvent>(metadata);
 		}
 	}
 }
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index eefd9fe..e580d8e 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -3,6 +3,8 @@
 #include "../api/Config.h"
 #include "../facade/EventData.h"
 
+#include "../api/Event.h"
+#include "../api/Metadata.h"
 #include "../types.h"
 #include "../util/OptionalRef.h"
 
@@ -13,6 +15,37 @@ namespace crepe {
 class Camera;
 class Button;
 class Transform;
+//! Event triggered when a button is clicked
+class ButtonPressEvent : public Event {
+public:
+	//! Metadata of the button.
+	const Metadata & metadata;
+	/**
+	 * \param metadata Metadata of the button pressed
+	 */
+	ButtonPressEvent(const Metadata & metadata) : metadata(metadata){};
+};
+//! Event triggered when the mouse enters a button
+class ButtonEnterEvent : public Event {
+public:
+	//! Metadata of the button.
+	const Metadata & metadata;
+	/**
+	 * \param metadata Metadata of the button pressed
+	 */
+	ButtonEnterEvent(const Metadata & metadata) : metadata(metadata){};
+};
+//! Event triggered when the mouse leaves a button
+class ButtonExitEvent : public Event {
+public:
+	//! Metadata of the button.
+	const Metadata & metadata;
+	/**
+	 * \param metadata Metadata of the button pressed
+	 */
+	ButtonExitEvent(const Metadata & metadata) : metadata(metadata){};
+};
+
 /**
  * \brief Handles the processing of input events created by SDLContext
  *
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index d6b2ca1..0605c7a 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -11,6 +11,7 @@ void ScriptSystem::update() {
 	dbg_trace();
 
 	ComponentManager & mgr = this->mediator.component_manager;
+	LoopTimerManager & timer = this->mediator.loop_timer;
 	RefVector<BehaviorScript> behavior_scripts = mgr.get_components_by_type<BehaviorScript>();
 
 	for (BehaviorScript & behavior_script : behavior_scripts) {
@@ -23,6 +24,8 @@ void ScriptSystem::update() {
 			script->init();
 			script->initialized = true;
 		}
-		script->update();
+
+		duration_t delta_time = timer.get_scaled_fixed_delta_time();
+		script->update(delta_time);
 	}
 }