From 5d041cce13da66aa3457d236579a9ac90ebf7618 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 12 Oct 2024 20:54:07 +0200
Subject: fix constructor/destructor member visibility for component manager

---
 src/crepe/Component.cpp        |  1 -
 src/crepe/Component.h          |  6 ++-
 src/crepe/ComponentManager.cpp | 12 +++++-
 src/crepe/ComponentManager.h   |  3 +-
 src/crepe/ComponentManager.hpp | 86 +++++++++++++++++++-----------------------
 src/crepe/api/BehaviorScript.h |  7 +++-
 src/crepe/util/log.h           |  2 +-
 7 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp
index d14159c..737f30a 100644
--- a/src/crepe/Component.cpp
+++ b/src/crepe/Component.cpp
@@ -2,4 +2,3 @@
 
 using namespace crepe;
 
-Component::Component() : active(true) {}
diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index 16a4ce5..00b2164 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -3,12 +3,14 @@
 namespace crepe {
 
 class Component {
+protected:
+	Component() = default;
 public:
-	Component();
+	virtual ~Component() = default;
 	// TODO: shouldn't this constructor be deleted because this class will never
 	// directly be instantiated?
 
-	bool active;
+	bool active = true;
 };
 
 } // namespace crepe
diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp
index 9a3fec7..8aa9d4e 100644
--- a/src/crepe/ComponentManager.cpp
+++ b/src/crepe/ComponentManager.cpp
@@ -1,3 +1,4 @@
+#include "util/log.h"
 #include "ComponentManager.h"
 
 using namespace crepe;
