From f3eeedc91a04ca0651e0fe78a2119e7e3e38e391 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 25 Sep 2024 17:36:31 +0200
Subject: WIP Audio API + facade

---
 src/crepe/api/AudioSource.cpp | 25 +++++++++++++++++++++++++
 src/crepe/api/AudioSource.h   | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/crepe/api/CMakeLists.txt  |  4 ++++
 src/crepe/api/Component.h     | 11 +++++++++++
 src/crepe/api/Resource.h      | 17 +++++++++++++++++
 5 files changed, 99 insertions(+)
 create mode 100644 src/crepe/api/AudioSource.cpp
 create mode 100644 src/crepe/api/AudioSource.h
 create mode 100644 src/crepe/api/CMakeLists.txt
 create mode 100644 src/crepe/api/Component.h
 create mode 100644 src/crepe/api/Resource.h

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
new file mode 100644
index 0000000..cbde79f
--- /dev/null
+++ b/src/crepe/api/AudioSource.cpp
@@ -0,0 +1,25 @@
+#include "AudioSource.h"
+
+#include "../Sound.h"
+#include <memory>
+
+using namespace crepe::api;
+
+AudioSource::AudioSource(std::unique_ptr<Resource> audio_clip) {
+	this->_sound = std::make_unique<crepe::Sound>(std::move(audio_clip));
+}
+
+void AudioSource::play() {
+	return this->play(false);
+}
+
+void AudioSource::play(bool looping) {
+	this->_sound->set_looping(looping);
+	this->_sound->play();
+}
+
+void AudioSource::stop() {
+	this->_sound->pause();
+	this->_sound->rewind();
+}
+
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
new file mode 100644
index 0000000..6a038be
--- /dev/null
+++ b/src/crepe/api/AudioSource.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <memory>
+
+#include "Component.h"
+#include "Resource.h"
+
+namespace crepe {
+class Sound;
+}
+
+namespace crepe::api {
+
+//! Audio source component
+class AudioSource : Component {
+public:
+	AudioSource(std::unique_ptr<Resource> audio_clip);
+	virtual ~AudioSource() = default;
+
+public:
+	//! Start or resume this audio source
+	void play();
+	void play(bool looping);
+	//! Stop this audio source
+	void stop();
+
+public:
+	//! Sample file location
+	std::unique_ptr<Resource> audio_clip;
+	//! TODO: ?????
+	bool play_on_awake;
+	//! Repeat the current audio clip during playback
+	bool loop;
+	//! Normalized volume (0.0 - 1.0)
+	float volume;
+
+private:
+	std::unique_ptr<crepe::Sound> _sound;
+};
+
+}
+
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
new file mode 100644
index 0000000..94617a4
--- /dev/null
+++ b/src/crepe/api/CMakeLists.txt
@@ -0,0 +1,4 @@
+target_sources(crepe PUBLIC
+	AudioSource.cpp
+)
+
diff --git a/src/crepe/api/Component.h b/src/crepe/api/Component.h
new file mode 100644
index 0000000..2abb461
--- /dev/null
+++ b/src/crepe/api/Component.h
@@ -0,0 +1,11 @@
+#pragma once
+
+namespace crepe::api {
+
+class Component {
+public:
+	bool active;
+};
+
+}
+
diff --git a/src/crepe/api/Resource.h b/src/crepe/api/Resource.h
new file mode 100644
index 0000000..620a10e
--- /dev/null
+++ b/src/crepe/api/Resource.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <string>
+
+namespace crepe::api {
+
+class Resource {
+public:
+	Resource(const std::string & source);
+	virtual ~Resource();
+
+private:
+	std::string _source;
+};
+
+}
+
-- 
cgit v1.2.3


From 3cb7227c3c9678141ff74915331b706265c380cb Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 28 Sep 2024 17:07:56 +0200
Subject: more WIP audio facade

---
 src/CMakeLists.txt           | 15 +++++++++---
 src/crepe/CMakeLists.txt     |  6 +++++
 src/crepe/Sound.cpp          | 19 ++++++++++++++--
 src/crepe/Sound.h            | 54 ++++++++++++++++++++++++++++++++++++++------
 src/crepe/SoundSystem.cpp    | 25 ++++++++++++++++++++
 src/crepe/SoundSystem.h      | 27 ++++++++++++++++++++++
 src/crepe/api/CMakeLists.txt |  9 +++++++-
 src/crepe/api/Resource.cpp   | 12 ++++++++++
 src/crepe/api/Resource.h     | 11 ++++++---
 src/dummy_audio.cpp          | 37 ++++++++++++++++++++++++++++++
 test/CMakeLists.txt          |  2 +-
 11 files changed, 200 insertions(+), 17 deletions(-)
 create mode 100644 src/crepe/SoundSystem.cpp
 create mode 100644 src/crepe/SoundSystem.h
 create mode 100644 src/crepe/api/Resource.cpp
 create mode 100644 src/dummy_audio.cpp

(limited to 'src/crepe/api')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cc71435..232d330 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,13 +15,22 @@ project(crepe C CXX)
 add_library(crepe SHARED)
 
 target_include_directories(crepe
-	SYSTEM INTERFACE .
+	PUBLIC SYSTEM INTERFACE .
 )
 
-# NOTE: all libraries *must* be linked as PRIVATE
+# TODO: libraries should be linked as PRIVATE
 target_link_libraries(crepe
-	PRIVATE soloud
+	PUBLIC soloud
 )
 
 add_subdirectory(crepe)
 
+install(
+	TARGETS crepe
+	FILE_SET HEADERS DESTINATION include/crepe
+)
+
+
+add_executable(dummy_audio dummy_audio.cpp)
+target_link_libraries(dummy_audio PUBLIC crepe)
+
diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index aa64262..13d9be5 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -1,5 +1,11 @@
 target_sources(crepe PUBLIC
 	Sound.cpp
+	SoundSystem.cpp
+)
+
+target_sources(crepe PUBLIC FILE_SET HEADERS FILES
+	Sound.h
+	SoundSystem.h
 )
 
 add_subdirectory(api)
diff --git a/src/crepe/Sound.cpp b/src/crepe/Sound.cpp
index f45a697..d48393c 100644
--- a/src/crepe/Sound.cpp
+++ b/src/crepe/Sound.cpp
@@ -1,9 +1,24 @@
 #include "Sound.h"
+#include "SoundSystem.h"
 
 using namespace crepe;
 
-Sound::Sound(std::unique_ptr<api::Resource> res) {
-	_res = std::move(res);
+Sound::Sound(std::unique_ptr<api::Resource> res, SoundSystem & system) : system(system) {
+	this->res = std::move(res);
 }
 
+void Sound::play() {
+	if (this->system.engine.getPause(this->handle)) {
+		// resume if paused
+		this->system.engine.setPause(this->handle, false);
+	} else {
+		// or start new sound
+		this->handle = this->system.engine.play(this->sample);
+	}
+}
+
+void Sound::pause() {
+	if (this->system.engine.getPause(this->handle)) return;
+	this->system.engine.setPause(this->handle, true);
+}
 
diff --git a/src/crepe/Sound.h b/src/crepe/Sound.h
index ac4b7f4..71fe390 100644
--- a/src/crepe/Sound.h
+++ b/src/crepe/Sound.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <soloud.h>
+#include <soloud_wav.h>
 
 #include <memory>
 
@@ -8,22 +9,61 @@
 
 namespace crepe {
 
-class Sound {
-public:
-	Sound(std::unique_ptr<api::Resource> res);
-	virtual ~Sound() = default;
+class SoundSystem;
 
+class Sound {
 public:
+	/**
+	 * \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();
+	/**
+	 * \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();
+	/**
+	 * \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();
+	/**
+	 * \brief Set playback volume / gain
+	 *
+	 * \param volume  Volume (0 = muted, 1 = full volume)
+	 */
 	void set_volume(float volume);
+	/**
+	 * \brief Set looping behavior for this sample
+	 *
+	 * \param looping  Looping behavior (false = one-shot, true = loop)
+	 */
 	void set_looping(bool looping);
 
 private:
-	std::unique_ptr<api::Resource> _res;
-	SoLoud::handle _handle;
-	bool _paused;
+	Sound(std::unique_ptr<api::Resource> res, SoundSystem & system);
+	SoundSystem & system;
+	friend class SoundSystem;
+
+private:
+	std::unique_ptr<api::Resource> res;
+	SoLoud::Wav sample;
+	SoLoud::handle handle;
+	bool paused;
 };
 
 }
diff --git a/src/crepe/SoundSystem.cpp b/src/crepe/SoundSystem.cpp
new file mode 100644
index 0000000..30b0157
--- /dev/null
+++ b/src/crepe/SoundSystem.cpp
@@ -0,0 +1,25 @@
+#include "SoundSystem.h"
+#include <memory>
+
+using namespace crepe;
+
+SoundSystem SoundSystem::instance { };
+
+std::unique_ptr<Sound> SoundSystem::sound(const std::string & src) {
+	auto res = std::make_unique<api::Resource>(src);
+	return SoundSystem::sound(std::move(res));
+}
+
+std::unique_ptr<Sound> SoundSystem::sound(std::unique_ptr<api::Resource> res) {
+	Sound * out = new Sound(std::move(res), SoundSystem::instance);
+	return std::unique_ptr<Sound>(out);
+}
+
+SoundSystem::SoundSystem() {
+	engine.init();
+}
+
+SoundSystem::~SoundSystem() {
+	engine.deinit();
+}
+
diff --git a/src/crepe/SoundSystem.h b/src/crepe/SoundSystem.h
new file mode 100644
index 0000000..23bb00a
--- /dev/null
+++ b/src/crepe/SoundSystem.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <soloud.h>
+
+#include <memory>
+
+#include "Sound.h"
+
+namespace crepe {
+
+class SoundSystem {
+public:
+	static std::unique_ptr<Sound> sound(const std::string & res);
+	static std::unique_ptr<Sound> sound(std::unique_ptr<api::Resource> res);
+
+private:
+	SoundSystem();
+	virtual ~SoundSystem();
+	static SoundSystem instance;
+
+private:
+	SoLoud::Soloud engine;
+	friend class Sound;
+};
+
+}
+
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 94617a4..feb03ef 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -1,4 +1,11 @@
 target_sources(crepe PUBLIC
-	AudioSource.cpp
+	# AudioSource.cpp
+	Resource.cpp
+)
+
+target_sources(crepe PUBLIC FILE_SET HEADERS FILES
+	AudioSource.h
+	Component.h
+	Resource.h
 )
 
diff --git a/src/crepe/api/Resource.cpp b/src/crepe/api/Resource.cpp
new file mode 100644
index 0000000..a38900b
--- /dev/null
+++ b/src/crepe/api/Resource.cpp
@@ -0,0 +1,12 @@
+#include "Resource.h"
+
+using namespace crepe::api;
+
+Resource::Resource(const std::string & src) : src(src) {
+	this->file = std::ifstream(src, std::ios::in | std::ios::binary);
+}
+
+const std::istream & Resource::read() {
+	return this->file;
+}
+
diff --git a/src/crepe/api/Resource.h b/src/crepe/api/Resource.h
index 620a10e..2260b1a 100644
--- a/src/crepe/api/Resource.h
+++ b/src/crepe/api/Resource.h
@@ -1,16 +1,21 @@
 #pragma once
 
 #include <string>
+#include <fstream>
+#include <iostream>
 
 namespace crepe::api {
 
 class Resource {
 public:
-	Resource(const std::string & source);
-	virtual ~Resource();
+	Resource(const std::string & src);
+
+public:
+	const std::istream & read();
 
 private:
-	std::string _source;
+	std::string src;
+	std::ifstream file;
 };
 
 }
diff --git a/src/dummy_audio.cpp b/src/dummy_audio.cpp
new file mode 100644
index 0000000..5e0000e
--- /dev/null
+++ b/src/dummy_audio.cpp
@@ -0,0 +1,37 @@
+#include "crepe/SoundSystem.h"
+
+#include <chrono>
+#include <thread>
+
+using namespace crepe;
+using namespace std;
+using namespace std::chrono_literals;
+
+int main() {
+	auto bgm = SoundSystem::sound("../mwe/audio/bgm.ogg");
+	auto sfx1 = SoundSystem::sound("../mwe/audio/sfx1.wav");
+	auto sfx2 = SoundSystem::sound("../mwe/audio/sfx2.wav");
+	auto sfx3 = SoundSystem::sound("../mwe/audio/sfx3.wav");
+
+	bgm->play();
+
+	// play each sample sequentially
+	this_thread::sleep_for(500ms);
+	sfx1->play();
+	this_thread::sleep_for(500ms);
+	sfx2->play();
+	bgm->pause();
+	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);
+
+	return 0;
+}
+
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d103b9a..f015570 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -13,7 +13,7 @@ add_subdirectory(../src crepe)
 
 add_executable(test
 	dummy.cpp
-	audio.cpp
+	# audio.cpp
 )
 
 target_link_libraries(test
-- 
cgit v1.2.3


From e4a3ef6e324acc8edf9f0797caa244967907a676 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 29 Sep 2024 16:37:12 +0200
Subject: implement audio poc using facade classes

---
 src/crepe/Sound.cpp        |  1 +
 src/crepe/api/Resource.cpp | 11 +++++++++--
 src/crepe/api/Resource.h   |  3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/Sound.cpp b/src/crepe/Sound.cpp
index 94f97af..181366a 100644
--- a/src/crepe/Sound.cpp
+++ b/src/crepe/Sound.cpp
@@ -8,6 +8,7 @@ using namespace crepe;
 Sound::Sound(std::unique_ptr<api::Resource> res) {
 	dbg_trace();
 	this->res = std::move(res);
+	this->sample.load(this->res->canonical());
 }
 
 void Sound::play() {
diff --git a/src/crepe/api/Resource.cpp b/src/crepe/api/Resource.cpp
index a38900b..6bb081d 100644
--- a/src/crepe/api/Resource.cpp
+++ b/src/crepe/api/Resource.cpp
@@ -1,12 +1,19 @@
+#include <filesystem>
+
 #include "Resource.h"
 
 using namespace crepe::api;
 
-Resource::Resource(const std::string & src) : src(src) {
-	this->file = std::ifstream(src, std::ios::in | std::ios::binary);
+Resource::Resource(const std::string & src) {
+	this->src = std::filesystem::canonical(src);
+	this->file = std::ifstream(this->src, std::ios::in | std::ios::binary);
 }
 
 const std::istream & Resource::read() {
 	return this->file;
 }
 
+const char * Resource::canonical() {
+	return this->src.c_str();
+}
+
diff --git a/src/crepe/api/Resource.h b/src/crepe/api/Resource.h
index 2260b1a..2b62ff9 100644
--- a/src/crepe/api/Resource.h
+++ b/src/crepe/api/Resource.h
@@ -11,7 +11,10 @@ public:
 	Resource(const std::string & src);
 
 public:
+	//! Get an input stream to the contents of this resource
 	const std::istream & read();
+	//! Get the canonical path to this resource
+	const char * canonical();
 
 private:
 	std::string src;
-- 
cgit v1.2.3


From 65eda52aa51017f6f7aad158c4f8b6e91054cf0d Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 1 Oct 2024 17:27:14 +0200
Subject: `make format`

---
 mwe/audio/soloud/main.cpp     |  3 +--
 mwe/dynlink/exec/main.c       |  1 -
 src/crepe/Sound.cpp           |  1 -
 src/crepe/Sound.h             |  3 +--
 src/crepe/SoundContext.cpp    |  1 -
 src/crepe/SoundContext.h      |  7 +++----
 src/crepe/api/AudioSource.cpp |  5 +----
 src/crepe/api/AudioSource.h   |  3 +--
 src/crepe/api/Component.h     |  3 +--
 src/crepe/api/Resource.cpp    |  9 ++-------
 src/crepe/api/Resource.h      |  5 ++---
 src/crepe/util/color.h        |  3 +--
 src/crepe/util/log.cpp        |  1 -
 src/crepe/util/log.h          | 20 ++++++++++----------
 src/dummy_audio.cpp           |  3 +--
 test/audio.cpp                |  3 +--
 16 files changed, 25 insertions(+), 46 deletions(-)

(limited to 'src/crepe/api')

diff --git a/mwe/audio/soloud/main.cpp b/mwe/audio/soloud/main.cpp
index 25ba003..50df0b7 100644
--- a/mwe/audio/soloud/main.cpp
+++ b/mwe/audio/soloud/main.cpp
@@ -38,8 +38,7 @@ int main() {
 	this_thread::sleep_for(500ms);
 
 	// play all samples simultaniously
-	for (unsigned i = 0; i < 3; i++)
-		soloud.play(sfx[i]);
+	for (unsigned i = 0; i < 3; i++) soloud.play(sfx[i]);
 	this_thread::sleep_for(1000ms);
 
 	// stop all audio and exit
diff --git a/mwe/dynlink/exec/main.c b/mwe/dynlink/exec/main.c
index ea55feb..ff884f2 100644
--- a/mwe/dynlink/exec/main.c
+++ b/mwe/dynlink/exec/main.c
@@ -5,4 +5,3 @@ int main() {
 
 	return 0;
 }
-
diff --git a/src/crepe/Sound.cpp b/src/crepe/Sound.cpp
index 1758282..e1150ac 100644
--- a/src/crepe/Sound.cpp
+++ b/src/crepe/Sound.cpp
@@ -58,4 +58,3 @@ void Sound::set_looping(bool looping) {
 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
 	ctx.engine.setLooping(this->handle, this->looping);
 }
-
diff --git a/src/crepe/Sound.h b/src/crepe/Sound.h
index 4c51188..ac93991 100644
--- a/src/crepe/Sound.h
+++ b/src/crepe/Sound.h
@@ -79,5 +79,4 @@ private:
 	bool looping = false;
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/SoundContext.cpp b/src/crepe/SoundContext.cpp
index cfb7d82..72047d2 100644
--- a/src/crepe/SoundContext.cpp
+++ b/src/crepe/SoundContext.cpp
@@ -18,4 +18,3 @@ SoundContext::~SoundContext() {
 	dbg_trace();
 	engine.deinit();
 }
-
diff --git a/src/crepe/SoundContext.h b/src/crepe/SoundContext.h
index d361d83..090966d 100644
--- a/src/crepe/SoundContext.h
+++ b/src/crepe/SoundContext.h
@@ -15,13 +15,12 @@ private:
 	static SoundContext & get_instance();
 	SoundContext(const SoundContext &) = delete;
 	SoundContext(SoundContext &&) = delete;
-	SoundContext &operator=(const SoundContext &) = delete;
-	SoundContext &operator=(SoundContext &&) = delete;
+	SoundContext & operator=(const SoundContext &) = delete;
+	SoundContext & operator=(SoundContext &&) = delete;
 
 private:
 	SoLoud::Soloud engine;
 	friend class Sound;
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index cbde79f..4d1b093 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -9,9 +9,7 @@ AudioSource::AudioSource(std::unique_ptr<Resource> audio_clip) {
 	this->_sound = std::make_unique<crepe::Sound>(std::move(audio_clip));
 }
 
-void AudioSource::play() {
-	return this->play(false);
-}
+void AudioSource::play() { return this->play(false); }
 
 void AudioSource::play(bool looping) {
 	this->_sound->set_looping(looping);
@@ -22,4 +20,3 @@ void AudioSource::stop() {
 	this->_sound->pause();
 	this->_sound->rewind();
 }
-
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 6a038be..4300c48 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -38,5 +38,4 @@ private:
 	std::unique_ptr<crepe::Sound> _sound;
 };
 
-}
-
+} // namespace crepe::api
diff --git a/src/crepe/api/Component.h b/src/crepe/api/Component.h
index 2abb461..d5e0499 100644
--- a/src/crepe/api/Component.h
+++ b/src/crepe/api/Component.h
@@ -7,5 +7,4 @@ public:
 	bool active;
 };
 
-}
-
+} // namespace crepe::api
diff --git a/src/crepe/api/Resource.cpp b/src/crepe/api/Resource.cpp
index 6bb081d..1a647ce 100644
--- a/src/crepe/api/Resource.cpp
+++ b/src/crepe/api/Resource.cpp
@@ -9,11 +9,6 @@ Resource::Resource(const std::string & src) {
 	this->file = std::ifstream(this->src, std::ios::in | std::ios::binary);
 }
 
