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/util/CMakeLists.txt | 0
 src/crepe/util/debug.cpp      | 0
 src/crepe/util/debug.h        | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/crepe/util/CMakeLists.txt
 create mode 100644 src/crepe/util/debug.cpp
 create mode 100644 src/crepe/util/debug.h

(limited to 'src/crepe/util')

diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/crepe/util/debug.cpp b/src/crepe/util/debug.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/src/crepe/util/debug.h b/src/crepe/util/debug.h
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3


From feea4cbb648d67e46b413880ddbf203c88c2a2b1 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 29 Sep 2024 16:15:49 +0200
Subject: implement debug logging functions and fix sound system segfault

---
 src/crepe/CMakeLists.txt      |  1 +
 src/crepe/Sound.cpp           | 17 ++++++++++-----
 src/crepe/Sound.h             |  3 +--
 src/crepe/SoundSystem.cpp     | 11 ++++++++--
 src/crepe/SoundSystem.h       |  8 ++++++-
 src/crepe/util/CMakeLists.txt |  9 ++++++++
 src/crepe/util/color.h        | 42 +++++++++++++++++++++++++++++++++++
 src/crepe/util/debug.cpp      |  0
 src/crepe/util/debug.h        |  0
 src/crepe/util/log.cpp        | 51 +++++++++++++++++++++++++++++++++++++++++++
 src/crepe/util/log.h          | 33 ++++++++++++++++++++++++++++
 src/dummy_audio.cpp           |  3 +++
 12 files changed, 167 insertions(+), 11 deletions(-)
 create mode 100644 src/crepe/util/color.h
 delete mode 100644 src/crepe/util/debug.cpp
 delete mode 100644 src/crepe/util/debug.h
 create mode 100644 src/crepe/util/log.cpp
 create mode 100644 src/crepe/util/log.h

(limited to 'src/crepe/util')

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 13d9be5..9f7c91c 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -9,4 +9,5 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 )
 
 add_subdirectory(api)
+add_subdirectory(util)
 
diff --git a/src/crepe/Sound.cpp b/src/crepe/Sound.cpp
index d48393c..94f97af 100644
--- a/src/crepe/Sound.cpp
+++ b/src/crepe/Sound.cpp
@@ -1,24 +1,29 @@
+#include "util/log.h"
+
 #include "Sound.h"
 #include "SoundSystem.h"
 
 using namespace crepe;
 