@@ -20,5 +21,14 @@ void ComponentManager::delete_all_components_of_id(uint32_t id) {
 
 void ComponentManager::delete_all_components() {
 	// Clear the whole unordered_map<>
-	components.clear();
+	this->components.clear();
 }
+
+ComponentManager::ComponentManager() {
+	dbg_trace();
+}
+
+ComponentManager::~ComponentManager() {
+	dbg_trace();
+}
+
diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h
index 2ab9dc8..eab9b45 100644
--- a/src/crepe/ComponentManager.h
+++ b/src/crepe/ComponentManager.h
@@ -44,7 +44,8 @@ public:
 	std::vector<std::reference_wrapper<T>> get_components_by_type() const;
 
 private:
-	ComponentManager() = default;
+	ComponentManager();
+	virtual ~ComponentManager();
 
 	/*
 	 * The std::unordered_map<std::type_index, std::vector<std::vector<std::unique_ptr<Component>>>> below might seem a bit strange, let me explain this structure:
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index 084cd33..8fc1cba 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -60,11 +60,9 @@ void ComponentManager::delete_components() {
 	// Determine the type of T (this is used as the key of the unordered_map<>)
 	std::type_index type = typeid(T);
 
-	// Find the type (in the unordered_map<>)
-	if (components.find(type) != components.end()) {
-		// Clear the whole vector<> of this specific type
-		components[type].clear();
-	}
+	if (components.find(type) == components.end()) return;
+
+	components[type].clear();
 }
 
 template <typename T>
@@ -78,30 +76,25 @@ ComponentManager::get_components_by_id(uint32_t id) const {
 	// Create an empty vector<>
 	vector<reference_wrapper<T>> component_vector;
 
-	// Find the type (in the unordered_map<>)
-	if (components.find(type) != components.end()) {
-		// Get the correct vector<>
-		const vector<vector<unique_ptr<Component>>> & component_array
-			= components.at(type);
+	if (components.find(type) == components.end()) return component_vector;
 
-		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
-		if (id < component_array.size()) {
-			// Loop trough the whole vector<>
-			for (const unique_ptr<Component> & component_ptr :
-				 component_array[id]) {
-				// Cast the unique_ptr to a raw pointer
-				T * casted_component = static_cast<T *>(component_ptr.get());
-
-				// Ensure that the cast was successful
-				if (casted_component) {
-					// Add the dereferenced raw pointer to the vector<>
-					component_vector.push_back(*casted_component);
-				}
-			}
-		}
+	// Get the correct vector<>
+	const vector<vector<unique_ptr<Component>>> & component_array = components.at(type);
+
+	// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+	if (id >= component_array.size()) return component_vector;
+
+	// Loop trough the whole vector<>
+	for (const unique_ptr<Component> & component_ptr : component_array[id]) {
+		// Cast the unique_ptr to a raw pointer
+		T * casted_component = static_cast<T *>(component_ptr.get());
+
+		if (casted_component == nullptr) continue;
+
+		// Add the dereferenced raw pointer to the vector<>
+		component_vector.push_back(*casted_component);
 	}
 
-	// Return the vector<>
 	return component_vector;
 }
 
@@ -119,30 +112,27 @@ ComponentManager::get_components_by_type() const {
 	// uint32_t id = 0;
 
 	// Find the type (in the unordered_map<>)
-	if (components.find(type) != components.end()) {
+	if (components.find(type) == components.end()) return component_vector;
 
-		// Get the correct vector<>
-		const vector<vector<unique_ptr<Component>>> & component_array
-			= components.at(type);
-
-		// Loop through the whole vector<>
-		for (const vector<unique_ptr<Component>> & component :
-			 component_array) {
-			// Loop trough the whole vector<>
-			for (const unique_ptr<Component> & component_ptr : component) {
-				// Cast the unique_ptr to a raw pointer
-				T * casted_component = static_cast<T *>(component_ptr.get());
-
-				// Ensure that the cast was successful
-				if (casted_component) {
-					// Pair the dereferenced raw pointer and the id and add it to the vector<>
-					component_vector.emplace_back(ref(*casted_component));
-				}
-			}
-
-			// Increase the id (the id will also be stored in the returned vector<>)
-			//++id;
+	// Get the correct vector<>
+	const vector<vector<unique_ptr<Component>>> & component_array = components.at(type);
+
+	// Loop through the whole vector<>
+	for (const vector<unique_ptr<Component>> & component : component_array) {
+		// Loop trough the whole vector<>
+		for (const unique_ptr<Component> & component_ptr : component) {
+			// Cast the unique_ptr to a raw pointer
+			T * casted_component = static_cast<T *>(component_ptr.get());
+
+			// Ensure that the cast was successful
+			if (casted_component == nullptr) continue;
+
+			// Pair the dereferenced raw pointer and the id and add it to the vector<>
+			component_vector.emplace_back(ref(*casted_component));
 		}
+
+		// Increase the id (the id will also be stored in the returned vector<>)
+		//++id;
 	}
 
 	// Return the vector<>
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index e9542c1..ba60a8c 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -6,11 +6,14 @@
 namespace crepe::api {
 
 class BehaviorScript : public Script, public Component {
+protected:
 	// only allow ComponentManager to instantiate scripts
 	friend class ComponentManager;
-
-protected:
 	BehaviorScript();
+public:
+	// but allow uniqe_ptr to call the destructor (THIS IS VERY IMPORTANT)
+	virtual ~BehaviorScript() = default;
+
 };
 
 }
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index 2b0fbe1..fa5f633 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -15,7 +15,7 @@
 // very illegal global function-style macros
 // NOLINTBEGIN
 #define dbg_logf(fmt, ...) _crepe_logf_here(": " fmt, __VA_ARGS__)
-#define dbg_log(str) _crepe_logf_here(": %s", str)
+#define dbg_log(str) _crepe_logf_here("%s: " str, "")
 #define dbg_trace() _crepe_logf_here("%s", "")
 // NOLINTEND
 
-- 
cgit v1.2.3


From f9aa198eef7b85eeba3bac4c4fe2d4578b836bbf Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 13 Oct 2024 20:52:08 +0200
Subject: WIP behavior script (problems)

---
 src/crepe/ComponentManager.hpp |  1 +
 src/crepe/ScriptSystem.cpp     | 11 +++++++++++
 src/crepe/api/BehaviorScript.h |  1 +
 src/crepe/util/CMakeLists.txt  |  2 ++
 src/crepe/util/fmt.cpp         | 34 ++++++++++++++++++++++++++++++++++
 src/crepe/util/fmt.h           | 10 ++++++++++
 src/crepe/util/log.cpp         | 27 +++++++++------------------
 src/crepe/util/log.h           |  2 +-
 src/example/script.cpp         |  3 ++-
 9 files changed, 71 insertions(+), 20 deletions(-)
 create mode 100644 src/crepe/util/fmt.cpp
 create mode 100644 src/crepe/util/fmt.h

diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index 8fc1cba..c872594 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -3,6 +3,7 @@
 #include <type_traits>
 
 #include "ComponentManager.h"
+#include "api/BehaviorScript.h"
 
 namespace crepe {
 
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index e301c71..e40909e 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -1,3 +1,7 @@
+#include <vector>
+#include "ComponentManager.h"
+#include "api/BehaviorScript.h"
+#include "util/fmt.h"
 #include "util/log.h"
 
 #include "ScriptSystem.h"
@@ -17,6 +21,13 @@ ScriptSystem & ScriptSystem::get_instance() {
 }
 
 void ScriptSystem::update() {
+	using namespace std;
 	dbg_trace();
+
+	ComponentManager & mgr = ComponentManager::get_instance();
+	vector<reference_wrapper<api::BehaviorScript>> scripts = mgr.get_components_by_type<api::BehaviorScript>();
+
+	dbg_logf("script count: %lu", scripts.size());
+
 }
 
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index ba60a8c..dd04dc0 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -14,6 +14,7 @@ public:
 	// but allow uniqe_ptr to call the destructor (THIS IS VERY IMPORTANT)
 	virtual ~BehaviorScript() = default;
 
+	static BehaviorScript * component;
 };
 
 }
diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
index 100f028..e2cffaf 100644
--- a/src/crepe/util/CMakeLists.txt
+++ b/src/crepe/util/CMakeLists.txt
@@ -1,9 +1,11 @@
 target_sources(crepe PUBLIC
 	log.cpp
+	fmt.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	color.h
 	log.h
+	fmt.h
 )
 
diff --git a/src/crepe/util/fmt.cpp b/src/crepe/util/fmt.cpp
new file mode 100644
index 0000000..3a43a6f
--- /dev/null
+++ b/src/crepe/util/fmt.cpp
@@ -0,0 +1,34 @@
+#include <string>
+#include <cstdio>
+#include <cstdarg>
+
+#include "fmt.h"
+
+using namespace std;
+
+string crepe::util::va_stringf(va_list args, const char * fmt) {
+	va_list args_copy;
+	va_copy(args_copy, args);
+
+	size_t sz = vsnprintf(NULL, 0, fmt, args_copy) + 1;
+	char * msg = (char *) malloc(sz);
+	va_end(args_copy);
+
+	vsnprintf(msg, sz, fmt, args);
+
+	string out = msg;
+	free(msg);
+
+	va_end(args);
+
+	return out;
+}
+
+string crepe::util::stringf(const char * fmt, ...) {
+	va_list args;
+	va_start(args, fmt);
+	string out = va_stringf(args, fmt);
+	va_end(args);
+	return out;
+}
+
diff --git a/src/crepe/util/fmt.h b/src/crepe/util/fmt.h
new file mode 100644
index 0000000..5c45703
--- /dev/null
+++ b/src/crepe/util/fmt.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <string>
+
+namespace crepe::util {
+
+std::string va_stringf(va_list args, const char * fmt);
+std::string stringf(const char * fmt, ...);
+
+}
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index f91d52c..b46620d 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "log.h"
+#include "fmt.h"
 
 using namespace crepe::util;
 
@@ -14,37 +15,27 @@ static const char * const LOG_PREFIX[] = {
 	[log_level::ERROR] = "[ERR] ",
 };
 
-static void va_logf(enum log_level level, va_list args, const std::string fmt) {
-	va_list args_copy;
-	va_copy(args_copy, args);
-
-	// prepend log level and ensure newline
-	std::string format_fixed = LOG_PREFIX[level] + fmt;
-	if (!format_fixed.ends_with("\n")) format_fixed += "\n";
-
-	size_t sz = vsnprintf(NULL, 0, format_fixed.c_str(), args_copy) + 1;
-	char * msg = (char *) malloc(sz);
-	va_end(args_copy);
-
-	vsnprintf(msg, sz, format_fixed.c_str(), args);
+static void log(enum log_level level, const std::string msg) {
+	using namespace std;
+	string final = string(LOG_PREFIX[level]) + msg;
+	if (!final.ends_with("\n")) final += "\n";
 
 	// TODO: also log to file or smth
-	printf("%s", msg);
+	printf("%s", final.c_str());
 	fflush(stdout);
-
-	free(msg);
 }
 
 void crepe::util::logf(const char * fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
-	va_logf(crepe::util::log_level::DEBUG, args, fmt);
+	log(log_level::DEBUG, va_stringf(args, fmt));
 	va_end(args);
 }
 
 void crepe::util::logf(log_level level, const char * fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
-	va_logf(level, args, fmt);
+	log(level, va_stringf(args, fmt));
 	va_end(args);
 }
+
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index fa5f633..3e36f0a 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -7,7 +7,7 @@
 
 // utility macros
 #define _crepe_logf_here(fmt, ...) \
-	crepe::util::logf(util::log_level::DEBUG, "%s%s (%s:%d)" fmt "\n", \
+	crepe::util::logf(util::log_level::DEBUG, "%s%s (%s:%d)%s" fmt "\n", \
 					  crepe::util::color::FG_WHITE, __PRETTY_FUNCTION__, \
 					  __FILE_NAME__, __LINE__, crepe::util::color::RESET, \
 					  __VA_ARGS__)
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 28605c7..b8b3c8d 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -11,9 +11,10 @@
 #include <crepe/api/BehaviorScript.h>
 
 using namespace crepe;
+using namespace crepe::api;
 using namespace std;
 
-class MyScript : public api::BehaviorScript {
+class MyScript : public BehaviorScript {
 	void update() {
 		dbg_trace();
 	}
-- 
cgit v1.2.3


From 1f82ffa4d3ee8355215d43bf43edf8cecaca0d1d Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 16 Oct 2024 17:21:04 +0200
Subject: fix user script implementation

---
 src/crepe/CMakeLists.txt         |  1 -
 src/crepe/ComponentManager.h     |  2 +-
 src/crepe/ComponentManager.hpp   |  5 +++--
 src/crepe/GameObject.h           |  2 +-
 src/crepe/GameObject.hpp         |  4 ++--
 src/crepe/Script.cpp             |  7 -------
 src/crepe/Script.h               | 16 ----------------
 src/crepe/ScriptSystem.cpp       | 27 ++++++++++++++++++++++-----
 src/crepe/ScriptSystem.h         | 12 +++++++++++-
 src/crepe/api/BehaviorScript.h   | 24 ++++++++++++++++++------
 src/crepe/api/BehaviorScript.hpp | 18 ++++++++++++++++++
 src/crepe/api/CMakeLists.txt     |  2 ++
 src/crepe/api/Script.cpp         |  5 +++++
 src/crepe/api/Script.h           | 21 +++++++++++++++++++++
 src/example/script.cpp           |  7 ++++---
 15 files changed, 108 insertions(+), 45 deletions(-)
 delete mode 100644 src/crepe/Script.cpp
 delete mode 100644 src/crepe/Script.h
 create mode 100644 src/crepe/api/BehaviorScript.hpp
 create mode 100644 src/crepe/api/Script.cpp
 create mode 100644 src/crepe/api/Script.h

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index d85aef0..8323490 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -9,7 +9,6 @@ target_sources(crepe PUBLIC
 	Rigidbody.cpp
 	Sprite.cpp
 	ScriptSystem.cpp
-	Script.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h
index eab9b45..38f32e4 100644
--- a/src/crepe/ComponentManager.h
+++ b/src/crepe/ComponentManager.h
@@ -23,7 +23,7 @@ public:
 public:
 	//! Add a component of a specific type
 	template <typename T, typename... Args>
-	void add_component(uint32_t id, Args &&... args);
+	T & add_component(uint32_t id, Args &&... args);
 	//! Deletes all components of a specific type and id
 	template <typename T>
 	void delete_components_by_id(uint32_t id);
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index c872594..e0242a2 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -3,12 +3,11 @@
 #include <type_traits>
 
 #include "ComponentManager.h"
-#include "api/BehaviorScript.h"
 
 namespace crepe {
 
 template <class T, typename... Args>
-void ComponentManager::add_component(uint32_t id, Args &&... args) {
+T & ComponentManager::add_component(uint32_t id, Args &&... args) {
 	using namespace std;
 
 	static_assert(is_base_of<Component, T>::value, "add_component must recieve a derivative class of Component");
@@ -33,6 +32,8 @@ void ComponentManager::add_component(uint32_t id, Args &&... args) {
 	T * instance = new T(forward<Args>(args)...);
 	// store its unique_ptr in the vector<>
 	components[type][id].push_back(unique_ptr<T>(instance));
+
+	return *instance;
 }
 
 template <typename T>
diff --git a/src/crepe/GameObject.h b/src/crepe/GameObject.h
index 3588d9a..b5d6399 100644
--- a/src/crepe/GameObject.h
+++ b/src/crepe/GameObject.h
@@ -10,7 +10,7 @@ public:
 	GameObject(uint32_t id, std::string name, std::string tag, int layer);
 
 	template <typename T, typename... Args>
-	void add_component(Args &&... args);
+	T & add_component(Args &&... args);
 
 	uint32_t id;
 	std::string name;
diff --git a/src/crepe/GameObject.hpp b/src/crepe/GameObject.hpp
index 5966fbf..8cd1abe 100644
--- a/src/crepe/GameObject.hpp
+++ b/src/crepe/GameObject.hpp
@@ -7,9 +7,9 @@
 namespace crepe {
 
 template <typename T, typename... Args>
-void GameObject::add_component(Args &&... args) {
+T & GameObject::add_component(Args &&... args) {
 	auto & mgr = ComponentManager::get_instance();
-	mgr.add_component<T>(id, std::forward<Args>(args)...);
+	return mgr.add_component<T>(id, std::forward<Args>(args)...);
 }
 
 } // namespace crepe
diff --git a/src/crepe/Script.cpp b/src/crepe/Script.cpp
deleted file mode 100644
index 42e3666..0000000
--- a/src/crepe/Script.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "Script.h"
-
-using namespace crepe;
-
-void Script::init() { }
-void Script::update() { }
-
diff --git a/src/crepe/Script.h b/src/crepe/Script.h
deleted file mode 100644
index ba4073a..0000000
--- a/src/crepe/Script.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-namespace crepe {
-
-class Script {
-protected:
-	virtual void init();
-	virtual void update();
-	// NOTE: additional *events* (like unity's OnDisable and OnEnable) should be
-	// implemented as member methods in derivative user script classes and
-	// registered in init(), otherwise this class will balloon in size with each
-	// added event.
-};
-
-}
-
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index e40909e..0537c16 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -1,12 +1,16 @@
+#include <forward_list>
+#include <functional>
 #include <vector>
+
+#include "ScriptSystem.h"
 #include "ComponentManager.h"
 #include "api/BehaviorScript.h"
-#include "util/fmt.h"
+#include "api/Script.h"
 #include "util/log.h"
 
-#include "ScriptSystem.h"
-
+using namespace std;
 using namespace crepe;
+using namespace crepe::api;
 
 ScriptSystem::ScriptSystem() {
 	dbg_trace();
@@ -24,10 +28,23 @@ void ScriptSystem::update() {
 	using namespace std;
 	dbg_trace();
 
+	forward_list<Script *> scripts = this->get_scripts();
+	for (Script * script : scripts)
+		script->update();
+}
+
+forward_list<Script *> ScriptSystem::get_scripts() {
+	forward_list<Script *> scripts = {};
 	ComponentManager & mgr = ComponentManager::get_instance();
-	vector<reference_wrapper<api::BehaviorScript>> scripts = mgr.get_components_by_type<api::BehaviorScript>();
+	vector<reference_wrapper<BehaviorScript>> behavior_scripts = mgr.get_components_by_type<BehaviorScript>();
 
-	dbg_logf("script count: %lu", scripts.size());
+	for (auto behavior_script_ref : behavior_scripts) {
+		BehaviorScript & behavior_script = behavior_script_ref.get();
+		Script * script = behavior_script.script;
+		if (script == nullptr) continue;
+		scripts.push_front(script);
+	}
 
+	return scripts;
 }
 
diff --git a/src/crepe/ScriptSystem.h b/src/crepe/ScriptSystem.h
index e1ed290..e0b2a65 100644
--- a/src/crepe/ScriptSystem.h
+++ b/src/crepe/ScriptSystem.h
@@ -1,17 +1,27 @@
 #pragma once
 
+#include <forward_list>
+
 #include "System.h"
 
+namespace crepe::api {
+class Script;
+}
+
 namespace crepe {
 
 class ScriptSystem : public System {
 public:
 	static ScriptSystem & get_instance();
-	virtual void update();
+	void update();
 
 private:
 	ScriptSystem();
 	~ScriptSystem();
+
+private:
+	std::forward_list<api::Script *> get_scripts();
+
 };
 
 }
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index dd04dc0..052d764 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -1,21 +1,33 @@
 #pragma once
 
-#include "../Script.h"
 #include "../Component.h"
 
+namespace crepe {
+class ScriptSystem;
+class ComponentManager;
+}
+
 namespace crepe::api {
 
-class BehaviorScript : public Script, public Component {
+class Script;
+
+class BehaviorScript : public Component {
 protected:
-	// only allow ComponentManager to instantiate scripts
-	friend class ComponentManager;
+	friend class crepe::ComponentManager;
 	BehaviorScript();
 public:
-	// but allow uniqe_ptr to call the destructor (THIS IS VERY IMPORTANT)
 	virtual ~BehaviorScript() = default;
 
-	static BehaviorScript * component;
+public:
+	template<class T>
+	BehaviorScript & set_script();
+
+protected:
+	friend class crepe::ScriptSystem;
+	Script * script = nullptr;
 };
 
 }
 
+#include "BehaviorScript.hpp"
+
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
new file mode 100644
index 0000000..0401c0d
--- /dev/null
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <type_traits>
+
+#include "../util/log.h"
+#include "BehaviorScript.h"
+
+namespace crepe::api {
+
+template<class T>
+BehaviorScript & BehaviorScript::set_script() {
+	static_assert(std::is_base_of<Script, T>::value);
+	dbg_trace();
+	this->script = new T();
+	return *this;
+}
+
+}
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 86623de..6b337be 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -1,10 +1,12 @@
 target_sources(crepe PUBLIC
 	# AudioSource.cpp
 	BehaviorScript.cpp
+	Script.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	# AudioSource.h
 	BehaviorScript.h
+	Script.h
 )
 
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
new file mode 100644
index 0000000..6259574
--- /dev/null
+++ b/src/crepe/api/Script.cpp
@@ -0,0 +1,5 @@
+#include "Script.h"
+
+using namespace crepe::api;
+
+
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
new file mode 100644
index 0000000..b1e6a95
--- /dev/null
+++ b/src/crepe/api/Script.h
@@ -0,0 +1,21 @@
+#pragma once
+
+namespace crepe {
+class ScriptSystem;
+}
+
+namespace crepe::api {
+
+class Script {
+	friend class crepe::ScriptSystem;
+protected:
+	virtual void init() {}
+	virtual void update() {}
+	// NOTE: additional *events* (like unity's OnDisable and OnEnable) should be
+	// implemented as member methods in derivative user script classes and
+	// registered in init(), otherwise this class will balloon in size with each
+	// added event.
+};
+
+}
+
diff --git a/src/example/script.cpp b/src/example/script.cpp
index b8b3c8d..95c4950 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -8,15 +8,16 @@
 #include <crepe/ComponentManager.h>
 #include <crepe/GameObject.h>
 
+#include <crepe/api/Script.h>
 #include <crepe/api/BehaviorScript.h>
 
 using namespace crepe;
 using namespace crepe::api;
 using namespace std;
 
-class MyScript : public BehaviorScript {
+class MyScript : public Script {
 	void update() {
-		dbg_trace();
+		dbg_log("MY SCRIPT UPDATE");
 	}
 };
 
@@ -24,7 +25,7 @@ int main() {
 	dbg_trace();
 
 	auto obj = GameObject(0, "name", "tag", 0);
-	obj.add_component<MyScript>();
+	obj.add_component<BehaviorScript>().set_script<MyScript>();
 
 	auto & sys = ScriptSystem::get_instance();
 	sys.update(); // -> MyScript::update
-- 
cgit v1.2.3


From 81a9b43e12a32340262fa0e74005c7e6bd25eba7 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 16 Oct 2024 17:28:15 +0200
Subject: properly clean up Script instance

---
 src/crepe/api/BehaviorScript.cpp | 8 ++++++++
 src/crepe/api/BehaviorScript.h   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
index 2dd933e..e8a85dd 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -1,5 +1,6 @@
 #include "../util/log.h"
 
+#include "Script.h"
 #include "BehaviorScript.h"
 
 using namespace crepe::api;
@@ -8,3 +9,10 @@ BehaviorScript::BehaviorScript() {
 	dbg_trace();
 }
 
+BehaviorScript::~BehaviorScript() {
+	if (this->script != nullptr) {
+		delete this->script;
+		this->script = nullptr;
+	}
+}
+
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index 052d764..e197991 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -16,7 +16,7 @@ protected:
 	friend class crepe::ComponentManager;
 	BehaviorScript();
 public:
-	virtual ~BehaviorScript() = default;
+	virtual ~BehaviorScript();
 
 public:
 	template<class T>
-- 
cgit v1.2.3


From 9fd3bdca9de2d37b63e1646b22d32b0b182f01ee Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 16 Oct 2024 18:24:16 +0200
Subject: use unique_ptr instead of manual memory management in behaviorscript

---
 src/crepe/ScriptSystem.cpp       | 2 +-
 src/crepe/api/BehaviorScript.cpp | 7 -------
 src/crepe/api/BehaviorScript.h   | 6 ++++--
 src/crepe/api/BehaviorScript.hpp | 3 ++-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index 0537c16..1a7bff4 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -40,7 +40,7 @@ forward_list<Script *> ScriptSystem::get_scripts() {
 
 	for (auto behavior_script_ref : behavior_scripts) {
 		BehaviorScript & behavior_script = behavior_script_ref.get();
-		Script * script = behavior_script.script;
+		Script * script = behavior_script.script.get();
 		if (script == nullptr) continue;
 		scripts.push_front(script);
 	}
diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
index e8a85dd..7a93f10 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -9,10 +9,3 @@ BehaviorScript::BehaviorScript() {
 	dbg_trace();
 }
 
-BehaviorScript::~BehaviorScript() {
-	if (this->script != nullptr) {
-		delete this->script;
-		this->script = nullptr;
-	}
-}
-
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index e197991..756c2ca 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "../Component.h"
 
 namespace crepe {
@@ -16,7 +18,7 @@ protected:
 	friend class crepe::ComponentManager;
 	BehaviorScript();
 public:
-	virtual ~BehaviorScript();
+	virtual ~BehaviorScript() = default;
 
 public:
 	template<class T>
@@ -24,7 +26,7 @@ public:
 
 protected:
 	friend class crepe::ScriptSystem;
-	Script * script = nullptr;
+	std::unique_ptr<Script> script = nullptr;
 };
 
 }
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index 0401c0d..9a1f427 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -11,7 +11,8 @@ template<class T>
 BehaviorScript & BehaviorScript::set_script() {
 	static_assert(std::is_base_of<Script, T>::value);
 	dbg_trace();
-	this->script = new T();
+	Script * s = new T();
+	this->script = std::unique_ptr<Script>(s);
 	return *this;
 }
 
-- 
cgit v1.2.3


From a2c719948ff8af9abe267c4d1c9b16cd1e2fb317 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 17 Oct 2024 17:15:53 +0200
Subject: `make format`

---
 src/crepe/Component.cpp          |  1 -
 src/crepe/Component.h            |  1 +
 src/crepe/ComponentManager.cpp   | 11 +++--------
 src/crepe/ComponentManager.hpp   |  9 ++++++---
 src/crepe/ScriptSystem.cpp       | 17 ++++++-----------
 src/crepe/ScriptSystem.h         |  4 +---
 src/crepe/System.h               |  7 +++----
 src/crepe/api/BehaviorScript.cpp |  7 ++-----
 src/crepe/api/BehaviorScript.h   |  8 ++++----
 src/crepe/api/BehaviorScript.hpp |  4 ++--
 src/crepe/api/Script.cpp         |  2 --
 src/crepe/api/Script.h           |  4 ++--
 src/crepe/util/fmt.cpp           |  5 ++---
 src/crepe/util/fmt.h             |  2 +-
 src/crepe/util/log.cpp           |  3 +--
 src/example/script.cpp           | 11 ++++-------
 16 files changed, 38 insertions(+), 58 deletions(-)

diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp
index 737f30a..bce90f1 100644
--- a/src/crepe/Component.cpp
+++ b/src/crepe/Component.cpp
@@ -1,4 +1,3 @@
 #include "Component.h"
 
 using namespace crepe;
-
diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index 00b2164..d9a01ac 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -5,6 +5,7 @@ namespace crepe {
 class Component {
 protected:
 	Component() = default;
+
 public:
 	virtual ~Component() = default;
 	// TODO: shouldn't this constructor be deleted because this class will never
diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp
index 8aa9d4e..8bde33a 100644
--- a/src/crepe/ComponentManager.cpp
+++ b/src/crepe/ComponentManager.cpp
@@ -1,5 +1,5 @@
-#include "util/log.h"
 #include "ComponentManager.h"
+#include "util/log.h"
 
 using namespace crepe;
 
@@ -24,11 +24,6 @@ void ComponentManager::delete_all_components() {
 	this->components.clear();
 }
 
-ComponentManager::ComponentManager() {
-	dbg_trace();
-}
-
-ComponentManager::~ComponentManager() {
-	dbg_trace();
-}
+ComponentManager::ComponentManager() { dbg_trace(); }
 
+ComponentManager::~ComponentManager() { dbg_trace(); }
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index e0242a2..2377a94 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -10,7 +10,8 @@ template <class T, typename... Args>
 T & ComponentManager::add_component(uint32_t id, Args &&... args) {
 	using namespace std;
 
-	static_assert(is_base_of<Component, T>::value, "add_component must recieve a derivative class of Component");
+	static_assert(is_base_of<Component, T>::value,
+				  "add_component must recieve a derivative class of Component");
 
 	// Determine the type of T (this is used as the key of the unordered_map<>)
 	type_index type = typeid(T);
@@ -81,7 +82,8 @@ ComponentManager::get_components_by_id(uint32_t id) const {
 	if (components.find(type) == components.end()) return component_vector;
 
 	// Get the correct vector<>
-	const vector<vector<unique_ptr<Component>>> & component_array = components.at(type);
+	const vector<vector<unique_ptr<Component>>> & component_array
+		= components.at(type);
 
 	// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
 	if (id >= component_array.size()) return component_vector;
@@ -117,7 +119,8 @@ ComponentManager::get_components_by_type() const {
 	if (components.find(type) == components.end()) return component_vector;
 
 	// Get the correct vector<>
-	const vector<vector<unique_ptr<Component>>> & component_array = components.at(type);
+	const vector<vector<unique_ptr<Component>>> & component_array
+		= components.at(type);
 
 	// Loop through the whole vector<>
 	for (const vector<unique_ptr<Component>> & component : component_array) {
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index 1a7bff4..5d882be 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -2,8 +2,8 @@
 #include <functional>
 #include <vector>
 
-#include "ScriptSystem.h"
 #include "ComponentManager.h"
+#include "ScriptSystem.h"
 #include "api/BehaviorScript.h"
 #include "api/Script.h"
 #include "util/log.h"
@@ -12,12 +12,8 @@ using namespace std;
 using namespace crepe;
 using namespace crepe::api;
 
-ScriptSystem::ScriptSystem() {
-	dbg_trace();
-}
-ScriptSystem::~ScriptSystem() {
-	dbg_trace();
-}
+ScriptSystem::ScriptSystem() { dbg_trace(); }
+ScriptSystem::~ScriptSystem() { dbg_trace(); }
 
 ScriptSystem & ScriptSystem::get_instance() {
 	static ScriptSystem instance;
@@ -29,14 +25,14 @@ void ScriptSystem::update() {
 	dbg_trace();
 
 	forward_list<Script *> scripts = this->get_scripts();
-	for (Script * script : scripts)
-		script->update();
+	for (Script * script : scripts) script->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>();
+	vector<reference_wrapper<BehaviorScript>> behavior_scripts
+		= mgr.get_components_by_type<BehaviorScript>();
 
 	for (auto behavior_script_ref : behavior_scripts) {
 		BehaviorScript & behavior_script = behavior_script_ref.get();
@@ -47,4 +43,3 @@ forward_list<Script *> ScriptSystem::get_scripts() {
 
 	return scripts;
 }
-
diff --git a/src/crepe/ScriptSystem.h b/src/crepe/ScriptSystem.h
index e0b2a65..1f472a0 100644
--- a/src/crepe/ScriptSystem.h
+++ b/src/crepe/ScriptSystem.h
@@ -21,8 +21,6 @@ private:
 
 private:
 	std::forward_list<api::Script *> get_scripts();
-
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/System.h b/src/crepe/System.h
index 3fe3d66..ecbb7f5 100644
--- a/src/crepe/System.h
+++ b/src/crepe/System.h
@@ -8,8 +8,8 @@ public:
 	virtual void update() = 0;
 
 protected:
-	System() { };
-	virtual ~System() { };
+	System() {};
+	virtual ~System() {};
 
 private:
 	// singleton
@@ -19,5 +19,4 @@ private:
 	System & operator=(System &&) = delete;
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
index 7a93f10..1f236b4 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -1,11 +1,8 @@
 #include "../util/log.h"
 
-#include "Script.h"
 #include "BehaviorScript.h"
+#include "Script.h"
 
 using namespace crepe::api;
 
-BehaviorScript::BehaviorScript() {
-	dbg_trace();
-}
-
+BehaviorScript::BehaviorScript() { dbg_trace(); }
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index 756c2ca..b8263ca 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -7,7 +7,7 @@
 namespace crepe {
 class ScriptSystem;
 class ComponentManager;
-}
+} // namespace crepe
 
 namespace crepe::api {
 
@@ -17,11 +17,12 @@ class BehaviorScript : public Component {
 protected:
 	friend class crepe::ComponentManager;
 	BehaviorScript();
+
 public:
 	virtual ~BehaviorScript() = default;
 
 public:
-	template<class T>
+	template <class T>
 	BehaviorScript & set_script();
 
 protected:
@@ -29,7 +30,6 @@ protected:
 	std::unique_ptr<Script> script = nullptr;
 };
 
-}
+} // namespace crepe::api
 
 #include "BehaviorScript.hpp"
-
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index 9a1f427..a6bd81c 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -7,7 +7,7 @@
 
 namespace crepe::api {
 
-template<class T>
+template <class T>
 BehaviorScript & BehaviorScript::set_script() {
 	static_assert(std::is_base_of<Script, T>::value);
 	dbg_trace();
@@ -16,4 +16,4 @@ BehaviorScript & BehaviorScript::set_script() {
 	return *this;
 }
 
-}
+} // namespace crepe::api
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 6259574..5016ed0 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -1,5 +1,3 @@
 #include "Script.h"
 
 using namespace crepe::api;
-
-
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index b1e6a95..0036d1f 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -8,6 +8,7 @@ namespace crepe::api {
 
 class Script {
 	friend class crepe::ScriptSystem;
+
 protected:
 	virtual void init() {}
 	virtual void update() {}
@@ -17,5 +18,4 @@ protected:
 	// added event.
 };
 
-}
-
+} // namespace crepe::api
diff --git a/src/crepe/util/fmt.cpp b/src/crepe/util/fmt.cpp
index 3a43a6f..8ef1164 100644
--- a/src/crepe/util/fmt.cpp
+++ b/src/crepe/util/fmt.cpp
@@ -1,6 +1,6 @@
-#include <string>
-#include <cstdio>
 #include <cstdarg>
+#include <cstdio>
+#include <string>
 
 #include "fmt.h"
 
@@ -31,4 +31,3 @@ string crepe::util::stringf(const char * fmt, ...) {
 	va_end(args);
 	return out;
 }
-
diff --git a/src/crepe/util/fmt.h b/src/crepe/util/fmt.h
index 5c45703..44c426f 100644
--- a/src/crepe/util/fmt.h
+++ b/src/crepe/util/fmt.h
@@ -7,4 +7,4 @@ namespace crepe::util {
 std::string va_stringf(va_list args, const char * fmt);
 std::string stringf(const char * fmt, ...);
 
-}
+} // namespace crepe::util
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index b46620d..f012c67 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -3,8 +3,8 @@
 #include <cstdlib>
 #include <string>
 
-#include "log.h"
 #include "fmt.h"
+#include "log.h"
 
 using namespace crepe::util;
 
@@ -38,4 +38,3 @@ void crepe::util::logf(log_level level, const char * fmt, ...) {
 	log(level, va_stringf(args, fmt));
 	va_end(args);
 }
-
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 95c4950..cc585db 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -3,22 +3,20 @@
  * Standalone example for usage of the script component and system
  */
 
-#include <crepe/util/log.h>
-#include <crepe/ScriptSystem.h>
 #include <crepe/ComponentManager.h>
 #include <crepe/GameObject.h>
+#include <crepe/ScriptSystem.h>
+#include <crepe/util/log.h>
 
-#include <crepe/api/Script.h>
 #include <crepe/api/BehaviorScript.h>
+#include <crepe/api/Script.h>
 
 using namespace crepe;
 using namespace crepe::api;
 using namespace std;
 
 class MyScript : public Script {
-	void update() {
-		dbg_log("MY SCRIPT UPDATE");
-	}
+	void update() { dbg_log("MY SCRIPT UPDATE"); }
 };
 
 int main() {
@@ -32,4 +30,3 @@ int main() {
 
 	return 0;
 }
-
-- 
cgit v1.2.3