-const std::istream & Resource::read() {
-	return this->file;
-}
-
-const char * Resource::canonical() {
-	return this->src.c_str();
-}
+const std::istream & Resource::read() { return this->file; }
 
+const char * Resource::canonical() { return this->src.c_str(); }
diff --git a/src/crepe/api/Resource.h b/src/crepe/api/Resource.h
index 2b62ff9..f2b2a0e 100644
--- a/src/crepe/api/Resource.h
+++ b/src/crepe/api/Resource.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <string>
 #include <fstream>
 #include <iostream>
+#include <string>
 
 namespace crepe::api {
 
@@ -21,5 +21,4 @@ private:
 	std::ifstream file;
 };
 
-}
-
+} // namespace crepe::api
diff --git a/src/crepe/util/color.h b/src/crepe/util/color.h
index 1af6c8f..066c9d3 100644
--- a/src/crepe/util/color.h
+++ b/src/crepe/util/color.h
@@ -38,5 +38,4 @@ constexpr const char * BG_MAGENTA_BRIGHT = "\e[105m";
 constexpr const char * BG_CYAN_BRIGHT = "\e[106m";
 constexpr const char * BG_WHITE_BRIGHT = "\e[107m";
 
-}
-
+} // namespace crepe::util::color
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index 796df49..6829ec3 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -48,4 +48,3 @@ void crepe::util::logf(log_level level, const char * fmt, ...) {
 	va_logf(level, args, fmt);
 	va_end(args);
 }
-
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index 5295cb9..4cab338 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -8,12 +8,9 @@
 // utility macros
 #define _crepe_logf_here(fmt, ...) \
 	crepe::util::logf(util::log_level::debug, "%s%s (%s:%d)" fmt "\n", \
-			crepe::util::color::FG_WHITE, \
-			__PRETTY_FUNCTION__, \
-			__FILE_NAME__, \
-			__LINE__, \
-			crepe::util::color::RESET, \
-			__VA_ARGS__)
+					  crepe::util::color::FG_WHITE, __PRETTY_FUNCTION__, \
+					  __FILE_NAME__, __LINE__, crepe::util::color::RESET, \
+					  __VA_ARGS__)
 
 #define dbg_logf(fmt, ...) _crepe_logf_here(": " fmt, __VA_ARGS__)
 #define dbg_log(str) _crepe_logf_here(": %s", str)
@@ -23,11 +20,14 @@
 
 namespace crepe::util {
 
-enum log_level { debug, info, warning, error, };
+enum log_level {
+	debug,
+	info,
+	warning,
+	error,
+};
 
 void logf(const char * fmt, ...);
 void logf(enum log_level level, const char * fmt, ...);
 
-}
-
-
+} // namespace crepe::util
diff --git a/src/dummy_audio.cpp b/src/dummy_audio.cpp
index 1249076..049bb49 100644
--- a/src/dummy_audio.cpp
+++ b/src/dummy_audio.cpp
@@ -1,5 +1,5 @@
-#include "crepe/util/log.h"
 #include "crepe/Sound.h"
+#include "crepe/util/log.h"
 
 #include <chrono>
 #include <thread>
@@ -38,4 +38,3 @@ int main() {
 
 	return 0;
 }
-
diff --git a/test/audio.cpp b/test/audio.cpp
index a415919..47c5e84 100644
--- a/test/audio.cpp
+++ b/test/audio.cpp
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 #include <memory>
 
-#include <crepe/api/Resource.h>
 #include <crepe/api/AudioSource.h>
+#include <crepe/api/Resource.h>
 
 #include <chrono>
 #include <thread>
@@ -26,4 +26,3 @@ TEST(audio, play) {
 
 	ASSERT_TRUE(true);
 }
-
-- 
cgit v1.2.3


From 202a9ec288ded78771e1f7e4c711a7612b201b9d Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 5 Oct 2024 14:20:45 +0200
Subject: rename Resource to Asset

---
 src/crepe/Sound.cpp           |  6 +++---
 src/crepe/Sound.h             |  6 +++---
 src/crepe/api/Asset.cpp       | 14 ++++++++++++++
 src/crepe/api/Asset.h         | 24 ++++++++++++++++++++++++
 src/crepe/api/AudioSource.cpp |  2 +-
 src/crepe/api/AudioSource.h   |  6 +++---
 src/crepe/api/CMakeLists.txt  |  4 ++--
 src/crepe/api/Resource.cpp    | 14 --------------
 src/crepe/api/Resource.h      | 24 ------------------------
 src/test/audio.cpp            |  4 ++--
 10 files changed, 52 insertions(+), 52 deletions(-)
 create mode 100644 src/crepe/api/Asset.cpp
 create mode 100644 src/crepe/api/Asset.h
 delete mode 100644 src/crepe/api/Resource.cpp
 delete mode 100644 src/crepe/api/Resource.h

(limited to 'src/crepe/api')

diff --git a/src/crepe/Sound.cpp b/src/crepe/Sound.cpp
index 1758282..c6e87d5 100644
--- a/src/crepe/Sound.cpp
+++ b/src/crepe/Sound.cpp
@@ -5,17 +5,17 @@
 
 using namespace crepe;
 