-Sound::Sound(std::unique_ptr<api::Resource> res, SoundSystem & system) : system(system) {
+Sound::Sound(std::unique_ptr<api::Resource> res) {
+	dbg_trace();
 	this->res = std::move(res);
 }
 
 void Sound::play() {
-	if (this->system.engine.getPause(this->handle)) {
+	SoundSystem & system = SoundSystem::instance();
+	if (system.engine.getPause(this->handle)) {
 		// resume if paused
-		this->system.engine.setPause(this->handle, false);
+		system.engine.setPause(this->handle, false);
 	} else {
 		// or start new sound
-		this->handle = this->system.engine.play(this->sample);
+		this->handle = system.engine.play(this->sample);
 	}
 }
 
 void Sound::pause() {
-	if (this->system.engine.getPause(this->handle)) return;
-	this->system.engine.setPause(this->handle, true);
+	SoundSystem & system = SoundSystem::instance();
+	if (system.engine.getPause(this->handle)) return;
+	system.engine.setPause(this->handle, true);
 }
 
diff --git a/src/crepe/Sound.h b/src/crepe/Sound.h
index 71fe390..333465b 100644
--- a/src/crepe/Sound.h
+++ b/src/crepe/Sound.h
@@ -55,9 +55,8 @@ public:
 	void set_looping(bool looping);
 
 private:
-	Sound(std::unique_ptr<api::Resource> res, SoundSystem & system);
-	SoundSystem & system;
 	friend class SoundSystem;
+	Sound(std::unique_ptr<api::Resource> res);
 
 private:
 	std::unique_ptr<api::Resource> res;
diff --git a/src/crepe/SoundSystem.cpp b/src/crepe/SoundSystem.cpp
index 30b0157..29bd196 100644
--- a/src/crepe/SoundSystem.cpp
+++ b/src/crepe/SoundSystem.cpp
@@ -1,9 +1,14 @@
+#include "util/log.h"
+
 #include "SoundSystem.h"
 #include <memory>
 
 using namespace crepe;
 
-SoundSystem SoundSystem::instance { };
+SoundSystem & SoundSystem::instance() {
+	static SoundSystem instance;
+	return instance;
+}
 
 std::unique_ptr<Sound> SoundSystem::sound(const std::string & src) {
 	auto res = std::make_unique<api::Resource>(src);
@@ -11,15 +16,17 @@ std::unique_ptr<Sound> SoundSystem::sound(const std::string & src) {
 }
 
 std::unique_ptr<Sound> SoundSystem::sound(std::unique_ptr<api::Resource> res) {
-	Sound * out = new Sound(std::move(res), SoundSystem::instance);
+	Sound * out = new Sound(std::move(res));
 	return std::unique_ptr<Sound>(out);
 }
 
 SoundSystem::SoundSystem() {
+	dbg_trace();
 	engine.init();
 }
 
 SoundSystem::~SoundSystem() {
+	dbg_trace();
 	engine.deinit();
 }
 
diff --git a/src/crepe/SoundSystem.h b/src/crepe/SoundSystem.h
index 23bb00a..515cb29 100644
--- a/src/crepe/SoundSystem.h
+++ b/src/crepe/SoundSystem.h
@@ -16,7 +16,13 @@ public:
 private:
 	SoundSystem();
 	virtual ~SoundSystem();
-	static SoundSystem instance;
+
+	// singleton
+	static SoundSystem & instance();
+	SoundSystem(const SoundSystem &) = delete;
+	SoundSystem(SoundSystem &&) = delete;
+	SoundSystem &operator=(const SoundSystem &) = delete;
+	SoundSystem &operator=(SoundSystem &&) = delete;
 
 private:
 	SoLoud::Soloud engine;
diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
index e69de29..100f028 100644
--- a/src/crepe/util/CMakeLists.txt
+++ b/src/crepe/util/CMakeLists.txt
@@ -0,0 +1,9 @@
+target_sources(crepe PUBLIC
+	log.cpp
+)
+
+target_sources(crepe PUBLIC FILE_SET HEADERS FILES
+	color.h
+	log.h
+)
+
diff --git a/src/crepe/util/color.h b/src/crepe/util/color.h
new file mode 100644
index 0000000..1af6c8f
--- /dev/null
+++ b/src/crepe/util/color.h
@@ -0,0 +1,42 @@
+#pragma once
+
+namespace crepe::util::color {
+
+constexpr const char * RESET = "\e[0m";
+
+constexpr const char * FG_BLACK = "\e[30m";
+constexpr const char * FG_RED = "\e[31m";
+constexpr const char * FG_GREEN = "\e[32m";
+constexpr const char * FG_YELLOW = "\e[33m";
+constexpr const char * FG_BLUE = "\e[34m";
+constexpr const char * FG_MAGENTA = "\e[35m";
+constexpr const char * FG_CYAN = "\e[36m";
+constexpr const char * FG_WHITE = "\e[37m";
+constexpr const char * BG_BLACK = "\e[40m";
+constexpr const char * BG_RED = "\e[41m";
+constexpr const char * BG_GREEN = "\e[42m";
+constexpr const char * BG_YELLOW = "\e[43m";
+constexpr const char * BG_BLUE = "\e[44m";
+constexpr const char * BG_MAGENTA = "\e[45m";
+constexpr const char * BG_CYAN = "\e[46m";
+constexpr const char * BG_WHITE = "\e[47m";
+
+constexpr const char * FG_BLACK_BRIGHT = "\e[90m";
+constexpr const char * FG_RED_BRIGHT = "\e[91m";
+constexpr const char * FG_GREEN_BRIGHT = "\e[92m";
+constexpr const char * FG_YELLOW_BRIGHT = "\e[93m";
+constexpr const char * FG_BLUE_BRIGHT = "\e[94m";
+constexpr const char * FG_MAGENTA_BRIGHT = "\e[95m";
+constexpr const char * FG_CYAN_BRIGHT = "\e[96m";
+constexpr const char * FG_WHITE_BRIGHT = "\e[97m";
+constexpr const char * BG_BLACK_BRIGHT = "\e[100m";
+constexpr const char * BG_RED_BRIGHT = "\e[101m";
+constexpr const char * BG_GREEN_BRIGHT = "\e[102m";
+constexpr const char * BG_YELLOW_BRIGHT = "\e[103m";
+constexpr const char * BG_BLUE_BRIGHT = "\e[104m";
+constexpr const char * BG_MAGENTA_BRIGHT = "\e[105m";
+constexpr const char * BG_CYAN_BRIGHT = "\e[106m";
+constexpr const char * BG_WHITE_BRIGHT = "\e[107m";
+
+}
+
diff --git a/src/crepe/util/debug.cpp b/src/crepe/util/debug.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/src/crepe/util/debug.h b/src/crepe/util/debug.h
deleted file mode 100644
index e69de29..0000000
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
new file mode 100644
index 0000000..796df49
--- /dev/null
+++ b/src/crepe/util/log.cpp
@@ -0,0 +1,51 @@
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <string>
+
+#include "log.h"
+
+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] ",
+};
+
+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);
+
+	// TODO: also log to file or smth
+	printf("%s", msg);
+	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);
+	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);
+	va_end(args);
+}
+
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
new file mode 100644
index 0000000..5295cb9
--- /dev/null
+++ b/src/crepe/util/log.h
@@ -0,0 +1,33 @@
+#pragma once
+
+// allow user to disable debug macros
+#ifndef CREPE_DISABLE_MACROS
+
+#include "color.h"
+
+// 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__)
+
+#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", "")
+
+#endif
+
+namespace crepe::util {
+
+enum log_level { debug, info, warning, error, };
+
+void logf(const char * fmt, ...);
+void logf(enum log_level level, const char * fmt, ...);
+
+}
+
+
diff --git a/src/dummy_audio.cpp b/src/dummy_audio.cpp
index 5e0000e..fb1e3ab 100644
--- a/src/dummy_audio.cpp
+++ b/src/dummy_audio.cpp
@@ -1,4 +1,5 @@
 #include "crepe/SoundSystem.h"
+#include "crepe/util/log.h"
 
 #include <chrono>
 #include <thread>
@@ -8,6 +9,8 @@ using namespace std;
 using namespace std::chrono_literals;
 
 int main() {
+	dbg_trace();
+
 	auto bgm = SoundSystem::sound("../mwe/audio/bgm.ogg");
 	auto sfx1 = SoundSystem::sound("../mwe/audio/sfx1.wav");
 	auto sfx2 = SoundSystem::sound("../mwe/audio/sfx2.wav");
-- 
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/util')

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 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/util')

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 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/util')

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