-Sound::Sound(std::unique_ptr<api::Resource> res) {
+Sound::Sound(std::unique_ptr<api::Asset> res) {
 	dbg_trace();
 	this->load(std::move(res));
 }
 
 Sound::Sound(const char * src) {
 	dbg_trace();
-	this->load(std::make_unique<api::Resource>(src));
+	this->load(std::make_unique<api::Asset>(src));
 }
 
-void Sound::load(std::unique_ptr<api::Resource> res) {
+void Sound::load(std::unique_ptr<api::Asset> res) {
 	this->sample.load(res->canonical());
 }
 
diff --git a/src/crepe/Sound.h b/src/crepe/Sound.h
index ac93991..339dd7c 100644
--- a/src/crepe/Sound.h
+++ b/src/crepe/Sound.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include "api/Resource.h"
+#include "api/Asset.h"
 
 namespace crepe {
 
@@ -66,10 +66,10 @@ public:
 
 public:
 	Sound(const char * src);
-	Sound(std::unique_ptr<api::Resource> res);
+	Sound(std::unique_ptr<api::Asset> res);
 
 private:
-	void load(std::unique_ptr<api::Resource> res);
+	void load(std::unique_ptr<api::Asset> res);
 
 private:
 	SoLoud::Wav sample;
diff --git a/src/crepe/api/Asset.cpp b/src/crepe/api/Asset.cpp
new file mode 100644
index 0000000..92ee50e
--- /dev/null
+++ b/src/crepe/api/Asset.cpp
@@ -0,0 +1,14 @@
+#include <filesystem>
+
+#include "Asset.h"
+
+using namespace crepe::api;
+
+Asset::Asset(const std::string & src) {
+	this->src = std::filesystem::canonical(src);
+	this->file = std::ifstream(this->src, std::ios::in | std::ios::binary);
+}
+
+const std::istream & Asset::read() { return this->file; }
+
+const char * Asset::canonical() { return this->src.c_str(); }
diff --git a/src/crepe/api/Asset.h b/src/crepe/api/Asset.h
new file mode 100644
index 0000000..259c696
--- /dev/null
+++ b/src/crepe/api/Asset.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <fstream>
+#include <iostream>
+#include <string>
+
+namespace crepe::api {
+
+class Asset {
+public:
+	Asset(const std::string & src);
+
+public:
+	//! Get an input stream to the contents of this resource
+	const std::istream & read();
+	//! Get the canonical path to this resource
+	const char * canonical();
+
+private:
+	std::string src;
+	std::ifstream file;
+};
+
+} // namespace crepe::api
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index 4d1b093..656fc46 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -5,7 +5,7 @@
 
 using namespace crepe::api;
 
-AudioSource::AudioSource(std::unique_ptr<Resource> audio_clip) {
+AudioSource::AudioSource(std::unique_ptr<Asset> audio_clip) {
 	this->_sound = std::make_unique<crepe::Sound>(std::move(audio_clip));
 }
 
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 4300c48..9dfaf46 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -3,7 +3,7 @@
 #include <memory>
 
 #include "Component.h"
-#include "Resource.h"
+#include "Asset.h"
 
 namespace crepe {
 class Sound;
@@ -14,7 +14,7 @@ namespace crepe::api {
 //! Audio source component
 class AudioSource : Component {
 public:
-	AudioSource(std::unique_ptr<Resource> audio_clip);
+	AudioSource(std::unique_ptr<Asset> audio_clip);
 	virtual ~AudioSource() = default;
 
 public:
@@ -26,7 +26,7 @@ public:
 
 public:
 	//! Sample file location
-	std::unique_ptr<Resource> audio_clip;
+	std::unique_ptr<Asset> audio_clip;
 	//! TODO: ?????
 	bool play_on_awake;
 	//! Repeat the current audio clip during playback
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index feb03ef..54c7fdc 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -1,11 +1,11 @@
 target_sources(crepe PUBLIC
 	# AudioSource.cpp
-	Resource.cpp
+	Asset.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	AudioSource.h
 	Component.h
-	Resource.h
+	Asset.h
 )
 
diff --git a/src/crepe/api/Resource.cpp b/src/crepe/api/Resource.cpp
deleted file mode 100644
index 1a647ce..0000000
--- a/src/crepe/api/Resource.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <filesystem>
-
-#include "Resource.h"
-
-using namespace crepe::api;
-
-Resource::Resource(const std::string & src) {
-	this->src = std::filesystem::canonical(src);
-	this->file = std::ifstream(this->src, std::ios::in | std::ios::binary);
-}
-
-const std::istream & Resource::read() { return this->file; }
-
-const char * Resource::canonical() { return this->src.c_str(); }
diff --git a/src/crepe/api/Resource.h b/src/crepe/api/Resource.h
deleted file mode 100644
index f2b2a0e..0000000
--- a/src/crepe/api/Resource.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <fstream>
-#include <iostream>
-#include <string>
-
-namespace crepe::api {
-
-class Resource {
-public:
-	Resource(const std::string & src);
-
-public:
-	//! Get an input stream to the contents of this resource
-	const std::istream & read();
-	//! Get the canonical path to this resource
-	const char * canonical();
-
-private:
-	std::string src;
-	std::ifstream file;
-};
-
-} // namespace crepe::api
diff --git a/src/test/audio.cpp b/src/test/audio.cpp
index 5bb2607..1d84551 100644
--- a/src/test/audio.cpp
+++ b/src/test/audio.cpp
@@ -2,7 +2,7 @@
 #include <memory>
 
 #include <crepe/api/AudioSource.h>
-#include <crepe/api/Resource.h>
+#include <crepe/api/Asset.h>
 
 #include <chrono>
 #include <thread>
@@ -15,7 +15,7 @@ using namespace crepe::api;
 // TODO: mock internal audio class
 
 TEST(audio, play) {
-	auto res = std::make_unique<Resource>("../mwe/audio/bgm.ogg");
+	auto res = std::make_unique<Asset>("../mwe/audio/bgm.ogg");
 	auto bgm = AudioSource(std::move(res));
 
 	bgm.play();
-- 
cgit v1.2.3


From b99e38badb82c5cc79771a77c5f6ea180c67ee4f Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 5 Oct 2024 14:24:39 +0200
Subject: move Asset from crepe::api to crepe

---
 src/crepe/Asset.cpp          | 14 ++++++++++++++
 src/crepe/Asset.h            | 24 ++++++++++++++++++++++++
 src/crepe/CMakeLists.txt     |  2 ++
 src/crepe/Sound.cpp          |  6 +++---
 src/crepe/Sound.h            |  6 +++---
 src/crepe/api/Asset.cpp      | 14 --------------
 src/crepe/api/Asset.h        | 24 ------------------------
 src/crepe/api/CMakeLists.txt |  2 --
 8 files changed, 46 insertions(+), 46 deletions(-)
 create mode 100644 src/crepe/Asset.cpp
 create mode 100644 src/crepe/Asset.h
 delete mode 100644 src/crepe/api/Asset.cpp
 delete mode 100644 src/crepe/api/Asset.h

(limited to 'src/crepe/api')

diff --git a/src/crepe/Asset.cpp b/src/crepe/Asset.cpp
new file mode 100644
index 0000000..15ddc27
--- /dev/null
+++ b/src/crepe/Asset.cpp
@@ -0,0 +1,14 @@
+#include <filesystem>
+
+#include "Asset.h"
+
+using namespace crepe;
+
+Asset::Asset(const std::string & src) {
+	this->src = std::filesystem::canonical(src);
+	this->file = std::ifstream(this->src, std::ios::in | std::ios::binary);
+}
+
+const std::istream & Asset::read() { return this->file; }
+
+const char * Asset::canonical() { return this->src.c_str(); }
diff --git a/src/crepe/Asset.h b/src/crepe/Asset.h
new file mode 100644
index 0000000..736ba44
--- /dev/null
+++ b/src/crepe/Asset.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <fstream>
+#include <iostream>
+#include <string>
+
+namespace crepe {
+
+class Asset {
+public:
+	Asset(const std::string & src);
+
+public:
+	//! Get an input stream to the contents of this resource
+	const std::istream & read();
+	//! Get the canonical path to this resource
+	const char * canonical();
+
+private:
+	std::string src;
+	std::ifstream file;
+};
+
+} // namespace crepe
diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 3a60840..208ba1f 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -1,9 +1,11 @@
 target_sources(crepe PUBLIC
+	Asset.cpp
 	Sound.cpp
 	SoundContext.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
+	Asset.h
 	Sound.h
 	SoundContext.h
 )
diff --git a/src/crepe/Sound.cpp b/src/crepe/Sound.cpp
index c6e87d5..73ad69c 100644
--- a/src/crepe/Sound.cpp
+++ b/src/crepe/Sound.cpp
@@ -5,17 +5,17 @@
 
 using namespace crepe;
 
-Sound::Sound(std::unique_ptr<api::Asset> res) {
+Sound::Sound(std::unique_ptr<Asset> res) {
 	dbg_trace();
 	this->load(std::move(res));
 }
 
 Sound::Sound(const char * src) {
 	dbg_trace();
-	this->load(std::make_unique<api::Asset>(src));
+	this->load(std::make_unique<Asset>(src));
 }
 
-void Sound::load(std::unique_ptr<api::Asset> res) {
+void Sound::load(std::unique_ptr<Asset> res) {
 	this->sample.load(res->canonical());
 }
 
diff --git a/src/crepe/Sound.h b/src/crepe/Sound.h
index 339dd7c..1ac20a7 100644
--- a/src/crepe/Sound.h
+++ b/src/crepe/Sound.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include "api/Asset.h"
+#include "Asset.h"
 
 namespace crepe {
 
@@ -66,10 +66,10 @@ public:
 
 public:
 	Sound(const char * src);
-	Sound(std::unique_ptr<api::Asset> res);
+	Sound(std::unique_ptr<Asset> res);
 
 private:
-	void load(std::unique_ptr<api::Asset> res);
+	void load(std::unique_ptr<Asset> res);
 
 private:
 	SoLoud::Wav sample;
diff --git a/src/crepe/api/Asset.cpp b/src/crepe/api/Asset.cpp
deleted file mode 100644
index 92ee50e..0000000
--- a/src/crepe/api/Asset.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <filesystem>
-
-#include "Asset.h"
-
-using namespace crepe::api;
-
-Asset::Asset(const std::string & src) {
-	this->src = std::filesystem::canonical(src);
-	this->file = std::ifstream(this->src, std::ios::in | std::ios::binary);
-}
-
-const std::istream & Asset::read() { return this->file; }
-
-const char * Asset::canonical() { return this->src.c_str(); }
diff --git a/src/crepe/api/Asset.h b/src/crepe/api/Asset.h
deleted file mode 100644
index 259c696..0000000
--- a/src/crepe/api/Asset.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <fstream>
-#include <iostream>
-#include <string>
-
-namespace crepe::api {
-
-class Asset {
-public:
-	Asset(const std::string & src);
-
-public:
-	//! Get an input stream to the contents of this resource
-	const std::istream & read();
-	//! Get the canonical path to this resource
-	const char * canonical();
-
-private:
-	std::string src;
-	std::ifstream file;
-};
-
-} // namespace crepe::api
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 54c7fdc..9548594 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -1,11 +1,9 @@
 target_sources(crepe PUBLIC
 	# AudioSource.cpp
-	Asset.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	AudioSource.h
 	Component.h
-	Asset.h
 )
 
-- 
cgit v1.2.3


From e54ebc7e74f3ca94de3467a03397c0aad2aed079 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 5 Oct 2024 14:50:49 +0200
Subject: `make format` + clang-tidy

---
 makefile                       |  3 +--
 src/crepe/Sound.cpp            |  1 -
 src/crepe/api/AudioSource.h    |  2 +-
 src/crepe/util/log.h           |  3 +++
 src/example/audio_internal.cpp |  1 -
 src/makefile                   |  6 ++++++
 src/test/audio.cpp             | 23 ++---------------------
 src/test/dummy.cpp             |  1 -
 8 files changed, 13 insertions(+), 27 deletions(-)
 create mode 100644 src/makefile

(limited to 'src/crepe/api')

diff --git a/makefile b/makefile
index 737e7a8..dd7c587 100644
--- a/makefile
+++ b/makefile
@@ -6,6 +6,5 @@ doxygen: Doxyfile FORCE
 FMT += $(shell git ls-files '*.c' '*.cpp' '*.h' '*.hpp')
 format: FORCE
 	clang-format -i $(FMT)
-# clang tidy doesn't work that well :/
-# clang-tidy --fix-errors $(FMT)
+	$(MAKE) -C src $@
 
diff --git a/src/crepe/Sound.cpp b/src/crepe/Sound.cpp
index 73ad69c..64fa281 100644
--- a/src/crepe/Sound.cpp
+++ b/src/crepe/Sound.cpp
@@ -58,4 +58,3 @@ void Sound::set_looping(bool looping) {
 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
 	ctx.engine.setLooping(this->handle, this->looping);
 }
-
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 9dfaf46..2002d1a 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -2,8 +2,8 @@
 
 #include <memory>
 
-#include "Component.h"
 #include "Asset.h"
+#include "Component.h"
 
 namespace crepe {
 class Sound;
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index 4cab338..bfe7291 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -12,9 +12,12 @@
 					  __FILE_NAME__, __LINE__, crepe::util::color::RESET, \
 					  __VA_ARGS__)
 
+// 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_trace() _crepe_logf_here("%s", "")
+// NOLINTEND
 
 #endif
 
diff --git a/src/example/audio_internal.cpp b/src/example/audio_internal.cpp
index 09bd55c..1199e2d 100644
--- a/src/example/audio_internal.cpp
+++ b/src/example/audio_internal.cpp
@@ -43,4 +43,3 @@ int main() {
 
 	return 0;
 }
-
diff --git a/src/makefile b/src/makefile
new file mode 100644
index 0000000..c1ef601
--- /dev/null
+++ b/src/makefile
@@ -0,0 +1,6 @@
+.PHONY: FORCE
+
+FMT += $(shell git ls-files '*.c' '*.cpp' '*.h' '*.hpp')
+format: FORCE
+	clang-tidy -p build/compile_commands.json --fix-errors $(FMT)
+
diff --git a/src/test/audio.cpp b/src/test/audio.cpp
index 1d84551..d6ff689 100644
--- a/src/test/audio.cpp
+++ b/src/test/audio.cpp
@@ -1,29 +1,10 @@
 #include <gtest/gtest.h>
-#include <memory>
-
-#include <crepe/api/AudioSource.h>
-#include <crepe/api/Asset.h>
-
-#include <chrono>
-#include <thread>
 
 using namespace std;
 using namespace std::chrono_literals;
 
-using namespace crepe::api;
+// using namespace crepe;
 
 // TODO: mock internal audio class
 
-TEST(audio, play) {
-	auto res = std::make_unique<Asset>("../mwe/audio/bgm.ogg");
-	auto bgm = AudioSource(std::move(res));
-
-	bgm.play();
-
-	this_thread::sleep_for(2s);
-
-	bgm.stop();
-
-	ASSERT_TRUE(true);
-}
-
+TEST(audio, play) { ASSERT_TRUE(true); }
diff --git a/src/test/dummy.cpp b/src/test/dummy.cpp
index 7f4c083..a00a9c6 100644
--- a/src/test/dummy.cpp
+++ b/src/test/dummy.cpp
@@ -1,4 +1,3 @@
 #include <gtest/gtest.h>
 
 TEST(dummy, foo) { ASSERT_TRUE(1); }
-
-- 
cgit v1.2.3


From 509fb6ebdd27bc75375c1c51024ea906e25032c0 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 6 Oct 2024 13:45:05 +0200
Subject: WIP more code style enforcements

---
 .clang-format                             |  2 +-
 .clang-tidy                               | 43 +++++++++++++++++++++----------
 .editorconfig                             |  2 +-
 mwe/ecs-homemade/inc/ComponentManager.hpp |  3 ++-
 mwe/ecs-homemade/inc/GameObjectMax.h      |  3 ++-
 src/crepe/ComponentManager.cpp            |  5 ++--
 src/crepe/ComponentManager.h              | 27 ++++++++++++-------
 src/crepe/ComponentManager.hpp            | 38 ++++++++++++++++-----------
 src/crepe/Components.cpp                  |  9 ++++---
 src/crepe/Components.h                    | 18 ++++++-------
 src/crepe/GameObject.cpp                  |  2 +-
 src/crepe/GameObject.h                    | 16 ++++++------
 src/crepe/GameObject.hpp                  |  6 ++---
 src/crepe/api/AudioSource.h               |  2 +-
 14 files changed, 104 insertions(+), 72 deletions(-)

(limited to 'src/crepe/api')

diff --git a/.clang-format b/.clang-format
index d2918db..3ae6c28 100644
--- a/.clang-format
+++ b/.clang-format
@@ -22,7 +22,7 @@ AlignTrailingComments:
 ReflowComments: false
 AlignEscapedNewlines: DontAlign
 BreakBeforeBinaryOperators: All
-BreakTemplateDeclarations: Yes
+AlwaysBreakTemplateDeclarations: Yes
 ...
 
 # vim: ft=yaml
diff --git a/.clang-tidy b/.clang-tidy
index b242e3f..0ec997d 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,18 +1,33 @@
 Checks: '-*,readability-identifier-naming'
 CheckOptions:
-	- { key: readability-identifier-naming.EnumCase, value: lower_case }
-	- { key: readability-identifier-naming.GlobalFunctionCase, value: lower_case }
-	- { key: readability-identifier-naming.ClassCase, value: CamelCase }
-	- { key: readability-identifier-naming.ClassMethodCase, value: lower_case }
-	- { key: readability-identifier-naming.ClassMethodPrefix, value: '' }
-	- { key: readability-identifier-naming.ClassMemberCase, value: lower_case }
-	- { key: readability-identifier-naming.ClassMemberPrefix, value: '' }
-	- { key: readability-identifier-naming.GlobalConstantCase, value: UPPER_CASE }
-	- { key: readability-identifier-naming.GlobalConstantIgnoredRegexp, value: _.* }
-	- { key: readability-identifier-naming.GlobalVariableCase, value: lower_case }
-	- { key: readability-identifier-naming.GlobalVariableIgnoredRegexp, value: _.* }
-	- { key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE }
-	- { key: readability-identifier-naming.MacroDefinitionIgnoredRegexp, value: _.* }
-	- { key: readability-identifier-naming.StructCase, value: lower_case }
+  - key: 'readability-identifier-naming.EnumCase'
+    value: 'lower_case'
+  - key: 'readability-identifier-naming.GlobalFunctionCase'
+    value: 'lower_case'
+  - key: 'readability-identifier-naming.ClassCase'
+    value: 'CamelCase'
+  - key: 'readability-identifier-naming.MethodCase'
+    value: 'lower_case'
+  - key: 'readability-identifier-naming.MethodPrefix'
+    value: ''
+  - key: 'readability-identifier-naming.MemberCase'
+    value: 'lower_case'
+  - key: 'readability-identifier-naming.MemberPrefix'
+    value: ''
+  - key: 'readability-identifier-naming.GlobalConstantCase'
+    value: 'UPPER_CASE'
+  - key: 'readability-identifier-naming.GlobalConstantIgnoredRegexp'
+    value: '_.*'
+  - key: 'readability-identifier-naming.GlobalVariableCase'
+    value: 'lower_case'
+  - key: 'readability-identifier-naming.GlobalVariableIgnoredRegexp'
+    value: '_.*'
+  - key: 'readability-identifier-naming.MacroDefinitionCase'
+    value: 'UPPER_CASE'
+  - key: 'readability-identifier-naming.MacroDefinitionIgnoredRegexp'
+    value: '_.*'
+  - key: 'readability-identifier-naming.StructCase'
+    value: 'lower_case'
 
 # vim: ft=yaml
+
diff --git a/.editorconfig b/.editorconfig
index 1bd7da9..df2cf5e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,7 +5,7 @@ indent_style = tab
 end_of_line = lf
 insert_final_newline = true
 
-[*.{md,yml}]
+[{*.{md,yml},.clang-*}]
 indent_style = space
 indent_size = 2
 
diff --git a/mwe/ecs-homemade/inc/ComponentManager.hpp b/mwe/ecs-homemade/inc/ComponentManager.hpp
index 161ce71..d6da8e8 100644
--- a/mwe/ecs-homemade/inc/ComponentManager.hpp
+++ b/mwe/ecs-homemade/inc/ComponentManager.hpp
@@ -42,7 +42,8 @@ void ComponentManager::DeleteComponentsById(std::uint32_t id) {
 	}
 }
 
-template <typename T> void ComponentManager::DeleteComponents() {
+template <typename T>
+void ComponentManager::DeleteComponents() {
 	std::type_index type = typeid(
 		T); //Determine the type of T (this is used as the key of the unordered_map<>)
 
diff --git a/mwe/ecs-homemade/inc/GameObjectMax.h b/mwe/ecs-homemade/inc/GameObjectMax.h
index c88a834..3029053 100644
--- a/mwe/ecs-homemade/inc/GameObjectMax.h
+++ b/mwe/ecs-homemade/inc/GameObjectMax.h
@@ -7,7 +7,8 @@ class GameObject {
 public:
 	GameObject(std::uint32_t id, std::string name, std::string tag, int layer);
 
-	template <typename T, typename... Args> void AddComponent(Args &&... args);
+	template <typename T, typename... Args>
+	void AddComponent(Args &&... args);
 
 	std::uint32_t mId;
 	std::string mName;
diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp
index b7a1bea..b080c9d 100644
--- a/src/crepe/ComponentManager.cpp
+++ b/src/crepe/ComponentManager.cpp
@@ -7,7 +7,7 @@ ComponentManager & ComponentManager::get_instance() {
 	return instance;
 }
 
-void ComponentManager::DeleteAllComponentsOfId(std::uint32_t id) {
+void ComponentManager::delete_all_components_of_id(std::uint32_t id) {
 	// Loop through all the types (in the unordered_map<>)
 	for (auto & [type, componentArray] : components) {
 		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
@@ -18,8 +18,7 @@ void ComponentManager::DeleteAllComponentsOfId(std::uint32_t id) {
 	}
 }
 
-void ComponentManager::DeleteAllComponents() {
+void ComponentManager::delete_all_components() {
 	// Clear the whole unordered_map<>
 	components.clear();
 }
-
diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h
index 003cd0b..b88ad27 100644
--- a/src/crepe/ComponentManager.h
+++ b/src/crepe/ComponentManager.h
@@ -22,20 +22,26 @@ public:
 
 public:
 	//! Add a component of a specific type
-	template <typename T, typename... Args> void AddComponent(std::uint32_t id, Args &&... args);
+	template <typename T, typename... Args>
+	void add_component(std::uint32_t id, Args &&... args);
 	//! Deletes all components of a specific type and id
-	template <typename T> void DeleteComponentsById(std::uint32_t id);
+	template <typename T>
+	void delete_components_by_id(std::uint32_t id);
 	//! Deletes all components of a specific type
-	template <typename T> void DeleteComponents();
+	template <typename T>
+	void delete_components();
 	//! Deletes all components of a specific id
-	void DeleteAllComponentsOfId(std::uint32_t id);
+	void delete_all_components_of_id(std::uint32_t id);
 	//! Deletes all components
-	void DeleteAllComponents();
+	void delete_all_components();
 
 	//! Get a vector<> of all components at specific type and id
-	template <typename T> std::vector<std::reference_wrapper<T>> GetComponentsByID(std::uint32_t id) const;
+	template <typename T>
+	std::vector<std::reference_wrapper<T>>
+	get_components_by_id(std::uint32_t id) const;
 	//! Get a vector<> of all components of a specific type
-	template <typename T> std::vector<std::reference_wrapper<T>> GetComponentsByType() const;
+	template <typename T>
+	std::vector<std::reference_wrapper<T>> get_components_by_type() const;
 
 private:
 	ComponentManager() = default;
@@ -46,10 +52,11 @@ private:
 	 * The first std::vector<> stores another vector<>. This first vector<> is to bind the entity's id to a component.
 	 * The second std::vector<> stores unique_ptrs. Each component can be gathered via an unique_ptr. This second vector<> allows multiple components of the same std::type_index for one entity (id).
 	 */
-	std::unordered_map<std::type_index, std::vector<std::vector<std::unique_ptr<Component>>>> components;
+	std::unordered_map<std::type_index,
+					   std::vector<std::vector<std::unique_ptr<Component>>>>
+		components;
 };
 
-}
+} // namespace crepe
 
 // #include "ComponentManager.hpp"
-
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index 602490e..30b0e38 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -5,14 +5,15 @@
 namespace crepe {
 
 template <typename T, typename... Args>
-void ComponentManager::AddComponent(std::uint32_t id, Args &&... args) {
+void ComponentManager::add_component(std::uint32_t id, Args &&... args) {
 	// Determine the type of T (this is used as the key of the unordered_map<>)
 	std::type_index type = typeid(T);
 
 	// Check if this component type is already in the unordered_map<>
 	if (components.find(type) == components.end()) {
 		//If not, create a new (empty) vector<> of vector<unique_ptr<Component>>
-		components[type] = std::vector<std::vector<std::unique_ptr<Component>>>();
+		components[type]
+			= std::vector<std::vector<std::unique_ptr<Component>>>();
 	}
 
 	// Resize the vector<> if the id is greater than the current size
@@ -23,18 +24,20 @@ void ComponentManager::AddComponent(std::uint32_t id, Args &&... args) {
 
 	// Create a new component of type T using perfect forwarding and store its
 	// unique_ptr in the vector<>
-	components[type][id].push_back(std::make_unique<T>(std::forward<Args>(args)...));
+	components[type][id].push_back(
+		std::make_unique<T>(std::forward<Args>(args)...));
 }
 
 template <typename T>
-void ComponentManager::DeleteComponentsById(std::uint32_t id) {
+void ComponentManager::delete_components_by_id(std::uint32_t id) {
 	// 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()) {
 		// Get the correct vector<>
-		std::vector<std::vector<std::unique_ptr<Component>>> & componentArray = components[type];
+		std::vector<std::vector<std::unique_ptr<Component>>> & componentArray
+			= components[type];
 
 		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
 		if (id < componentArray.size()) {
@@ -45,7 +48,7 @@ void ComponentManager::DeleteComponentsById(std::uint32_t id) {
 }
 
 template <typename T>
-void ComponentManager::DeleteComponents() {
+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);
 
@@ -58,7 +61,7 @@ void ComponentManager::DeleteComponents() {
 
 template <typename T>
 std::vector<std::reference_wrapper<T>>
-ComponentManager::GetComponentsByID(std::uint32_t id) const {
+ComponentManager::get_components_by_id(std::uint32_t id) const {
 	// Determine the type of T (this is used as the key of the unordered_map<>)
 	std::type_index type = typeid(T);
 
@@ -68,12 +71,15 @@ ComponentManager::GetComponentsByID(std::uint32_t id) const {
 	// Find the type (in the unordered_map<>)
 	if (components.find(type) != components.end()) {
 		// Get the correct vector<>
-		const std::vector<std::vector<std::unique_ptr<Component>>> & componentArray = components.at(type);
+		const std::vector<std::vector<std::unique_ptr<Component>>> &
+			componentArray
+			= components.at(type);
 
 		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
-		if (id < componentArray .size()) {
+		if (id < componentArray.size()) {
 			// Loop trough the whole vector<>
-			for (const std::unique_ptr<Component> & componentPtr : componentArray[id]) {
+			for (const std::unique_ptr<Component> & componentPtr :
+				 componentArray[id]) {
 				// Cast the unique_ptr to a raw pointer
 				T * castedComponent = static_cast<T *>(componentPtr.get());
 
@@ -92,7 +98,7 @@ ComponentManager::GetComponentsByID(std::uint32_t id) const {
 
 template <typename T>
 std::vector<std::reference_wrapper<T>>
-ComponentManager::GetComponentsByType() const {
+ComponentManager::get_components_by_type() const {
 	// Determine the type of T (this is used as the key of the unordered_map<>)
 	std::type_index type = typeid(T);
 
@@ -105,10 +111,13 @@ ComponentManager::GetComponentsByType() const {
 	if (components.find(type) != components.end()) {
 
 		// Get the correct vector<>
-		const std::vector<std::vector<std::unique_ptr<Component>>> & componentArray = components.at(type);
+		const std::vector<std::vector<std::unique_ptr<Component>>> &
+			componentArray
+			= components.at(type);
 
 		// Loop through the whole vector<>
-		for (const std::vector<std::unique_ptr<Component>> & component : componentArray) {
+		for (const std::vector<std::unique_ptr<Component>> & component :
+			 componentArray) {
 			// Loop trough the whole vector<>
 			for (const std::unique_ptr<Component> & componentPtr : component) {
 				// Cast the unique_ptr to a raw pointer
@@ -130,5 +139,4 @@ ComponentManager::GetComponentsByType() const {
 	return componentVector;
 }
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/Components.cpp b/src/crepe/Components.cpp
index 9760daa..4a43692 100644
--- a/src/crepe/Components.cpp
+++ b/src/crepe/Components.cpp
@@ -3,11 +3,12 @@
 
 using namespace crepe;
 
-Component::Component() : mActive(true) {}
+Component::Component() : m_active(true) {}
 
-Sprite::Sprite(std::string path) : mPath(path) {}
+Sprite::Sprite(std::string path) : m_path(path) {}
 
 Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
-	: mMass(mass), mGravityScale(gravityScale), mBodyType(bodyType) {}
+	: m_mass(mass), m_gravity_scale(gravityScale), m_body_type(bodyType) {}
+
+Collider::Collider(int size) : m_size(size) {}
 
-Colider::Colider(int size) : mSize(size) {}
diff --git a/src/crepe/Components.h b/src/crepe/Components.h
index 7cb6fbb..1ad9ef2 100644
--- a/src/crepe/Components.h
+++ b/src/crepe/Components.h
@@ -8,7 +8,7 @@ class Component {
 public:
 	Component();
 
-	bool mActive;
+	bool m_active;
 };
 
 // TODO: these should be in separate files
@@ -17,23 +17,23 @@ class Sprite : public Component {
 public:
 	Sprite(std::string path);
 
-	std::string mPath;
+	std::string m_path;
 };
 
 class Rigidbody : public Component {
 public:
 	Rigidbody(int mass, int gravityScale, int bodyType);
 
-	int mMass;
-	int mGravityScale;
-	int mBodyType;
+	int m_mass;
+	int m_gravity_scale;
+	int m_body_type;
 };
 
-class Colider : public Component {
+class Collider : public Component {
 public:
-	Colider(int size);
+	Collider(int size);
 
-	int mSize;
+	int m_size;
 };
 
-}
+} // namespace crepe
diff --git a/src/crepe/GameObject.cpp b/src/crepe/GameObject.cpp
index 5ac9d7a..16dc62f 100644
--- a/src/crepe/GameObject.cpp
+++ b/src/crepe/GameObject.cpp
@@ -6,4 +6,4 @@ using namespace crepe;
 
 GameObject::GameObject(std::uint32_t id, std::string name, std::string tag,
 					   int layer)
-	: mId(id), mName(name), mTag(tag), mActive(true), mLayer(layer) {}
+	: m_id(id), m_name(name), m_tag(tag), m_active(true), m_layer(layer) {}
diff --git a/src/crepe/GameObject.h b/src/crepe/GameObject.h
index 71ef60d..f0f5ea0 100644
--- a/src/crepe/GameObject.h
+++ b/src/crepe/GameObject.h
@@ -9,14 +9,14 @@ class GameObject {
 public:
 	GameObject(std::uint32_t id, std::string name, std::string tag, int layer);
 
-	template <typename T, typename... Args> void AddComponent(Args &&... args);
+	template <typename T, typename... Args>
+	void add_component(Args &&... args);
 
-	std::uint32_t mId;
-	std::string mName;
-	std::string mTag;
-	bool mActive;
-	int mLayer;
+	std::uint32_t m_id;
+	std::string m_name;
+	std::string m_tag;
+	bool m_active;
+	int m_layer;
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/GameObject.hpp b/src/crepe/GameObject.hpp
index 5a672cf..1152ddf 100644
--- a/src/crepe/GameObject.hpp
+++ b/src/crepe/GameObject.hpp
@@ -8,8 +8,8 @@ namespace crepe {
 
 template <typename T, typename... Args>
 void GameObject::AddComponent(Args &&... args) {
-	ComponentManager::get_instance().AddComponent<T>(mId, std::forward<Args>(args)...);
-}
-
+	ComponentManager::get_instance().AddComponent<T>(
+		mId, std::forward<Args>(args)...);
 }
 
+} // namespace crepe
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 2002d1a..2d26cda 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -35,7 +35,7 @@ public:
 	float volume;
 
 private:
-	std::unique_ptr<crepe::Sound> _sound;
+	std::unique_ptr<crepe::Sound> sound;
 };
 
 } // namespace crepe::api
-- 
cgit v1.2.3


From f8bc2a06a90c0ee172054db7ae2e1fdae09d14a3 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 6 Oct 2024 14:10:52 +0200
Subject: code standard v3

---
 .clang-tidy                    | 10 +++---
 src/CMakeLists.txt             |  3 --
 src/crepe/ComponentManager.h   |  2 --
 src/crepe/ComponentManager.hpp | 74 ++++++++++++++++++++++--------------------
 src/crepe/Components.cpp       | 11 +++----
 src/crepe/Components.h         | 12 +++----
 src/crepe/GameObject.cpp       |  4 +--
 src/crepe/GameObject.h         | 12 +++----
 src/crepe/GameObject.hpp       |  6 ++--
 src/crepe/api/AudioSource.cpp  | 10 +++---
 src/crepe/util/log.cpp         | 10 +++---
 src/crepe/util/log.h           | 10 +++---
 12 files changed, 81 insertions(+), 83 deletions(-)

(limited to 'src/crepe/api')

diff --git a/.clang-tidy b/.clang-tidy
index 0ec997d..214a5ab 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -14,13 +14,15 @@ CheckOptions:
     value: 'lower_case'
   - key: 'readability-identifier-naming.MemberPrefix'
     value: ''
-  - key: 'readability-identifier-naming.GlobalConstantCase'
+  - key: 'readability-identifier-naming.ConstantCase'
     value: 'UPPER_CASE'
-  - key: 'readability-identifier-naming.GlobalConstantIgnoredRegexp'
+  - key: 'readability-identifier-naming.ConstantIgnoredRegexp'
     value: '_.*'
-  - key: 'readability-identifier-naming.GlobalVariableCase'
+  - key: 'readability-identifier-naming.ConstantParameterCase'
     value: 'lower_case'
-  - key: 'readability-identifier-naming.GlobalVariableIgnoredRegexp'
+  - key: 'readability-identifier-naming.VariableCase'
+    value: 'lower_case'
+  - key: 'readability-identifier-naming.VariableIgnoredRegexp'
     value: '_.*'
   - key: 'readability-identifier-naming.MacroDefinitionCase'
     value: 'UPPER_CASE'
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62ca9a0..49d65a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,10 +3,7 @@ cmake_minimum_required(VERSION 3.28)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
-
-# enable debug features
 set(CMAKE_BUILD_TYPE Debug)
-add_compile_definitions(DEBUG)
 
 add_subdirectory(../lib/soloud soloud)
 add_subdirectory(../lib/googletest googletest)
diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h
index b88ad27..cf6edad 100644
--- a/src/crepe/ComponentManager.h
+++ b/src/crepe/ComponentManager.h
@@ -58,5 +58,3 @@ private:
 };
 
 } // namespace crepe
-
-// #include "ComponentManager.hpp"
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index 30b0e38..999cdcf 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -5,15 +5,16 @@
 namespace crepe {
 
 template <typename T, typename... Args>
-void ComponentManager::add_component(std::uint32_t id, Args &&... args) {
+void ComponentManager::add_component(uint32_t id, Args &&... args) {
+	using namespace std;
+
 	// Determine the type of T (this is used as the key of the unordered_map<>)
-	std::type_index type = typeid(T);
+	type_index type = typeid(T);
 
 	// Check if this component type is already in the unordered_map<>
 	if (components.find(type) == components.end()) {
 		//If not, create a new (empty) vector<> of vector<unique_ptr<Component>>
-		components[type]
-			= std::vector<std::vector<std::unique_ptr<Component>>>();
+		components[type] = vector<vector<unique_ptr<Component>>>();
 	}
 
 	// Resize the vector<> if the id is greater than the current size
@@ -24,25 +25,26 @@ void ComponentManager::add_component(std::uint32_t id, Args &&... args) {
 
 	// Create a new component of type T using perfect forwarding and store its
 	// unique_ptr in the vector<>
-	components[type][id].push_back(
-		std::make_unique<T>(std::forward<Args>(args)...));
+	components[type][id].push_back(make_unique<T>(forward<Args>(args)...));
 }
 
 template <typename T>
-void ComponentManager::delete_components_by_id(std::uint32_t id) {
+void ComponentManager::delete_components_by_id(uint32_t id) {
+	using namespace std;
+
 	// Determine the type of T (this is used as the key of the unordered_map<>)
-	std::type_index type = typeid(T);
+	type_index type = typeid(T);
 
 	// Find the type (in the unordered_map<>)
 	if (components.find(type) != components.end()) {
 		// Get the correct vector<>
-		std::vector<std::vector<std::unique_ptr<Component>>> & componentArray
+		vector<vector<unique_ptr<Component>>> & component_array
 			= components[type];
 
 		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
-		if (id < componentArray.size()) {
+		if (id < component_array.size()) {
 			// Clear the whole vector<> of this specific type and id
-			componentArray[id].clear();
+			component_array[id].clear();
 		}
 	}
 }
@@ -61,72 +63,74 @@ void ComponentManager::delete_components() {
 
 template <typename T>
 std::vector<std::reference_wrapper<T>>
-ComponentManager::get_components_by_id(std::uint32_t id) const {
+ComponentManager::get_components_by_id(uint32_t id) const {
+	using namespace std;
+
 	// Determine the type of T (this is used as the key of the unordered_map<>)
-	std::type_index type = typeid(T);
+	type_index type = typeid(T);
 
 	// Create an empty vector<>
-	std::vector<std::reference_wrapper<T>> componentVector;
+	vector<reference_wrapper<T>> component_vector;
 
 	// Find the type (in the unordered_map<>)
 	if (components.find(type) != components.end()) {
 		// Get the correct vector<>
-		const std::vector<std::vector<std::unique_ptr<Component>>> &
-			componentArray
+		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 < componentArray.size()) {
+		if (id < component_array.size()) {
 			// Loop trough the whole vector<>
-			for (const std::unique_ptr<Component> & componentPtr :
-				 componentArray[id]) {
+			for (const unique_ptr<Component> & component_ptr :
+				 component_array[id]) {
 				// Cast the unique_ptr to a raw pointer
-				T * castedComponent = static_cast<T *>(componentPtr.get());
+				T * casted_component = static_cast<T *>(component_ptr.get());
 
 				// Ensure that the cast was successful
-				if (castedComponent) {
+				if (casted_component) {
 					// Add the dereferenced raw pointer to the vector<>
-					componentVector.push_back(*castedComponent);
+					component_vector.push_back(*casted_component);
 				}
 			}
 		}
 	}
 
 	// Return the vector<>
-	return componentVector;
+	return component_vector;
 }
 
 template <typename T>
 std::vector<std::reference_wrapper<T>>
 ComponentManager::get_components_by_type() const {
+	using namespace std;
+
 	// Determine the type of T (this is used as the key of the unordered_map<>)
-	std::type_index type = typeid(T);
+	type_index type = typeid(T);
 
 	// Create an empty vector<>
-	std::vector<std::reference_wrapper<T>> componentVector;
+	vector<reference_wrapper<T>> component_vector;
 	// Set the id to 0 (the id will also be stored in the returned vector<>)
-	// std::uint32_t id = 0;
+	// uint32_t id = 0;
 
 	// Find the type (in the unordered_map<>)
 	if (components.find(type) != components.end()) {
 
 		// Get the correct vector<>
-		const std::vector<std::vector<std::unique_ptr<Component>>> &
-			componentArray
+		const vector<vector<unique_ptr<Component>>> & component_array
 			= components.at(type);
 
 		// Loop through the whole vector<>
-		for (const std::vector<std::unique_ptr<Component>> & component :
-			 componentArray) {
+		for (const vector<unique_ptr<Component>> & component :
+			 component_array) {
 			// Loop trough the whole vector<>
-			for (const std::unique_ptr<Component> & componentPtr : component) {
+			for (const unique_ptr<Component> & component_ptr : component) {
 				// Cast the unique_ptr to a raw pointer
-				T * castedComponent = static_cast<T *>(componentPtr.get());
+				T * casted_component = static_cast<T *>(component_ptr.get());
 
 				// Ensure that the cast was successful
-				if (castedComponent) {
+				if (casted_component) {
 					// Pair the dereferenced raw pointer and the id and add it to the vector<>
-					componentVector.emplace_back(std::ref(*castedComponent));
+					component_vector.emplace_back(ref(*casted_component));
 				}
 			}
 
@@ -136,7 +140,7 @@ ComponentManager::get_components_by_type() const {
 	}
 
 	// Return the vector<>
-	return componentVector;
+	return component_vector;
 }
 
 } // namespace crepe
diff --git a/src/crepe/Components.cpp b/src/crepe/Components.cpp
index 4a43692..f27c7a4 100644
--- a/src/crepe/Components.cpp
+++ b/src/crepe/Components.cpp
@@ -1,14 +1,13 @@
 #include "Components.h"
-#include <iostream>
 
 using namespace crepe;
+using namespace std;
 
-Component::Component() : m_active(true) {}
+Component::Component() : active(true) {}
 
-Sprite::Sprite(std::string path) : m_path(path) {}
+Sprite::Sprite(string path) : path(path) {}
 
 Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
-	: m_mass(mass), m_gravity_scale(gravityScale), m_body_type(bodyType) {}
-
-Collider::Collider(int size) : m_size(size) {}
+	: mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
 
+Collider::Collider(int size) : size(size) {}
diff --git a/src/crepe/Components.h b/src/crepe/Components.h
index 1ad9ef2..139599c 100644
--- a/src/crepe/Components.h
+++ b/src/crepe/Components.h
@@ -8,7 +8,7 @@ class Component {
 public:
 	Component();
 
-	bool m_active;
+	bool active;
 };
 
 // TODO: these should be in separate files
@@ -17,23 +17,23 @@ class Sprite : public Component {
 public:
 	Sprite(std::string path);
 
-	std::string m_path;
+	std::string path;
 };
 
 class Rigidbody : public Component {
 public:
 	Rigidbody(int mass, int gravityScale, int bodyType);
 
-	int m_mass;
-	int m_gravity_scale;
-	int m_body_type;
+	int mass;
+	int gravity_scale;
+	int body_type;
 };
 
 class Collider : public Component {
 public:
 	Collider(int size);
 
-	int m_size;
+	int size;
 };
 
 } // namespace crepe
diff --git a/src/crepe/GameObject.cpp b/src/crepe/GameObject.cpp
index 16dc62f..304f75a 100644
--- a/src/crepe/GameObject.cpp
+++ b/src/crepe/GameObject.cpp
@@ -1,9 +1,7 @@
 #include "GameObject.h"
 
-#include "ComponentManager.h"
-
 using namespace crepe;
 
 GameObject::GameObject(std::uint32_t id, std::string name, std::string tag,
 					   int layer)
-	: m_id(id), m_name(name), m_tag(tag), m_active(true), m_layer(layer) {}
+	: id(id), name(name), tag(tag), active(true), layer(layer) {}
diff --git a/src/crepe/GameObject.h b/src/crepe/GameObject.h
index f0f5ea0..114990c 100644
--- a/src/crepe/GameObject.h
+++ b/src/crepe/GameObject.h
@@ -7,16 +7,16 @@ namespace crepe {
 
 class GameObject {
 public:
-	GameObject(std::uint32_t id, std::string name, std::string tag, int layer);
+	GameObject(uint32_t id, std::string name, std::string tag, int layer);
 
 	template <typename T, typename... Args>
 	void add_component(Args &&... args);
 
-	std::uint32_t m_id;
-	std::string m_name;
-	std::string m_tag;
-	bool m_active;
-	int m_layer;
+	uint32_t id;
+	std::string name;
+	std::string tag;
+	bool active;
+	int layer;
 };
 
 } // namespace crepe
diff --git a/src/crepe/GameObject.hpp b/src/crepe/GameObject.hpp
index 1152ddf..5966fbf 100644
--- a/src/crepe/GameObject.hpp
+++ b/src/crepe/GameObject.hpp
@@ -7,9 +7,9 @@
 namespace crepe {
 
 template <typename T, typename... Args>
-void GameObject::AddComponent(Args &&... args) {
-	ComponentManager::get_instance().AddComponent<T>(
-		mId, std::forward<Args>(args)...);
+void GameObject::add_component(Args &&... args) {
+	auto & mgr = ComponentManager::get_instance();
+	mgr.add_component<T>(id, std::forward<Args>(args)...);
 }
 
 } // namespace crepe
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index 656fc46..b512d27 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -6,17 +6,17 @@
 using namespace crepe::api;
 
 AudioSource::AudioSource(std::unique_ptr<Asset> audio_clip) {
-	this->_sound = std::make_unique<crepe::Sound>(std::move(audio_clip));
+	this->sound = std::make_unique<crepe::Sound>(std::move(audio_clip));
 }
 
 void AudioSource::play() { return this->play(false); }
 
 void AudioSource::play(bool looping) {
-	this->_sound->set_looping(looping);
-	this->_sound->play();
+	this->sound->set_looping(looping);
+	this->sound->play();
 }
 
 void AudioSource::stop() {
-	this->_sound->pause();
-	this->_sound->rewind();
+	this->sound->pause();
+	this->sound->rewind();
 }
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index 6829ec3..f91d52c 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -8,10 +8,10 @@
 using namespace crepe::util;
 
 static const char * const LOG_PREFIX[] = {
-	[log_level::debug] = "[DBG] ",
-	[log_level::info] = "[INFO] ",
-	[log_level::warning] = "[WARN] ",
-	[log_level::error] = "[ERR] ",
+	[log_level::DEBUG] = "[DBG] ",
+	[log_level::INFO] = "[INFO] ",
+	[log_level::WARNING] = "[WARN] ",
+	[log_level::ERROR] = "[ERR] ",
 };
 
 static void va_logf(enum log_level level, va_list args, const std::string fmt) {
@@ -38,7 +38,7 @@ static void va_logf(enum log_level level, va_list args, const std::string fmt) {
 void crepe::util::logf(const char * fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
-	va_logf(crepe::util::log_level::debug, args, fmt);
+	va_logf(crepe::util::log_level::DEBUG, args, fmt);
 	va_end(args);
 }
 
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index bfe7291..2b0fbe1 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)" fmt "\n", \
 					  crepe::util::color::FG_WHITE, __PRETTY_FUNCTION__, \
 					  __FILE_NAME__, __LINE__, crepe::util::color::RESET, \
 					  __VA_ARGS__)
@@ -24,10 +24,10 @@
 namespace crepe::util {
 
 enum log_level {
-	debug,
-	info,
-	warning,
-	error,
+	DEBUG,
+	INFO,
+	WARNING,
+	ERROR,
 };
 
 void logf(const char * fmt, ...);
-- 
cgit v1.2.3


From 2969fe8c0fca4826ca129fe12d2e125bb7955c78 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 6 Oct 2024 17:39:15 +0200
Subject: WIP ScriptSystem

---
 src/crepe/CMakeLists.txt         |  4 ++++
 src/crepe/ComponentManager.hpp   | 14 ++++++++++----
 src/crepe/Script.cpp             |  7 +++++++
 src/crepe/Script.h               | 16 ++++++++++++++++
 src/crepe/ScriptSystem.cpp       | 22 ++++++++++++++++++++++
 src/crepe/ScriptSystem.h         | 18 ++++++++++++++++++
 src/crepe/System.h               | 23 +++++++++++++++++++++++
 src/crepe/api/BehaviorScript.cpp | 10 ++++++++++
 src/crepe/api/BehaviorScript.h   | 17 +++++++++++++++++
 src/crepe/api/CMakeLists.txt     |  5 +++--
 src/crepe/api/Component.h        | 10 ----------
 src/example/CMakeLists.txt       |  1 +
 src/example/script.cpp           | 33 +++++++++++++++++++++++++++++++++
 13 files changed, 164 insertions(+), 16 deletions(-)
 create mode 100644 src/crepe/Script.cpp
 create mode 100644 src/crepe/Script.h
 create mode 100644 src/crepe/ScriptSystem.cpp
 create mode 100644 src/crepe/ScriptSystem.h
 create mode 100644 src/crepe/System.h
 create mode 100644 src/crepe/api/BehaviorScript.cpp
 create mode 100644 src/crepe/api/BehaviorScript.h
 delete mode 100644 src/crepe/api/Component.h
 create mode 100644 src/example/script.cpp

(limited to 'src/crepe/api')

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index d7d563e..d85aef0 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -8,6 +8,8 @@ target_sources(crepe PUBLIC
 	Collider.cpp
 	Rigidbody.cpp
 	Sprite.cpp
+	ScriptSystem.cpp
+	Script.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -22,6 +24,8 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Collider.h
 	Rigidbody.h
 	Sprite.h
+	System.h
+	ScriptSystem.h
 )
 
 add_subdirectory(api)
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index 999cdcf..084cd33 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -1,13 +1,17 @@
 #pragma once
 
+#include <type_traits>
+
 #include "ComponentManager.h"
 
 namespace crepe {
 
-template <typename T, typename... Args>
+template <class T, typename... Args>
 void 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");
+
 	// Determine the type of T (this is used as the key of the unordered_map<>)
 	type_index type = typeid(T);
 
@@ -23,9 +27,11 @@ void ComponentManager::add_component(uint32_t id, Args &&... args) {
 		components[type].resize(id + 1);
 	}
 
-	// Create a new component of type T using perfect forwarding and store its
-	// unique_ptr in the vector<>
-	components[type][id].push_back(make_unique<T>(forward<Args>(args)...));
+	// Create a new component of type T (arguments directly forwarded). The
+	// constructor must be called by ComponentManager.
+	T * instance = new T(forward<Args>(args)...);
+	// store its unique_ptr in the vector<>
+	components[type][id].push_back(unique_ptr<T>(instance));
 }
 
 template <typename T>
diff --git a/src/crepe/Script.cpp b/src/crepe/Script.cpp
new file mode 100644
index 0000000..42e3666
--- /dev/null
+++ b/src/crepe/Script.cpp
@@ -0,0 +1,7 @@
+#include "Script.h"
+
+using namespace crepe;
+
+void Script::init() { }
+void Script::update() { }
+
diff --git a/src/crepe/Script.h b/src/crepe/Script.h
new file mode 100644
index 0000000..ba4073a
--- /dev/null
+++ b/src/crepe/Script.h
@@ -0,0 +1,16 @@
+#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
new file mode 100644
index 0000000..e301c71
--- /dev/null
+++ b/src/crepe/ScriptSystem.cpp
@@ -0,0 +1,22 @@
+#include "util/log.h"
+
+#include "ScriptSystem.h"
+
+using namespace crepe;
+
+ScriptSystem::ScriptSystem() {
+	dbg_trace();
+}
+ScriptSystem::~ScriptSystem() {
+	dbg_trace();
+}
+
+ScriptSystem & ScriptSystem::get_instance() {
+	static ScriptSystem instance;
+	return instance;
+}
+
+void ScriptSystem::update() {
+	dbg_trace();
+}
+
diff --git a/src/crepe/ScriptSystem.h b/src/crepe/ScriptSystem.h
new file mode 100644
index 0000000..e1ed290
--- /dev/null
+++ b/src/crepe/ScriptSystem.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "System.h"
+
+namespace crepe {
+
+class ScriptSystem : public System {
+public:
+	static ScriptSystem & get_instance();
+	virtual void update();
+
+private:
+	ScriptSystem();
+	~ScriptSystem();
+};
+
+}
+
diff --git a/src/crepe/System.h b/src/crepe/System.h
new file mode 100644
index 0000000..3fe3d66
--- /dev/null
+++ b/src/crepe/System.h
@@ -0,0 +1,23 @@
+#pragma once
+
+namespace crepe {
+
+class System {
+public:
+	static System & get_instance();
+	virtual void update() = 0;
+
+protected:
+	System() { };
+	virtual ~System() { };
+
+private:
+	// singleton
+	System(const System &) = delete;
+	System(System &&) = delete;
+	System & operator=(const System &) = delete;
+	System & operator=(System &&) = delete;
+};
+
+}
+
diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
new file mode 100644
index 0000000..2dd933e
--- /dev/null
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -0,0 +1,10 @@
+#include "../util/log.h"
+
+#include "BehaviorScript.h"
+
+using namespace crepe::api;
+
+BehaviorScript::BehaviorScript() {
+	dbg_trace();
+}
+
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
new file mode 100644
index 0000000..e9542c1
--- /dev/null
+++ b/src/crepe/api/BehaviorScript.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../Script.h"
+#include "../Component.h"
+
+namespace crepe::api {
+
+class BehaviorScript : public Script, public Component {
+	// only allow ComponentManager to instantiate scripts
+	friend class ComponentManager;
+
+protected:
+	BehaviorScript();
+};
+
+}
+
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 9548594..86623de 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -1,9 +1,10 @@
 target_sources(crepe PUBLIC
 	# AudioSource.cpp
+	BehaviorScript.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
-	AudioSource.h
-	Component.h
+	# AudioSource.h
+	BehaviorScript.h
 )
 
diff --git a/src/crepe/api/Component.h b/src/crepe/api/Component.h
deleted file mode 100644
index d5e0499..0000000
--- a/src/crepe/api/Component.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-namespace crepe::api {
-
-class Component {
-public:
-	bool active;
-};
-
-} // namespace crepe::api
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index eef38fd..6df4ce7 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -14,4 +14,5 @@ endfunction()
 
 add_example(audio_internal)
 add_example(components_internal)
+add_example(script)
 
diff --git a/src/example/script.cpp b/src/example/script.cpp
new file mode 100644
index 0000000..28605c7
--- /dev/null
+++ b/src/example/script.cpp
@@ -0,0 +1,33 @@
+/** \file
+ * 
+ * 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/api/BehaviorScript.h>
+
+using namespace crepe;
+using namespace std;
+
+class MyScript : public api::BehaviorScript {
+	void update() {
+		dbg_trace();
+	}
+};
+
+int main() {
+	dbg_trace();
+
+	auto obj = GameObject(0, "name", "tag", 0);
+	obj.add_component<MyScript>();
+
+	auto & sys = ScriptSystem::get_instance();
+	sys.update(); // -> MyScript::update
+
+	return 0;
+}
+
-- 
cgit v1.2.3


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(-)

(limited to 'src/crepe/api')

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

(limited to 'src/crepe/api')

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 d21afe5b33b4cb3f5cf1917f4d15f402de41a032 Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Wed, 16 Oct 2024 17:05:46 +0200
Subject: Make format

---
 mwe/ecs-homemade/inc/ComponentManager.h   |  27 +++---
 mwe/ecs-homemade/inc/ComponentManager.hpp | 144 ++++++++++++++++--------------
 mwe/ecs-homemade/inc/Components.h         |   6 +-
 mwe/ecs-homemade/inc/Components.hpp       |  10 +--
 mwe/ecs-homemade/inc/GameObjectMax.h      |   2 +-
 mwe/ecs-homemade/inc/GameObjectMax.hpp    |   2 +-
 mwe/ecs-homemade/src/Components.cpp       |   4 +-
 mwe/ecs-homemade/src/main.cpp             |  11 +--
 src/crepe/ComponentManager.hpp            |   3 +-
 src/crepe/Script.cpp                      |   5 +-
 src/crepe/Script.h                        |   3 +-
 src/crepe/ScriptSystem.cpp                |  13 +--
 src/crepe/ScriptSystem.h                  |   3 +-
 src/crepe/System.h                        |   7 +-
 src/crepe/api/BehaviorScript.cpp          |   5 +-
 src/crepe/api/BehaviorScript.h            |   5 +-
 src/example/script.cpp                    |   9 +-
 17 files changed, 124 insertions(+), 135 deletions(-)

(limited to 'src/crepe/api')

diff --git a/mwe/ecs-homemade/inc/ComponentManager.h b/mwe/ecs-homemade/inc/ComponentManager.h
index 2cdbb66..0ba358e 100644
--- a/mwe/ecs-homemade/inc/ComponentManager.h
+++ b/mwe/ecs-homemade/inc/ComponentManager.h
@@ -17,24 +17,27 @@ public:
 	ComponentManager & operator=(const ComponentManager &) = delete; //Singleton
 	ComponentManager & operator=(ComponentManager &&) = delete; //Singleton
 
+	//Add a component of a specific type
 	template <typename T, typename... Args>
-	T& AddComponent(std::uint32_t id,
-					  Args &&... args); //Add a component of a specific type
+	T & AddComponent(std::uint32_t id, Args &&... args);
+	//Deletes all components of a specific type and id
 	template <typename T>
-	void DeleteComponentsById(
-		std::uint32_t id); //Deletes all components of a specific type and id
+	void DeleteComponentsById(std::uint32_t id);
+	//Deletes all components of a specific type
 	template <typename T>
-	void DeleteComponents(); //Deletes all components of a specific type
-	void DeleteAllComponentsOfId(
-		std::uint32_t id); //Deletes all components of a specific id
-	void DeleteAllComponents(); //Deletes all components
+	void DeleteComponents();
+	//Deletes all components of a specific id
+	void DeleteAllComponentsOfId(std::uint32_t id);
+	//Deletes all components
+	void DeleteAllComponents();
 
+	//Get a vector<> of all components at specific type and id
 	template <typename T>
-	std::vector<std::reference_wrapper<T>> GetComponentsByID(std::uint32_t id)
-		const; //Get a vector<> of all components at specific type and id
+	std::vector<std::reference_wrapper<T>>
+	GetComponentsByID(std::uint32_t id) const;
+	//Get a vector<> of all components of a specific type
 	template <typename T>
-	std::vector<std::reference_wrapper<T>> GetComponentsByType()
-		const; //Get a vector<> of all components of a specific type
+	std::vector<std::reference_wrapper<T>> GetComponentsByType() const;
 
 private:
 	static ComponentManager mInstance; //Singleton
diff --git a/mwe/ecs-homemade/inc/ComponentManager.hpp b/mwe/ecs-homemade/inc/ComponentManager.hpp
index a120ab1..92db1d4 100644
--- a/mwe/ecs-homemade/inc/ComponentManager.hpp
+++ b/mwe/ecs-homemade/inc/ComponentManager.hpp
@@ -1,123 +1,128 @@
 
 template <typename T, typename... Args>
-T& ComponentManager::AddComponent(std::uint32_t id, Args &&... args) {
-	std::type_index type = typeid(
-		T); //Determine the type of T (this is used as the key of the unordered_map<>)
-
-	if (mComponents.find(type)
-		== mComponents
-			   .end()) { //Check if this component type is already in the unordered_map<>
-		mComponents[type] = std::vector<std::vector<std::unique_ptr<
-			Component>>>(); //If not, create a new (empty) vector<> of vector<unique_ptr<Component>>
+T & ComponentManager::AddComponent(std::uint32_t id, Args &&... args) {
+	//Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
+
+	//Check if this component type is already in the unordered_map<>
+	if (mComponents.find(type) == mComponents.end()) {
+		//If not, create a new (empty) vector<> of vector<unique_ptr<Component>>
+		mComponents[type]
+			= std::vector<std::vector<std::unique_ptr<Component>>>();
 	}
 
-	if (id
-		>= mComponents[type]
-			   .size()) { //Resize the vector<> if the id is greater than the current size
-		mComponents[type].resize(
-			id
-			+ 1); //Initialize new slots to nullptr (resize does automatically init to nullptr)
+	//Resize the vector<> if the id is greater than the current size
+	if (id >= mComponents[type].size()) {
+		//Initialize new slots to nullptr (resize does automatically init to nullptr)
+		mComponents[type].resize(id + 1);
 	}
 
-	mComponents[type][id].push_back(std::make_unique<T>(std::forward<Args>(
-		args)...)); //Create a new component of type T using perfect forwarding and store its unique_ptr in the vector<>
+	//Create a new component of type T using perfect forwarding and store its unique_ptr in the vector<>
+	mComponents[type][id].push_back(
+		std::make_unique<T>(std::forward<Args>(args)...));
 
-	return static_cast<T&>(*mComponents[type][id].back().get());
+	return static_cast<T &>(*mComponents[type][id].back().get());
 }
 
 template <typename T>
 void ComponentManager::DeleteComponentsById(std::uint32_t id) {
-	std::type_index type = typeid(
-		T); //Determine the type of T (this is used as the key of the unordered_map<>)
+	//Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
 
-	if (mComponents.find(type)
-		!= mComponents.end()) { //Find the type (in the unordered_map<>)
+	//Find the type (in the unordered_map<>)
+	if (mComponents.find(type) != mComponents.end()) {
+		//Get the correct vector<>
 		std::vector<std::vector<std::unique_ptr<Component>>> & componentArray
-			= mComponents[type]; //Get the correct vector<>
+			= mComponents[type];
 
-		if (id
-			< componentArray
-				  .size()) { //Make sure that the id (that we are looking for) is within the boundaries of the vector<>
-			componentArray[id]
-				.clear(); //Clear the whole vector<> of this specific type and id
+		//Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+		if (id < componentArray.size()) {
+			//Clear the whole vector<> of this specific type and id
+			componentArray[id].clear();
 		}
 	}
 }
 
 template <typename T>
 void ComponentManager::DeleteComponents() {
-	std::type_index type = typeid(
-		T); //Determine the type of T (this is used as the key of the unordered_map<>)
+	//Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
 
-	if (mComponents.find(type)
-		!= mComponents.end()) { //Find the type (in the unordered_map<>)
-		mComponents[type]
-			.clear(); //Clear the whole vector<> of this specific type
+	//Find the type (in the unordered_map<>)
+	if (mComponents.find(type) != mComponents.end()) {
+		//Clear the whole vector<> of this specific type
+		mComponents[type].clear();
 	}
 }
 
 template <typename T>
 std::vector<std::reference_wrapper<T>>
 ComponentManager::GetComponentsByID(std::uint32_t id) const {
-	std::type_index type = typeid(
-		T); //Determine the type of T (this is used as the key of the unordered_map<>)
+	//Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
 
-	std::vector<std::reference_wrapper<T>>
-		componentVector; //Create an empty vector<>
+	//Create an empty vector<>
+	std::vector<std::reference_wrapper<T>> componentVector;
 
-	if (mComponents.find(type)
-		!= mComponents.end()) { //Find the type (in the unordered_map<>)
+	//Find the type (in the unordered_map<>)
+	if (mComponents.find(type) != mComponents.end()) {
 
+		//Get the correct vector<>
 		const std::vector<std::vector<std::unique_ptr<Component>>> &
 			componentArray
-			= mComponents.at(type); //Get the correct vector<>
+			= mComponents.at(type);
 
-		if (id
-			< componentArray
-				  .size()) { //Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+		//Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+		if (id < componentArray.size()) {
+			//Loop trough the whole vector<>
 			for (const std::unique_ptr<Component> & componentPtr :
-				 componentArray[id]) { //Loop trough the whole vector<>
-				T * castedComponent = static_cast<T *>(
-					componentPtr.get()); //Cast the unique_ptr to a raw pointer
-
-				if (castedComponent) { //Ensure that the cast was successful
-					componentVector.push_back(
-						*castedComponent); //Add the dereferenced raw pointer to the vector<>
+				 componentArray[id]) {
+				//Cast the unique_ptr to a raw pointer
+				T * castedComponent = static_cast<T *>(componentPtr.get());
+
+				//Ensure that the cast was successful
+				if (castedComponent) {
+					//Add the dereferenced raw pointer to the vector<>
+					componentVector.push_back(*castedComponent);
 				}
 			}
 		}
 	}
 
-	return componentVector; //Return the vector<>
+	//Return the vector<>
+	return componentVector;
 }
 
 template <typename T>
 std::vector<std::reference_wrapper<T>>
 ComponentManager::GetComponentsByType() const {
-	std::type_index type = typeid(
-		T); //Determine the type of T (this is used as the key of the unordered_map<>)
+	//Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
 
-	std::vector<std::reference_wrapper<T>>
-		componentVector; //Create an empty vector<>
+	//Create an empty vector<>
+	std::vector<std::reference_wrapper<T>> componentVector;
 	//std::uint32_t id = 0;	//Set the id to 0 (the id will also be stored in the returned vector<>)
 
-	if (mComponents.find(type)
-		!= mComponents.end()) { //Find the type (in the unordered_map<>)
+	//Find the type (in the unordered_map<>)
+	if (mComponents.find(type) != mComponents.end()) {
 
+		//Get the correct vector<>
 		const std::vector<std::vector<std::unique_ptr<Component>>> &
 			componentArray
-			= mComponents.at(type); //Get the correct vector<>
+			= mComponents.at(type);
 
+		//Loop through the whole vector<>
 		for (const std::vector<std::unique_ptr<Component>> & component :
-			 componentArray) { //Loop through the whole vector<>
-			for (const std::unique_ptr<Component> & componentPtr :
-				 component) { //Loop trough the whole vector<>
-				T * castedComponent = static_cast<T *>(
-					componentPtr.get()); //Cast the unique_ptr to a raw pointer
-
-				if (castedComponent) { //Ensure that the cast was successful
-					componentVector.emplace_back(std::ref(
-						*castedComponent)); //Pair the dereferenced raw pointer and the id and add it to the vector<>
+			 componentArray) {
+			//Loop trough the whole vector<>
+			for (const std::unique_ptr<Component> & componentPtr : component) {
+				//Cast the unique_ptr to a raw pointer
+				T * castedComponent = static_cast<T *>(componentPtr.get());
+
+				//Ensure that the cast was successful
+				if (castedComponent) {
+					//Pair the dereferenced raw pointer and the id and add it to the vector<>
+					componentVector.emplace_back(std::ref(*castedComponent));
 				}
 			}
 
@@ -125,5 +130,6 @@ ComponentManager::GetComponentsByType() const {
 		}
 	}
 
-	return componentVector; //Return the vector<>
+	//Return the vector<>
+	return componentVector;
 }
diff --git a/mwe/ecs-homemade/inc/Components.h b/mwe/ecs-homemade/inc/Components.h
index b392fd0..ad491e7 100644
--- a/mwe/ecs-homemade/inc/Components.h
+++ b/mwe/ecs-homemade/inc/Components.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include <memory>
+#include <string>
 
 class Component {
 public:
@@ -40,7 +40,7 @@ public:
 	virtual void onUpdate() = 0;
 };
 
-template<typename T>
+template <typename T>
 class BehaviourWrapper : public IBehaviour {
 public:
 	BehaviourWrapper();
@@ -53,7 +53,7 @@ private:
 
 class BehaviourScript : public Component {
 public:
-	template<typename T>
+	template <typename T>
 	void addScript();
 
 	void onStart();
diff --git a/mwe/ecs-homemade/inc/Components.hpp b/mwe/ecs-homemade/inc/Components.hpp
index 85da5a5..436a28c 100644
--- a/mwe/ecs-homemade/inc/Components.hpp
+++ b/mwe/ecs-homemade/inc/Components.hpp
@@ -1,20 +1,20 @@
 #include "Components.h"
 #include <iostream>
 
-template<typename T>
-BehaviourWrapper<T>::BehaviourWrapper()  : instance() {}
+template <typename T>
+BehaviourWrapper<T>::BehaviourWrapper() : instance() {}
 
-template<typename T>
+template <typename T>
 void BehaviourWrapper<T>::onStart() {
 	instance.onStart();
 }
 
-template<typename T>
+template <typename T>
 void BehaviourWrapper<T>::onUpdate() {
 	instance.onUpdate();
 }
 
-template<typename T>
+template <typename T>
 void BehaviourScript::addScript() {
 	behaviour = std::make_unique<BehaviourWrapper<T>>();
 }
diff --git a/mwe/ecs-homemade/inc/GameObjectMax.h b/mwe/ecs-homemade/inc/GameObjectMax.h
index c6af50a..5fab44a 100644
--- a/mwe/ecs-homemade/inc/GameObjectMax.h
+++ b/mwe/ecs-homemade/inc/GameObjectMax.h
@@ -8,7 +8,7 @@ public:
 	GameObject(std::uint32_t id, std::string name, std::string tag, int layer);
 
 	template <typename T, typename... Args>
-	T& AddComponent(Args &&... args);
+	T & AddComponent(Args &&... args);
 
 	std::uint32_t mId;
 	std::string mName;
diff --git a/mwe/ecs-homemade/inc/GameObjectMax.hpp b/mwe/ecs-homemade/inc/GameObjectMax.hpp
index 4104589..2f433bb 100644
--- a/mwe/ecs-homemade/inc/GameObjectMax.hpp
+++ b/mwe/ecs-homemade/inc/GameObjectMax.hpp
@@ -1,7 +1,7 @@
 #include "ComponentManager.h"
 
 template <typename T, typename... Args>
-T& GameObject::AddComponent(Args &&... args) {
+T & GameObject::AddComponent(Args &&... args) {
 	return ComponentManager::GetInstance().AddComponent<T>(
 		mId, std::forward<Args>(args)...);
 }
diff --git a/mwe/ecs-homemade/src/Components.cpp b/mwe/ecs-homemade/src/Components.cpp
index e6a4673..de8753e 100644
--- a/mwe/ecs-homemade/src/Components.cpp
+++ b/mwe/ecs-homemade/src/Components.cpp
@@ -11,13 +11,13 @@ Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
 Colider::Colider(int size) : mSize(size) {}
 
 void BehaviourScript::onStart() {
-	if(behaviour) {
+	if (behaviour) {
 		behaviour->onStart();
 	}
 }
 
 void BehaviourScript::onUpdate() {
-	if(behaviour) {
+	if (behaviour) {
 		behaviour->onUpdate();
 	}
 }
diff --git a/mwe/ecs-homemade/src/main.cpp b/mwe/ecs-homemade/src/main.cpp
index e4a8bda..70c5d2c 100644
--- a/mwe/ecs-homemade/src/main.cpp
+++ b/mwe/ecs-homemade/src/main.cpp
@@ -9,13 +9,9 @@
 
 class myScript {
 public:
-	void onStart() {
-		std::cout << "In onStart" << std::endl;
-	}
+	void onStart() { std::cout << "In onStart" << std::endl; }
 
-	void onUpdate() {
-		std::cout << "In onUpdate" << std::endl;
-	}
+	void onUpdate() { std::cout << "In onUpdate" << std::endl; }
 };
 
 int main() {
@@ -57,7 +53,8 @@ int main() {
 	}
 
 	std::vector<std::reference_wrapper<BehaviourScript>> scripts
-		= ComponentManager::GetInstance().GetComponentsByType<BehaviourScript>();
+		= ComponentManager::GetInstance()
+			  .GetComponentsByType<BehaviourScript>();
 	for (BehaviourScript & script : scripts) {
 		//script.onStart();
 		//script.onUpdate();
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index 084cd33..2ea0c70 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -10,7 +10,8 @@ template <class T, typename... Args>
 void 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);
diff --git a/src/crepe/Script.cpp b/src/crepe/Script.cpp
index 42e3666..3b83b7c 100644
--- a/src/crepe/Script.cpp
+++ b/src/crepe/Script.cpp
@@ -2,6 +2,5 @@
 
 using namespace crepe;
 
-void Script::init() { }
-void Script::update() { }
-
+void Script::init() {}
+void Script::update() {}
diff --git a/src/crepe/Script.h b/src/crepe/Script.h
index ba4073a..cdd6814 100644
--- a/src/crepe/Script.h
+++ b/src/crepe/Script.h
@@ -12,5 +12,4 @@ protected:
 	// added event.
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index e301c71..988bb71 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -4,19 +4,12 @@
 
 using namespace crepe;
 
-ScriptSystem::ScriptSystem() {
-	dbg_trace();
-}
-ScriptSystem::~ScriptSystem() {
-	dbg_trace();
-}
+ScriptSystem::ScriptSystem() { dbg_trace(); }
+ScriptSystem::~ScriptSystem() { dbg_trace(); }
 
 ScriptSystem & ScriptSystem::get_instance() {
 	static ScriptSystem instance;
 	return instance;
 }
 
-void ScriptSystem::update() {
-	dbg_trace();
-}
-
+void ScriptSystem::update() { dbg_trace(); }
diff --git a/src/crepe/ScriptSystem.h b/src/crepe/ScriptSystem.h
index e1ed290..72e360b 100644
--- a/src/crepe/ScriptSystem.h
+++ b/src/crepe/ScriptSystem.h
@@ -14,5 +14,4 @@ private:
 	~ScriptSystem();
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/System.h b/src/crepe/System.h
index 3fe3d66..8744920 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 2dd933e..84bfd4c 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -4,7 +4,4 @@
 
 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 e9542c1..1d05a75 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../Script.h"
 #include "../Component.h"
+#include "../Script.h"
 
 namespace crepe::api {
 
@@ -13,5 +13,4 @@ protected:
 	BehaviorScript();
 };
 
-}
-
+} // namespace crepe::api
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 28605c7..a610b83 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -3,10 +3,10 @@
  * 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/BehaviorScript.h>
 
@@ -14,9 +14,7 @@ using namespace crepe;
 using namespace std;
 
 class MyScript : public api::BehaviorScript {
-	void update() {
-		dbg_trace();
-	}
+	void update() { dbg_trace(); }
 };
 
 int main() {
@@ -30,4 +28,3 @@ int main() {
 
 	return 0;
 }
-
-- 
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

(limited to 'src/crepe/api')

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(-)

(limited to 'src/crepe/api')

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(-)

(limited to 'src/crepe/api')

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(-)

(limited to 'src/crepe/api')

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


From 04a040e28ade412ea5b1767bf77eed3956121973 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 23 Oct 2024 13:12:18 +0200
Subject: move user-facing classes to api namespace

---
 src/crepe/CMakeLists.txt            |  9 ---------
 src/crepe/Collider.cpp              |  5 -----
 src/crepe/Collider.h                | 14 --------------
 src/crepe/Component.h               |  3 +--
 src/crepe/GameObject.cpp            |  7 -------
 src/crepe/GameObject.h              | 24 ------------------------
 src/crepe/GameObject.hpp            | 15 ---------------
 src/crepe/Rigidbody.cpp             |  6 ------
 src/crepe/Rigidbody.h               | 16 ----------------
 src/crepe/Sprite.cpp                |  8 --------
 src/crepe/Sprite.h                  | 16 ----------------
 src/crepe/api/AudioSource.cpp       |  3 ++-
 src/crepe/api/AudioSource.h         |  4 ++--
 src/crepe/api/BehaviorScript.cpp    |  1 -
 src/crepe/api/BehaviorScript.h      |  2 +-
 src/crepe/api/CMakeLists.txt        |  9 +++++++++
 src/crepe/api/Collider.cpp          |  5 +++++
 src/crepe/api/Collider.h            | 14 ++++++++++++++
 src/crepe/api/GameObject.cpp        |  7 +++++++
 src/crepe/api/GameObject.h          | 24 ++++++++++++++++++++++++
 src/crepe/api/GameObject.hpp        | 15 +++++++++++++++
 src/crepe/api/Rigidbody.cpp         |  6 ++++++
 src/crepe/api/Rigidbody.h           | 16 ++++++++++++++++
 src/crepe/api/Sprite.cpp            |  8 ++++++++
 src/crepe/api/Sprite.h              | 16 ++++++++++++++++
 src/example/CMakeLists.txt          |  4 ++++
 src/example/components_internal.cpp | 11 +++++++----
 src/example/script.cpp              |  2 +-
 src/readme.md                       |  3 ++-
 29 files changed, 140 insertions(+), 133 deletions(-)
 delete mode 100644 src/crepe/Collider.cpp
 delete mode 100644 src/crepe/Collider.h
 delete mode 100644 src/crepe/GameObject.cpp
 delete mode 100644 src/crepe/GameObject.h
 delete mode 100644 src/crepe/GameObject.hpp
 delete mode 100644 src/crepe/Rigidbody.cpp
 delete mode 100644 src/crepe/Rigidbody.h
 delete mode 100644 src/crepe/Sprite.cpp
 delete mode 100644 src/crepe/Sprite.h
 create mode 100644 src/crepe/api/Collider.cpp
 create mode 100644 src/crepe/api/Collider.h
 create mode 100644 src/crepe/api/GameObject.cpp
 create mode 100644 src/crepe/api/GameObject.h
 create mode 100644 src/crepe/api/GameObject.hpp
 create mode 100644 src/crepe/api/Rigidbody.cpp
 create mode 100644 src/crepe/api/Rigidbody.h
 create mode 100644 src/crepe/api/Sprite.cpp
 create mode 100644 src/crepe/api/Sprite.h

(limited to 'src/crepe/api')

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 8323490..cfa51fb 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -4,10 +4,6 @@ target_sources(crepe PUBLIC
 	SoundContext.cpp
 	ComponentManager.cpp
 	Component.cpp
-	GameObject.cpp
-	Collider.cpp
-	Rigidbody.cpp
-	Sprite.cpp
 	ScriptSystem.cpp
 )
 
@@ -18,11 +14,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	ComponentManager.h
 	ComponentManager.hpp
 	Component.h
-	GameObject.h
-	GameObject.hpp
-	Collider.h
-	Rigidbody.h
-	Sprite.h
 	System.h
 	ScriptSystem.h
 )
diff --git a/src/crepe/Collider.cpp b/src/crepe/Collider.cpp
deleted file mode 100644
index 3f12afd..0000000
--- a/src/crepe/Collider.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "Collider.h"
-
-using namespace crepe;
-
-Collider::Collider(int size) : size(size) {}
diff --git a/src/crepe/Collider.h b/src/crepe/Collider.h
deleted file mode 100644
index 120da05..0000000
--- a/src/crepe/Collider.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Component.h"
-
-namespace crepe {
-
-class Collider : public Component {
-public:
-	Collider(int size);
-
-	int size;
-};
-
-} // namespace crepe
diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index d9a01ac..9cda177 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -8,9 +8,8 @@ protected:
 
 public:
 	virtual ~Component() = default;
-	// TODO: shouldn't this constructor be deleted because this class will never
-	// directly be instantiated?
 
+public:
 	bool active = true;
 };
 
diff --git a/src/crepe/GameObject.cpp b/src/crepe/GameObject.cpp
deleted file mode 100644
index de3beb6..0000000
--- a/src/crepe/GameObject.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GameObject.h"
-
-using namespace crepe;
-
-GameObject::GameObject(uint32_t id, std::string name, std::string tag,
-					   int layer)
-	: id(id), name(name), tag(tag), active(true), layer(layer) {}
diff --git a/src/crepe/GameObject.h b/src/crepe/GameObject.h
deleted file mode 100644
index b5d6399..0000000
--- a/src/crepe/GameObject.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string>
-
-namespace crepe {
-
-class GameObject {
-public:
-	GameObject(uint32_t id, std::string name, std::string tag, int layer);
-
-	template <typename T, typename... Args>
-	T & add_component(Args &&... args);
-
-	uint32_t id;
-	std::string name;
-	std::string tag;
-	bool active;
-	int layer;
-};
-
-} // namespace crepe
-
-#include "GameObject.hpp"
diff --git a/src/crepe/GameObject.hpp b/src/crepe/GameObject.hpp
deleted file mode 100644
index 8cd1abe..0000000
--- a/src/crepe/GameObject.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "GameObject.h"
-
-#include "ComponentManager.h"
-
-namespace crepe {
-
-template <typename T, typename... Args>
-T & GameObject::add_component(Args &&... args) {
-	auto & mgr = ComponentManager::get_instance();
-	return mgr.add_component<T>(id, std::forward<Args>(args)...);
-}
-
-} // namespace crepe
diff --git a/src/crepe/Rigidbody.cpp b/src/crepe/Rigidbody.cpp
deleted file mode 100644
index 495d908..0000000
--- a/src/crepe/Rigidbody.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "Rigidbody.h"
-
-using namespace crepe;
-
-Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
-	: mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
diff --git a/src/crepe/Rigidbody.h b/src/crepe/Rigidbody.h
deleted file mode 100644
index 63a8877..0000000
--- a/src/crepe/Rigidbody.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "Component.h"
-
-namespace crepe {
-
-class Rigidbody : public Component {
-public:
-	Rigidbody(int mass, int gravityScale, int bodyType);
-
-	int mass;
-	int gravity_scale;
-	int body_type;
-};
-
-} // namespace crepe
diff --git a/src/crepe/Sprite.cpp b/src/crepe/Sprite.cpp
deleted file mode 100644
index a5a5e68..0000000
--- a/src/crepe/Sprite.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <string>
-
-#include "Sprite.h"
-
-using namespace crepe;
-using namespace std;
-
-Sprite::Sprite(string path) : path(path) {}
diff --git a/src/crepe/Sprite.h b/src/crepe/Sprite.h
deleted file mode 100644
index 143e702..0000000
--- a/src/crepe/Sprite.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <string>
-
-#include "Component.h"
-
-namespace crepe {
-
-class Sprite : public Component {
-public:
-	Sprite(std::string path);
-
-	std::string path;
-};
-
-} // namespace crepe
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index b512d27..bb067dc 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -1,7 +1,8 @@
+#include <memory>
+
 #include "AudioSource.h"
 
 #include "../Sound.h"
-#include <memory>
 
 using namespace crepe::api;
 
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 2d26cda..7980212 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -2,8 +2,8 @@
 
 #include <memory>
 
-#include "Asset.h"
-#include "Component.h"
+#include "../Asset.h"
+#include "../Component.h"
 
 namespace crepe {
 class Sound;
diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
index 1f236b4..84bfd4c 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -1,7 +1,6 @@
 #include "../util/log.h"
 
 #include "BehaviorScript.h"
-#include "Script.h"
 
 using namespace crepe::api;
 
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index 6ce6798..25d3cc5 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "Component.h"
+#include "../Component.h"
 #include "Script.h"
 
 namespace crepe {
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 6b337be..ae92f3d 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -2,11 +2,20 @@ target_sources(crepe PUBLIC
 	# AudioSource.cpp
 	BehaviorScript.cpp
 	Script.cpp
+	GameObject.cpp
+	Collider.cpp
+	Rigidbody.cpp
+	Sprite.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	# AudioSource.h
 	BehaviorScript.h
 	Script.h
+	GameObject.h
+	GameObject.hpp
+	Collider.h
+	Rigidbody.h
+	Sprite.h
 )
 
diff --git a/src/crepe/api/Collider.cpp b/src/crepe/api/Collider.cpp
new file mode 100644
index 0000000..6370a42
--- /dev/null
+++ b/src/crepe/api/Collider.cpp
@@ -0,0 +1,5 @@
+#include "Collider.h"
+
+using namespace crepe::api;
+
+Collider::Collider(int size) : size(size) {}
diff --git a/src/crepe/api/Collider.h b/src/crepe/api/Collider.h
new file mode 100644
index 0000000..72d8e77
--- /dev/null
+++ b/src/crepe/api/Collider.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../Component.h"
+
+namespace crepe::api {
+
+class Collider : public Component {
+public:
+	Collider(int size);
+
+	int size;
+};
+
+} // namespace crepe::api
diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp
new file mode 100644
index 0000000..b167187
--- /dev/null
+++ b/src/crepe/api/GameObject.cpp
@@ -0,0 +1,7 @@
+#include "GameObject.h"
+
+using namespace crepe::api;
+using namespace std;
+
+GameObject::GameObject(uint32_t id, string name, string tag, int layer)
+	: id(id), name(name), tag(tag), active(true), layer(layer) {}
diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h
new file mode 100644
index 0000000..57508c5
--- /dev/null
+++ b/src/crepe/api/GameObject.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+namespace crepe::api {
+
+class GameObject {
+public:
+	GameObject(uint32_t id, std::string name, std::string tag, int layer);
+
+	template <typename T, typename... Args>
+	T & add_component(Args &&... args);
+
+	uint32_t id;
+	std::string name;
+	std::string tag;
+	bool active;
+	int layer;
+};
+
+} // namespace crepe::api
+
+#include "GameObject.hpp"
diff --git a/src/crepe/api/GameObject.hpp b/src/crepe/api/GameObject.hpp
new file mode 100644
index 0000000..8295ea3
--- /dev/null
+++ b/src/crepe/api/GameObject.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "../ComponentManager.h"
+
+#include "GameObject.h"
+
+namespace crepe::api {
+
+template <typename T, typename... Args>
+T & GameObject::add_component(Args &&... args) {
+	auto & mgr = ComponentManager::get_instance();
+	return mgr.add_component<T>(id, std::forward<Args>(args)...);
+}
+
+} // namespace crepe::api
diff --git a/src/crepe/api/Rigidbody.cpp b/src/crepe/api/Rigidbody.cpp
new file mode 100644
index 0000000..98d1d60
--- /dev/null
+++ b/src/crepe/api/Rigidbody.cpp
@@ -0,0 +1,6 @@
+#include "Rigidbody.h"
+
+using namespace crepe::api;
+
+Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
+	: mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h
new file mode 100644
index 0000000..6cae579
--- /dev/null
+++ b/src/crepe/api/Rigidbody.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../Component.h"
+
+namespace crepe::api {
+
+class Rigidbody : public Component {
+public:
+	Rigidbody(int mass, int gravityScale, int bodyType);
+
+	int mass;
+	int gravity_scale;
+	int body_type;
+};
+
+} // namespace crepe::api
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
new file mode 100644
index 0000000..aa7dbb0
--- /dev/null
+++ b/src/crepe/api/Sprite.cpp
@@ -0,0 +1,8 @@
+#include <string>
+
+#include "Sprite.h"
+
+using namespace crepe::api;
+using namespace std;
+
+Sprite::Sprite(string path) : path(path) {}
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
new file mode 100644
index 0000000..580f825
--- /dev/null
+++ b/src/crepe/api/Sprite.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <string>
+
+#include "../Component.h"
+
+namespace crepe::api {
+
+class Sprite : public Component {
+public:
+	Sprite(std::string path);
+
+	std::string path;
+};
+
+} // namespace crepe::api
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 6df4ce7..53f584f 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -1,3 +1,6 @@
+# all examples
+add_custom_target(examples)
+
 # add_example(target_name [SOURCES...])
 function(add_example target_name)
 	# if SOURCES is not specified
@@ -10,6 +13,7 @@ function(add_example target_name)
 
 	add_executable(${target_name} EXCLUDE_FROM_ALL ${sources})
 	target_link_libraries(${target_name} PUBLIC crepe)
+	add_dependencies(examples ${target_name})
 endfunction()
 
 add_example(audio_internal)
diff --git a/src/example/components_internal.cpp b/src/example/components_internal.cpp
index 54ce295..e2169e1 100644
--- a/src/example/components_internal.cpp
+++ b/src/example/components_internal.cpp
@@ -6,14 +6,17 @@
 #include <cassert>
 #include <chrono>
 
-#include <crepe/Collider.h>
 #include <crepe/Component.h>
 #include <crepe/ComponentManager.h>
-#include <crepe/GameObject.h>
-#include <crepe/Rigidbody.h>
-#include <crepe/Sprite.h>
+
+#include <crepe/api/Collider.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Sprite.h>
+
 #include <crepe/util/log.h>
 
+using namespace crepe::api;
 using namespace crepe;
 using namespace std;
 
diff --git a/src/example/script.cpp b/src/example/script.cpp
index cc585db..6e5563c 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -4,11 +4,11 @@
  */
 
 #include <crepe/ComponentManager.h>
-#include <crepe/GameObject.h>
 #include <crepe/ScriptSystem.h>
 #include <crepe/util/log.h>
 
 #include <crepe/api/BehaviorScript.h>
+#include <crepe/api/GameObject.h>
 #include <crepe/api/Script.h>
 
 using namespace crepe;
diff --git a/src/readme.md b/src/readme.md
index a4a71e7..a8ffc51 100644
--- a/src/readme.md
+++ b/src/readme.md
@@ -18,7 +18,8 @@ running the build command:
 $ ninja -C build test_main
 ```
 
-Each source file in the example/ folder corresponds to a CMake target as well:
+Each source file in the example/ folder corresponds to a CMake target as well
+(all examples can be built at once by specifying the `examples` target):
 
 ```
 $ ninja -C build audio_internal components_internal
-- 
cgit v1.2.3