From 5f75bdbf3d38c94baeae52f4c4889f147ec6885e Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 5 Nov 2024 15:34:31 +0100
Subject: move systems + update contributing.md

---
 src/example/asset_manager.cpp |  2 --
 src/example/particle.cpp      | 13 +++++++------
 src/example/physics.cpp       |  7 ++++---
 src/example/rendering.cpp     |  4 +---
 src/example/script.cpp        |  2 +-
 5 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'src/example')

diff --git a/src/example/asset_manager.cpp b/src/example/asset_manager.cpp
index 7e15d1f..3d68ec0 100644
--- a/src/example/asset_manager.cpp
+++ b/src/example/asset_manager.cpp
@@ -1,5 +1,3 @@
-
-
 #include <crepe/Sound.h>
 #include <crepe/api/AssetManager.h>
 #include <crepe/api/Texture.h>
diff --git a/src/example/particle.cpp b/src/example/particle.cpp
index 53fa213..fb72b9b 100644
--- a/src/example/particle.cpp
+++ b/src/example/particle.cpp
@@ -1,13 +1,14 @@
-#include "Particle.h"
-#include "ParticleSystem.h"
-#include "SDLApp.h"
-#include "api/ParticleEmitter.h"
 #include <chrono>
+#include <iostream>
+#include <thread>
+
 #include <crepe/Component.h>
 #include <crepe/ComponentManager.h>
+#include <crepe/Particle.h>
+#include <crepe/SDLApp.h>
 #include <crepe/api/GameObject.h>
-#include <iostream>
-#include <thread>
+#include <crepe/api/ParticleEmitter.h>
+#include <crepe/system/ParticleSystem.h>
 
 using namespace crepe::api;
 using namespace crepe;
diff --git a/src/example/physics.cpp b/src/example/physics.cpp
index db69b9b..ae8d4ca 100644
--- a/src/example/physics.cpp
+++ b/src/example/physics.cpp
@@ -1,13 +1,14 @@
-#include "PhysicsSystem.h"
 #include <chrono>
+#include <iostream>
+#include <thread>
+
+#include <crepe/system/PhysicsSystem.h>
 #include <crepe/Component.h>
 #include <crepe/ComponentManager.h>
 #include <crepe/api/Force.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Rigidbody.h>
 #include <crepe/api/Transform.h>
-#include <iostream>
-#include <thread>
 
 using namespace crepe::api;
 using namespace crepe;
diff --git a/src/example/rendering.cpp b/src/example/rendering.cpp
index 1bf448c..0bc222a 100644
--- a/src/example/rendering.cpp
+++ b/src/example/rendering.cpp
@@ -1,7 +1,5 @@
-
-
 #include <crepe/ComponentManager.h>
-#include <crepe/RenderSystem.h>
+#include <crepe/system/RenderSystem.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/util/log.h>
 
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 5df26e8..1901078 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -4,7 +4,7 @@
  */
 
 #include <crepe/ComponentManager.h>
-#include <crepe/ScriptSystem.h>
+#include <crepe/system/ScriptSystem.h>
 #include <crepe/util/log.h>
 
 #include <crepe/api/BehaviorScript.h>
-- 
cgit v1.2.3


From a47b981c2254e1d49f58ebd4244c1be4624ba998 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 5 Nov 2024 15:49:59 +0100
Subject: remove util and api namespaces

---
 src/crepe/SDLContext.cpp            |  3 +-
 src/crepe/SDLContext.h              |  9 ++--
 src/crepe/api/AssetManager.cpp      |  2 +-
 src/crepe/api/AssetManager.h        |  4 +-
 src/crepe/api/AssetManager.hpp      |  4 +-
 src/crepe/api/AudioSource.cpp       |  2 +-
 src/crepe/api/AudioSource.h         |  8 ++--
 src/crepe/api/BehaviorScript.h      |  4 +-
 src/crepe/api/BehaviorScript.hpp    |  4 +-
 src/crepe/api/CircleCollider.h      |  4 +-
 src/crepe/api/Color.cpp             |  2 +-
 src/crepe/api/Color.h               |  4 +-
 src/crepe/api/Config.h              |  6 +--
 src/crepe/api/Force.cpp             |  4 +-
 src/crepe/api/Force.h               |  4 +-
 src/crepe/api/GameObject.cpp        |  2 +-
 src/crepe/api/GameObject.h          |  4 +-
 src/crepe/api/GameObject.hpp        |  4 +-
 src/crepe/api/Point.h               |  4 +-
 src/crepe/api/Rigidbody.cpp         |  2 +-
 src/crepe/api/Rigidbody.h           |  4 +-
 src/crepe/api/Script.cpp            |  2 +-
 src/crepe/api/Script.h              |  6 +--
 src/crepe/api/Script.hpp            |  4 +-
 src/crepe/api/Sprite.cpp            |  5 +-
 src/crepe/api/Sprite.h              |  4 +-
 src/crepe/api/Texture.cpp           |  6 +--
 src/crepe/api/Texture.h             |  4 +-
 src/crepe/api/Transform.cpp         |  2 +-
 src/crepe/api/Transform.h           |  4 +-
 src/crepe/system/PhysicsSystem.cpp  |  1 -
 src/crepe/system/RenderSystem.cpp   |  1 -
 src/crepe/system/ScriptSystem.cpp   |  1 -
 src/crepe/system/ScriptSystem.h     |  9 ++--
 src/crepe/util/CMakeLists.txt       |  4 +-
 src/crepe/util/LogColor.cpp         | 92 +++++++++++++++++++++++++++++++++++++
 src/crepe/util/LogColor.h           | 51 ++++++++++++++++++++
 src/crepe/util/color.cpp            | 91 ------------------------------------
 src/crepe/util/color.h              | 51 --------------------
 src/crepe/util/fmt.cpp              |  4 +-
 src/crepe/util/fmt.h                |  4 +-
 src/crepe/util/log.cpp              | 10 ++--
 src/crepe/util/log.h                | 16 +++----
 src/example/asset_manager.cpp       |  2 +-
 src/example/audio_internal.cpp      |  5 +-
 src/example/components_internal.cpp |  1 -
 src/example/log.cpp                 |  5 +-
 src/example/particle.cpp            |  1 -
 src/example/physics.cpp             |  1 -
 src/example/rendering.cpp           |  1 -
 src/example/script.cpp              |  5 +-
 51 files changed, 230 insertions(+), 247 deletions(-)
 create mode 100644 src/crepe/util/LogColor.cpp
 create mode 100644 src/crepe/util/LogColor.h
 delete mode 100644 src/crepe/util/color.cpp
 delete mode 100644 src/crepe/util/color.h

(limited to 'src/example')

diff --git a/src/crepe/SDLContext.cpp b/src/crepe/SDLContext.cpp
index 8bc5bc6..e61faa3 100644
--- a/src/crepe/SDLContext.cpp
+++ b/src/crepe/SDLContext.cpp
@@ -89,8 +89,7 @@ SDLContext::SDLContext() {
 
 void SDLContext::present_screen() { SDL_RenderPresent(this->game_renderer); }
 
-void SDLContext::draw(const api::Sprite & sprite,
-					  const api::Transform & transform) {
+void SDLContext::draw(const Sprite & sprite, const Transform & transform) {
 
 	static SDL_RendererFlip render_flip
 		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * sprite.flip.flip_x)
diff --git a/src/crepe/SDLContext.h b/src/crepe/SDLContext.h
index ea05c7b..94fc549 100644
--- a/src/crepe/SDLContext.h
+++ b/src/crepe/SDLContext.h
@@ -8,12 +8,9 @@
 
 #include "system/RenderSystem.h"
 
-namespace crepe::api {
-class Texture;
-}
-
 namespace crepe {
 
+class Texture;
 class SDLContext {
 
 public:
@@ -34,13 +31,13 @@ private:
 	virtual ~SDLContext();
 
 private:
-	friend class api::Texture;
+	friend class Texture;
 	SDL_Texture * texture_from_path(const char *);
 	//SDL_Texture* setTextureFromPath(const char*, SDL_Rect& clip, const int row, const int col);
 
 private:
 	friend class RenderSystem;
-	void draw(const api::Sprite &, const api::Transform &);
+	void draw(const Sprite &, const Transform &);
 	void clear_screen();
 	void present_screen();
 
diff --git a/src/crepe/api/AssetManager.cpp b/src/crepe/api/AssetManager.cpp
index 560df6c..b891760 100644
--- a/src/crepe/api/AssetManager.cpp
+++ b/src/crepe/api/AssetManager.cpp
@@ -2,7 +2,7 @@
 
 #include "AssetManager.h"
 
-using namespace crepe::api;
+using namespace crepe;
 
 AssetManager & AssetManager::get_instance() {
 	static AssetManager instance;
diff --git a/src/crepe/api/AssetManager.h b/src/crepe/api/AssetManager.h
index 3e72a49..fefbed9 100644
--- a/src/crepe/api/AssetManager.h
+++ b/src/crepe/api/AssetManager.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <unordered_map>
 
-namespace crepe::api {
+namespace crepe {
 
 class AssetManager {
 
@@ -30,6 +30,6 @@ public:
 								 bool reload = false);
 };
 
-} // namespace crepe::api
+} // namespace crepe
 
 #include "AssetManager.hpp"
diff --git a/src/crepe/api/AssetManager.hpp b/src/crepe/api/AssetManager.hpp
index 468724c..977b4e1 100644
--- a/src/crepe/api/AssetManager.hpp
+++ b/src/crepe/api/AssetManager.hpp
@@ -2,7 +2,7 @@
 
 #include "AssetManager.h"
 
-namespace crepe::api {
+namespace crepe {
 
 template <typename asset>
 std::shared_ptr<asset> AssetManager::cache(const std::string & file_path,
@@ -21,4 +21,4 @@ std::shared_ptr<asset> AssetManager::cache(const std::string & file_path,
 	return new_asset;
 }
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index 35b8d83..2bacc75 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -4,7 +4,7 @@
 
 #include "AudioSource.h"
 
-using namespace crepe::api;
+using namespace crepe;
 
 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 7980212..42add50 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -6,10 +6,8 @@
 #include "../Component.h"
 
 namespace crepe {
-class Sound;
-}
 
-namespace crepe::api {
+class Sound;
 
 //! Audio source component
 class AudioSource : Component {
@@ -35,7 +33,7 @@ public:
 	float volume;
 
 private:
-	std::unique_ptr<crepe::Sound> sound;
+	std::unique_ptr<Sound> sound;
 };
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index 6133cc8..21638f4 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -9,7 +9,7 @@ class ScriptSystem;
 class ComponentManager;
 } // namespace crepe
 
-namespace crepe::api {
+namespace crepe {
 
 class Script;
 
@@ -30,6 +30,6 @@ protected:
 	std::unique_ptr<Script> script = nullptr;
 };
 
-} // namespace crepe::api
+} // namespace crepe
 
 #include "BehaviorScript.hpp"
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index 2a3502f..4751607 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -7,7 +7,7 @@
 #include "BehaviorScript.h"
 #include "Script.h"
 
-namespace crepe::api {
+namespace crepe {
 
 template <class T>
 BehaviorScript & BehaviorScript::set_script() {
@@ -19,4 +19,4 @@ BehaviorScript & BehaviorScript::set_script() {
 	return *this;
 }
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/CircleCollider.h b/src/crepe/api/CircleCollider.h
index 762574b..931b012 100644
--- a/src/crepe/api/CircleCollider.h
+++ b/src/crepe/api/CircleCollider.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Collider.h"
 
-namespace crepe::api {
+namespace crepe {
 
 class CircleCollider : public Collider {
 public:
@@ -10,4 +10,4 @@ public:
 	int radius;
 };
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/Color.cpp b/src/crepe/api/Color.cpp
index fb5bd1a..fc6313d 100644
--- a/src/crepe/api/Color.cpp
+++ b/src/crepe/api/Color.cpp
@@ -1,6 +1,6 @@
 #include "Color.h"
 
-using namespace crepe::api;
+using namespace crepe;
 
 Color Color::white = Color(255, 255, 255, 0);
 Color Color::red = Color(255, 0, 0, 0);
diff --git a/src/crepe/api/Color.h b/src/crepe/api/Color.h
index e818de4..6b54888 100644
--- a/src/crepe/api/Color.h
+++ b/src/crepe/api/Color.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace crepe::api {
+namespace crepe {
 
 class Color {
 
@@ -34,4 +34,4 @@ private:
 	static Color black;
 };
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 8a7f268..22104a7 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -2,7 +2,7 @@
 
 #include "../util/log.h"
 
-namespace crepe::api {
+namespace crepe {
 
 class Config {
 private:
@@ -27,7 +27,7 @@ public:
 		 * Only messages with equal or higher priority than this value will be
 		 * logged.
 		 */
-		util::LogLevel level = util::LogLevel::INFO;
+		LogLevel level = LogLevel::INFO;
 		/**
 		 * \brief Colored log output
 		 *
@@ -37,4 +37,4 @@ public:
 	} log;
 };
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/Force.cpp b/src/crepe/api/Force.cpp
index e359adc..3c33ad3 100644
--- a/src/crepe/api/Force.cpp
+++ b/src/crepe/api/Force.cpp
@@ -2,7 +2,7 @@
 
 #include "Force.h"
 
-namespace crepe::api {
+namespace crepe {
 
 Force::Force(uint32_t game_object_id, uint32_t magnitude, uint32_t direction)
 	: Component(game_object_id) {
@@ -18,4 +18,4 @@ Force::Force(uint32_t game_object_id, uint32_t magnitude, uint32_t direction)
 		std::round(magnitude * std::sin(radian_direction)));
 }
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/Force.h b/src/crepe/api/Force.h
index 8da9a00..c08a8b9 100644
--- a/src/crepe/api/Force.h
+++ b/src/crepe/api/Force.h
@@ -4,7 +4,7 @@
 
 #include "../Component.h"
 
-namespace crepe::api {
+namespace crepe {
 
 class Force : public Component {
 public:
@@ -14,4 +14,4 @@ public:
 	int32_t force_y;
 };
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp
index b167187..445a60d 100644
--- a/src/crepe/api/GameObject.cpp
+++ b/src/crepe/api/GameObject.cpp
@@ -1,6 +1,6 @@
 #include "GameObject.h"
 
-using namespace crepe::api;
+using namespace crepe;
 using namespace std;
 
 GameObject::GameObject(uint32_t id, string name, string tag, int layer)
diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h
index 57508c5..b5d6399 100644
--- a/src/crepe/api/GameObject.h
+++ b/src/crepe/api/GameObject.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <string>
 
-namespace crepe::api {
+namespace crepe {
 
 class GameObject {
 public:
@@ -19,6 +19,6 @@ public:
 	int layer;
 };
 
-} // namespace crepe::api
+} // namespace crepe
 
 #include "GameObject.hpp"
diff --git a/src/crepe/api/GameObject.hpp b/src/crepe/api/GameObject.hpp
index 3c7e867..77cf40e 100644
--- a/src/crepe/api/GameObject.hpp
+++ b/src/crepe/api/GameObject.hpp
@@ -4,7 +4,7 @@
 
 #include "GameObject.h"
 
-namespace crepe::api {
+namespace crepe {
 
 template <typename T, typename... Args>
 T & GameObject::add_component(Args &&... args) {
@@ -12,4 +12,4 @@ T & GameObject::add_component(Args &&... args) {
 	return mgr.add_component<T>(this->id, std::forward<Args>(args)...);
 }
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/Point.h b/src/crepe/api/Point.h
index b47b7e6..575d624 100644
--- a/src/crepe/api/Point.h
+++ b/src/crepe/api/Point.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace crepe::api {
+namespace crepe {
 
 class Point {
 public:
@@ -8,4 +8,4 @@ public:
 	double y;
 };
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/Rigidbody.cpp b/src/crepe/api/Rigidbody.cpp
index ebf9fb9..0a6262a 100644
--- a/src/crepe/api/Rigidbody.cpp
+++ b/src/crepe/api/Rigidbody.cpp
@@ -1,6 +1,6 @@
 #include "Rigidbody.h"
 
-using namespace crepe::api;
+using namespace crepe;
 
 Rigidbody::Rigidbody(uint32_t game_object_id, int mass, int gravity_scale,
 					 BodyType bodyType)
diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h
index 6079a76..518ed94 100644
--- a/src/crepe/api/Rigidbody.h
+++ b/src/crepe/api/Rigidbody.h
@@ -4,7 +4,7 @@
 
 #include "../Component.h"
 
-namespace crepe::api {
+namespace crepe {
 
 // FIXME: can't this enum be defined inside the class declaration of Rigidbody?
 enum class BodyType {
@@ -27,4 +27,4 @@ public:
 	BodyType body_type;
 };
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 5016ed0..390cec7 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -1,3 +1,3 @@
 #include "Script.h"
 
-using namespace crepe::api;
+using namespace crepe;
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 59e6ec0..49e625f 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -6,7 +6,7 @@ namespace crepe {
 class ScriptSystem;
 }
 
-namespace crepe::api {
+namespace crepe {
 
 class BehaviorScript;
 
@@ -29,10 +29,10 @@ protected:
 	std::vector<std::reference_wrapper<T>> get_components();
 
 private:
-	friend class crepe::api::BehaviorScript;
+	friend class crepe::BehaviorScript;
 	BehaviorScript * parent = nullptr;
 };
 
-} // namespace crepe::api
+} // namespace crepe
 
 #include "Script.hpp"
diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp
index 8004fe3..d96c0e8 100644
--- a/src/crepe/api/Script.hpp
+++ b/src/crepe/api/Script.hpp
@@ -5,7 +5,7 @@
 #include "BehaviorScript.h"
 #include "Script.h"
 
-namespace crepe::api {
+namespace crepe {
 
 template <typename T>
 T & Script::get_component() {
@@ -22,4 +22,4 @@ std::vector<std::reference_wrapper<T>> Script::get_components() {
 	return mgr.get_components_by_id<T>(this->parent->game_object_id);
 }
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 806f147..3fd6018 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -1,15 +1,14 @@
 #include <cstdint>
 #include <memory>
 
-#include "api/Texture.h"
-#include "util/log.h"
+#include "../util/log.h"
 
+#include "Texture.h"
 #include "Component.h"
 #include "Sprite.h"
 
 using namespace std;
 using namespace crepe;
-using namespace crepe::api;
 
 Sprite::Sprite(uint32_t id, shared_ptr<Texture> image, const Color & color,
 			   const FlipSettings & flip)
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index b06125e..bdb4da9 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -9,7 +9,7 @@
 
 #include "Component.h"
 
-namespace crepe::api {
+namespace crepe {
 
 struct FlipSettings {
 	bool flip_x = 1;
@@ -29,4 +29,4 @@ public:
 	uint8_t order_in_layer;
 };
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
index 481ef7c..b84a3c6 100644
--- a/src/crepe/api/Texture.cpp
+++ b/src/crepe/api/Texture.cpp
@@ -1,12 +1,12 @@
 #include <SDL2/SDL_render.h>
 
-#include "util/log.h"
+#include "../util/log.h"
+#include "../SDLContext.h"
 
 #include "Asset.h"
-#include "SDLContext.h"
 #include "Texture.h"
 
-using namespace crepe::api;
+using namespace crepe;
 using namespace std;
 
 Texture::Texture(unique_ptr<Asset> res) {
diff --git a/src/crepe/api/Texture.h b/src/crepe/api/Texture.h
index f8481e3..9a86f6f 100644
--- a/src/crepe/api/Texture.h
+++ b/src/crepe/api/Texture.h
@@ -12,7 +12,7 @@ namespace crepe {
 class SDLContext;
 }
 
-namespace crepe::api {
+namespace crepe {
 
 class Texture {
 
@@ -30,4 +30,4 @@ private:
 	friend class crepe::SDLContext;
 };
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp
index c76bc72..70b16bd 100644
--- a/src/crepe/api/Transform.cpp
+++ b/src/crepe/api/Transform.cpp
@@ -6,7 +6,7 @@
 #include "Component.h"
 #include "Transform.h"
 
-using namespace crepe::api;
+using namespace crepe;
 
 Transform::Transform(uint32_t game_id, const Point & point, double rot,
 					 double scale)
diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h
index c451c16..d416088 100644
--- a/src/crepe/api/Transform.h
+++ b/src/crepe/api/Transform.h
@@ -6,7 +6,7 @@
 
 #include "Component.h"
 
-namespace crepe::api {
+namespace crepe {
 
 class Transform : public Component {
 	// FIXME: What's the difference between the `Point` and `Position`
@@ -24,4 +24,4 @@ public:
 	double scale;
 };
 
-} // namespace crepe::api
+} // namespace crepe
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index 6da714f..efec750 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -8,7 +8,6 @@
 #include "PhysicsSystem.h"
 
 using namespace crepe;
-using namespace crepe::api;
 
 PhysicsSystem::PhysicsSystem() {}
 
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 599087a..b3c53db 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -10,7 +10,6 @@
 #include "RenderSystem.h"
 
 using namespace crepe;
-using namespace crepe::api;
 
 RenderSystem::RenderSystem() { dbg_trace(); }
 
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 277b29d..731adae 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -11,7 +11,6 @@
 
 using namespace std;
 using namespace crepe;
-using namespace crepe::api;
 
 ScriptSystem::ScriptSystem() { dbg_trace(); }
 ScriptSystem::~ScriptSystem() { dbg_trace(); }
diff --git a/src/crepe/system/ScriptSystem.h b/src/crepe/system/ScriptSystem.h
index 1f472a0..32e793c 100644
--- a/src/crepe/system/ScriptSystem.h
+++ b/src/crepe/system/ScriptSystem.h
@@ -4,12 +4,10 @@
 
 #include "System.h"
 
-namespace crepe::api {
-class Script;
-}
-
 namespace crepe {
 
+class Script;
+
 class ScriptSystem : public System {
 public:
 	static ScriptSystem & get_instance();
@@ -20,7 +18,8 @@ private:
 	~ScriptSystem();
 
 private:
-	std::forward_list<api::Script *> get_scripts();
+	// TODO: to forward_list<reference_wrapper>
+	std::forward_list<Script *> get_scripts();
 };
 
 } // namespace crepe
diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
index bbeaad9..3675bee 100644
--- a/src/crepe/util/CMakeLists.txt
+++ b/src/crepe/util/CMakeLists.txt
@@ -1,11 +1,11 @@
 target_sources(crepe PUBLIC
-	color.cpp
+	LogColor.cpp
 	log.cpp
 	fmt.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
-	color.h
+	LogColor.h
 	log.h
 	fmt.h
 )
diff --git a/src/crepe/util/LogColor.cpp b/src/crepe/util/LogColor.cpp
new file mode 100644
index 0000000..b5fe3ea
--- /dev/null
+++ b/src/crepe/util/LogColor.cpp
@@ -0,0 +1,92 @@
+#include <cstdarg>
+
+#include "../api/Config.h"
+#include "LogColor.h"
+
+#include "fmt.h"
+
+using namespace crepe;
+using namespace std;
+
+static constexpr const char * RESET_CODE = "\e[0m";
+
+const string LogColor::str(const string & content) {
+	auto & cfg = Config::get_instance();
+	string out = content;
+	if (cfg.log.color) out = this->code + out;
+	if (content.size() == 0) return out;
+	if (cfg.log.color) out = out + RESET_CODE;
+	return out;
+}
+
+const char * LogColor::c_str(const char * content) {
+	this->final = this->str(content == NULL ? "" : content);
+	return this->final.c_str();
+}
+
+const char * LogColor::fmt(const char * fmt, ...) {
+	va_list args;
+	va_start(args, fmt);
+	string content = va_stringf(args, fmt);
+	va_end(args);
+	return this->c_str(content.c_str());
+}
+
+LogColor & LogColor::add_code(unsigned int code) {
+	this->code += stringf("\e[%dm", code);
+	return *this;
+}
+
+LogColor & LogColor::reset() {
+	this->code = RESET_CODE;
+	return *this;
+}
+
+LogColor & LogColor::fg_black(bool bright) {
+	return this->add_code(bright ? 90 : 30);
+}
+LogColor & LogColor::fg_red(bool bright) {
+	return this->add_code(bright ? 91 : 31);
+}
+LogColor & LogColor::fg_green(bool bright) {
+	return this->add_code(bright ? 92 : 32);
+}
+LogColor & LogColor::fg_yellow(bool bright) {
+	return this->add_code(bright ? 93 : 33);
+}
+LogColor & LogColor::fg_blue(bool bright) {
+	return this->add_code(bright ? 94 : 34);
+}
+LogColor & LogColor::fg_magenta(bool bright) {
+	return this->add_code(bright ? 95 : 35);
+}
+LogColor & LogColor::fg_cyan(bool bright) {
+	return this->add_code(bright ? 96 : 36);
+}
+LogColor & LogColor::fg_white(bool bright) {
+	return this->add_code(bright ? 97 : 37);
+}
+LogColor & LogColor::bg_black(bool bright) {
+	return this->add_code(bright ? 100 : 40);
+}
+LogColor & LogColor::bg_red(bool bright) {
+	return this->add_code(bright ? 101 : 41);
+}
+LogColor & LogColor::bg_green(bool bright) {
+	return this->add_code(bright ? 102 : 42);
+}
+LogColor & LogColor::bg_yellow(bool bright) {
+	return this->add_code(bright ? 103 : 43);
+}
+LogColor & LogColor::bg_blue(bool bright) {
+	return this->add_code(bright ? 104 : 44);
+}
+LogColor & LogColor::bg_magenta(bool bright) {
+	return this->add_code(bright ? 105 : 45);
+}
+LogColor & LogColor::bg_cyan(bool bright) {
+	return this->add_code(bright ? 106 : 46);
+}
+LogColor & LogColor::bg_white(bool bright) {
+	return this->add_code(bright ? 107 : 47);
+}
diff --git a/src/crepe/util/LogColor.h b/src/crepe/util/LogColor.h
new file mode 100644
index 0000000..7e60ba2
--- /dev/null
+++ b/src/crepe/util/LogColor.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <string>
+
+namespace crepe {
+
+class LogColor {
+public:
+	LogColor() = default;
+
+public:
+	//! get color code as c-style string (or color content string)
+	const char * c_str(const char * content = NULL);
+	//! color printf-style format string
+	const char * fmt(const char * fmt, ...);
+	//! get color code as stl string (or color content string)
+	const std::string str(const std::string & content = "");
+
+public:
+	//! reset color to default foreground and background color
+	LogColor & reset();
+
+public:
+	LogColor & fg_black(bool bright = false);
+	LogColor & fg_red(bool bright = false);
+	LogColor & fg_green(bool bright = false);
+	LogColor & fg_yellow(bool bright = false);
+	LogColor & fg_blue(bool bright = false);
+	LogColor & fg_magenta(bool bright = false);
+	LogColor & fg_cyan(bool bright = false);
+	LogColor & fg_white(bool bright = false);
+
+public:
+	LogColor & bg_black(bool bright = false);
+	LogColor & bg_red(bool bright = false);
+	LogColor & bg_green(bool bright = false);
+	LogColor & bg_yellow(bool bright = false);
+	LogColor & bg_blue(bool bright = false);
+	LogColor & bg_magenta(bool bright = false);
+	LogColor & bg_cyan(bool bright = false);
+	LogColor & bg_white(bool bright = false);
+
+private:
+	LogColor & add_code(unsigned int code);
+
+private:
+	std::string code = "";
+	std::string final = "";
+};
+
+} // namespace crepe::util
diff --git a/src/crepe/util/color.cpp b/src/crepe/util/color.cpp
deleted file mode 100644
index a7bbc81..0000000
--- a/src/crepe/util/color.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include <cstdarg>
-
-#include "../api/Config.h"
-#include "color.h"
-#include "fmt.h"
-
-using namespace crepe::util;
-using namespace std;
-
-static constexpr const char * RESET_CODE = "\e[0m";
-
-const string LogColor::str(const string & content) {
-	auto & cfg = api::Config::get_instance();
-	string out = content;
-	if (cfg.log.color) out = this->code + out;
-	if (content.size() == 0) return out;
-	if (cfg.log.color) out = out + RESET_CODE;
-	return out;
-}
-
-const char * LogColor::c_str(const char * content) {
-	this->final = this->str(content == NULL ? "" : content);
-	return this->final.c_str();
-}
-
-const char * LogColor::fmt(const char * fmt, ...) {
-	va_list args;
-	va_start(args, fmt);
-	string content = va_stringf(args, fmt);
-	va_end(args);
-	return this->c_str(content.c_str());
-}
-
-LogColor & LogColor::add_code(unsigned int code) {
-	this->code += stringf("\e[%dm", code);
-	return *this;
-}
-
-LogColor & LogColor::reset() {
-	this->code = RESET_CODE;
-	return *this;
-}
-
-LogColor & LogColor::fg_black(bool bright) {
-	return this->add_code(bright ? 90 : 30);
-}
-LogColor & LogColor::fg_red(bool bright) {
-	return this->add_code(bright ? 91 : 31);
-}
-LogColor & LogColor::fg_green(bool bright) {
-	return this->add_code(bright ? 92 : 32);
-}
-LogColor & LogColor::fg_yellow(bool bright) {
-	return this->add_code(bright ? 93 : 33);
-}
-LogColor & LogColor::fg_blue(bool bright) {
-	return this->add_code(bright ? 94 : 34);
-}
-LogColor & LogColor::fg_magenta(bool bright) {
-	return this->add_code(bright ? 95 : 35);
-}
-LogColor & LogColor::fg_cyan(bool bright) {
-	return this->add_code(bright ? 96 : 36);
-}
-LogColor & LogColor::fg_white(bool bright) {
-	return this->add_code(bright ? 97 : 37);
-}
-LogColor & LogColor::bg_black(bool bright) {
-	return this->add_code(bright ? 100 : 40);
-}
-LogColor & LogColor::bg_red(bool bright) {
-	return this->add_code(bright ? 101 : 41);
-}
-LogColor & LogColor::bg_green(bool bright) {
-	return this->add_code(bright ? 102 : 42);
-}
-LogColor & LogColor::bg_yellow(bool bright) {
-	return this->add_code(bright ? 103 : 43);
-}
-LogColor & LogColor::bg_blue(bool bright) {
-	return this->add_code(bright ? 104 : 44);
-}
-LogColor & LogColor::bg_magenta(bool bright) {
-	return this->add_code(bright ? 105 : 45);
-}
-LogColor & LogColor::bg_cyan(bool bright) {
-	return this->add_code(bright ? 106 : 46);
-}
-LogColor & LogColor::bg_white(bool bright) {
-	return this->add_code(bright ? 107 : 47);
-}
diff --git a/src/crepe/util/color.h b/src/crepe/util/color.h
deleted file mode 100644
index 91e1abe..0000000
--- a/src/crepe/util/color.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace crepe::util {
-
-class LogColor {
-public:
-	LogColor() = default;
-
-public:
-	//! get color code as c-style string (or color content string)
-	const char * c_str(const char * content = NULL);
-	//! color printf-style format string
-	const char * fmt(const char * fmt, ...);
-	//! get color code as stl string (or color content string)
-	const std::string str(const std::string & content = "");
-
-public:
-	//! reset color to default foreground and background color
-	LogColor & reset();
-
-public:
-	LogColor & fg_black(bool bright = false);
-	LogColor & fg_red(bool bright = false);
-	LogColor & fg_green(bool bright = false);
-	LogColor & fg_yellow(bool bright = false);
-	LogColor & fg_blue(bool bright = false);
-	LogColor & fg_magenta(bool bright = false);
-	LogColor & fg_cyan(bool bright = false);
-	LogColor & fg_white(bool bright = false);
-
-public:
-	LogColor & bg_black(bool bright = false);
-	LogColor & bg_red(bool bright = false);
-	LogColor & bg_green(bool bright = false);
-	LogColor & bg_yellow(bool bright = false);
-	LogColor & bg_blue(bool bright = false);
-	LogColor & bg_magenta(bool bright = false);
-	LogColor & bg_cyan(bool bright = false);
-	LogColor & bg_white(bool bright = false);
-
-private:
-	LogColor & add_code(unsigned int code);
-
-private:
-	std::string code = "";
-	std::string final = "";
-};
-
-} // namespace crepe::util
diff --git a/src/crepe/util/fmt.cpp b/src/crepe/util/fmt.cpp
index 397bf9f..4b50da8 100644
--- a/src/crepe/util/fmt.cpp
+++ b/src/crepe/util/fmt.cpp
@@ -6,7 +6,7 @@
 
 using namespace std;
 
-string crepe::util::va_stringf(va_list args, const char * fmt) {
+string crepe::va_stringf(va_list args, const char * fmt) {
 	string out;
 
 	va_list args_copy;
@@ -26,7 +26,7 @@ string crepe::util::va_stringf(va_list args, const char * fmt) {
 	return out;
 }
 
-string crepe::util::stringf(const char * fmt, ...) {
+string crepe::stringf(const char * fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
 	string out = va_stringf(args, fmt);
diff --git a/src/crepe/util/fmt.h b/src/crepe/util/fmt.h
index 44c426f..e319e6e 100644
--- a/src/crepe/util/fmt.h
+++ b/src/crepe/util/fmt.h
@@ -2,9 +2,9 @@
 
 #include <string>
 
-namespace crepe::util {
+namespace crepe {
 
 std::string va_stringf(va_list args, const char * fmt);
 std::string stringf(const char * fmt, ...);
 
-} // namespace crepe::util
+} // namespace crepe
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index 6bcc4ae..4a8f8e8 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -7,7 +7,7 @@
 #include "fmt.h"
 #include "log.h"
 
-using namespace crepe::util;
+using namespace crepe;
 using namespace std;
 
 string log_prefix(LogLevel level) {
@@ -27,25 +27,25 @@ string log_prefix(LogLevel level) {
 }
 
 static void log(LogLevel level, const string msg) {
-	auto & cfg = crepe::api::Config::get_instance();
+	auto & cfg = Config::get_instance();
 	if (level < cfg.log.level) return;
 
 	string out = log_prefix(level) + msg;
 	if (!out.ends_with("\n")) out += "\n";
 
 	// TODO: also log to file or smth
-	printf("%s", out.c_str());
+	fwrite(out.c_str(), 1, out.size(), stdout);
 	fflush(stdout);
 }
 
-void crepe::util::logf(const char * fmt, ...) {
+void crepe::logf(const char * fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
 	log(LogLevel::DEBUG, va_stringf(args, fmt));
 	va_end(args);
 }
 
-void crepe::util::logf(LogLevel level, const char * fmt, ...) {
+void crepe::logf(LogLevel level, const char * fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
 	log(level, va_stringf(args, fmt));
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index 308ba96..b13b9cc 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -3,28 +3,28 @@
 // allow user to disable debug macros
 #ifndef CREPE_DISABLE_MACROS
 
-#include "color.h"
+#include "LogColor.h"
 
 // utility macros
 #define _crepe_logf_here(level, format, ...) \
-	crepe::util::logf( \
+	crepe::logf( \
 		level, "%s" format, \
-		crepe::util::LogColor().fg_white(false).fmt( \
+		crepe::LogColor().fg_white(false).fmt( \
 			"%s (%s:%d)", __PRETTY_FUNCTION__, __FILE_NAME__, __LINE__), \
 		__VA_ARGS__)
 
 // very illegal global function-style macros
 // NOLINTBEGIN
 #define dbg_logf(fmt, ...) \
-	_crepe_logf_here(crepe::util::LogLevel::DEBUG, ": " fmt, __VA_ARGS__)
+	_crepe_logf_here(crepe::LogLevel::DEBUG, ": " fmt, __VA_ARGS__)
 #define dbg_log(str) \
-	_crepe_logf_here(crepe::util::LogLevel::DEBUG, "%s: " str, "")
-#define dbg_trace() _crepe_logf_here(crepe::util::LogLevel::TRACE, "%s", "")
+	_crepe_logf_here(crepe::LogLevel::DEBUG, "%s: " str, "")
+#define dbg_trace() _crepe_logf_here(crepe::LogLevel::TRACE, "%s", "")
 // NOLINTEND
 
 #endif
 
-namespace crepe::util {
+namespace crepe {
 
 enum LogLevel {
 	TRACE,
@@ -37,4 +37,4 @@ enum LogLevel {
 void logf(const char * fmt, ...);
 void logf(enum LogLevel level, const char * fmt, ...);
 
-} // namespace crepe::util
+} // namespace crepe
diff --git a/src/example/asset_manager.cpp b/src/example/asset_manager.cpp
index 3d68ec0..f0d4575 100644
--- a/src/example/asset_manager.cpp
+++ b/src/example/asset_manager.cpp
@@ -3,7 +3,7 @@
 #include <crepe/api/Texture.h>
 
 using namespace crepe;
-using namespace crepe::api;
+
 int main() {
 
 	// this needs to be called before the asset manager otherwise the destructor
diff --git a/src/example/audio_internal.cpp b/src/example/audio_internal.cpp
index c7dd163..7586441 100644
--- a/src/example/audio_internal.cpp
+++ b/src/example/audio_internal.cpp
@@ -10,7 +10,6 @@
 #include <thread>
 
 using namespace crepe;
-using namespace crepe::api;
 using namespace std;
 using namespace std::chrono_literals;
 using std::make_unique;
@@ -18,8 +17,8 @@ using std::make_unique;
 // Unrelated stuff that is not part of this POC
 int _ = []() {
 	// Show dbg_trace() output
-	auto & cfg = api::Config::get_instance();
-	cfg.log.level = util::LogLevel::TRACE;
+	auto & cfg = Config::get_instance();
+	cfg.log.level = LogLevel::TRACE;
 
 	return 0; // satisfy compiler
 }();
diff --git a/src/example/components_internal.cpp b/src/example/components_internal.cpp
index 3c68974..ea1eaad 100644
--- a/src/example/components_internal.cpp
+++ b/src/example/components_internal.cpp
@@ -15,7 +15,6 @@
 
 #include <crepe/util/log.h>
 
-using namespace crepe::api;
 using namespace crepe;
 using namespace std;
 
diff --git a/src/example/log.cpp b/src/example/log.cpp
index 75f133c..db8aa48 100644
--- a/src/example/log.cpp
+++ b/src/example/log.cpp
@@ -7,13 +7,12 @@
 #include <crepe/util/log.h>
 
 using namespace crepe;
-using namespace crepe::util;
 
 // unrelated setup code
 int _ = []() {
 	// make sure all log messages get printed
-	auto & cfg = api::Config::get_instance();
-	cfg.log.level = util::LogLevel::TRACE;
+	auto & cfg = Config::get_instance();
+	cfg.log.level = LogLevel::TRACE;
 
 	return 0; // satisfy compiler
 }();
diff --git a/src/example/particle.cpp b/src/example/particle.cpp
index fb72b9b..38cff25 100644
--- a/src/example/particle.cpp
+++ b/src/example/particle.cpp
@@ -10,7 +10,6 @@
 #include <crepe/api/ParticleEmitter.h>
 #include <crepe/system/ParticleSystem.h>
 
-using namespace crepe::api;
 using namespace crepe;
 using namespace std;
 
diff --git a/src/example/physics.cpp b/src/example/physics.cpp
index ae8d4ca..d3a0f32 100644
--- a/src/example/physics.cpp
+++ b/src/example/physics.cpp
@@ -10,7 +10,6 @@
 #include <crepe/api/Rigidbody.h>
 #include <crepe/api/Transform.h>
 
-using namespace crepe::api;
 using namespace crepe;
 using namespace std;
 
diff --git a/src/example/rendering.cpp b/src/example/rendering.cpp
index 0bc222a..9c8d60c 100644
--- a/src/example/rendering.cpp
+++ b/src/example/rendering.cpp
@@ -15,7 +15,6 @@
 
 using namespace std;
 using namespace crepe;
-using namespace crepe::api;
 
 int main() {
 
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 1901078..dac7af3 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -14,14 +14,13 @@
 #include <crepe/api/Transform.h>
 
 using namespace crepe;
-using namespace crepe::api;
 using namespace std;
 
 // Unrelated stuff that is not part of this POC
 int _ = []() {
 	// Show dbg_trace() output
-	auto & cfg = api::Config::get_instance();
-	cfg.log.level = util::LogLevel::TRACE;
+	auto & cfg = Config::get_instance();
+	cfg.log.level = LogLevel::TRACE;
 
 	return 0; // satisfy compiler
 }();
-- 
cgit v1.2.3


From 74533e9fbcd0360950daec4dc297e48e30a8a2d0 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 5 Nov 2024 15:51:01 +0100
Subject: `make format`

---
 src/crepe/api/Sprite.cpp            | 2 +-
 src/crepe/api/Texture.cpp           | 2 +-
 src/crepe/system/ParticleSystem.cpp | 2 +-
 src/crepe/system/PhysicsSystem.cpp  | 2 +-
 src/crepe/system/RenderSystem.cpp   | 4 ++--
 src/crepe/system/ScriptSystem.cpp   | 2 +-
 src/crepe/util/LogColor.h           | 2 +-
 src/crepe/util/log.h                | 3 +--
 src/example/physics.cpp             | 2 +-
 src/example/rendering.cpp           | 2 +-
 10 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/example')

diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 3fd6018..3dd44f2 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -3,9 +3,9 @@
 
 #include "../util/log.h"
 
-#include "Texture.h"
 #include "Component.h"
 #include "Sprite.h"
+#include "Texture.h"
 
 using namespace std;
 using namespace crepe;
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
index b84a3c6..b5001a6 100644
--- a/src/crepe/api/Texture.cpp
+++ b/src/crepe/api/Texture.cpp
@@ -1,7 +1,7 @@
 #include <SDL2/SDL_render.h>
 
-#include "../util/log.h"
 #include "../SDLContext.h"
+#include "../util/log.h"
 
 #include "Asset.h"
 #include "Texture.h"
diff --git a/src/crepe/system/ParticleSystem.cpp b/src/crepe/system/ParticleSystem.cpp
index 367c7d8..397b586 100644
--- a/src/crepe/system/ParticleSystem.cpp
+++ b/src/crepe/system/ParticleSystem.cpp
@@ -1,8 +1,8 @@
 #include <cmath>
 #include <ctime>
 
-#include "../api/ParticleEmitter.h"
 #include "../ComponentManager.h"
+#include "../api/ParticleEmitter.h"
 
 #include "ParticleSystem.h"
 
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index efec750..cea8062 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -1,9 +1,9 @@
 #include <iostream>
 
+#include "../ComponentManager.h"
 #include "../api/Force.h"
 #include "../api/Rigidbody.h"
 #include "../api/Transform.h"
-#include "../ComponentManager.h"
 
 #include "PhysicsSystem.h"
 
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index b3c53db..ee3cdf2 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -1,11 +1,11 @@
 #include <functional>
 #include <vector>
 
+#include "../ComponentManager.h"
+#include "../SDLContext.h"
 #include "../api/Sprite.h"
 #include "../api/Transform.h"
 #include "../util/log.h"
-#include "../SDLContext.h"
-#include "../ComponentManager.h"
 
 #include "RenderSystem.h"
 
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 731adae..f1fae4d 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -2,10 +2,10 @@
 #include <functional>
 #include <vector>
 
+#include "../ComponentManager.h"
 #include "../api/BehaviorScript.h"
 #include "../api/Script.h"
 #include "../util/log.h"
-#include "../ComponentManager.h"
 
 #include "ScriptSystem.h"
 
diff --git a/src/crepe/util/LogColor.h b/src/crepe/util/LogColor.h
index 7e60ba2..c1170cb 100644
--- a/src/crepe/util/LogColor.h
+++ b/src/crepe/util/LogColor.h
@@ -48,4 +48,4 @@ private:
 	std::string final = "";
 };
 
-} // namespace crepe::util
+} // namespace crepe
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index b13b9cc..5a1cf00 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -17,8 +17,7 @@
 // NOLINTBEGIN
 #define dbg_logf(fmt, ...) \
 	_crepe_logf_here(crepe::LogLevel::DEBUG, ": " fmt, __VA_ARGS__)
-#define dbg_log(str) \
-	_crepe_logf_here(crepe::LogLevel::DEBUG, "%s: " str, "")
+#define dbg_log(str) _crepe_logf_here(crepe::LogLevel::DEBUG, "%s: " str, "")
 #define dbg_trace() _crepe_logf_here(crepe::LogLevel::TRACE, "%s", "")
 // NOLINTEND
 
diff --git a/src/example/physics.cpp b/src/example/physics.cpp
index d3a0f32..2dbddc2 100644
--- a/src/example/physics.cpp
+++ b/src/example/physics.cpp
@@ -2,13 +2,13 @@
 #include <iostream>
 #include <thread>
 
-#include <crepe/system/PhysicsSystem.h>
 #include <crepe/Component.h>
 #include <crepe/ComponentManager.h>
 #include <crepe/api/Force.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Rigidbody.h>
 #include <crepe/api/Transform.h>
+#include <crepe/system/PhysicsSystem.h>
 
 using namespace crepe;
 using namespace std;
diff --git a/src/example/rendering.cpp b/src/example/rendering.cpp
index 9c8d60c..b0ab60a 100644
--- a/src/example/rendering.cpp
+++ b/src/example/rendering.cpp
@@ -1,6 +1,6 @@
 #include <crepe/ComponentManager.h>
-#include <crepe/system/RenderSystem.h>
 #include <crepe/api/GameObject.h>
+#include <crepe/system/RenderSystem.h>
 #include <crepe/util/log.h>
 
 #include <crepe/api/AssetManager.h>
-- 
cgit v1.2.3


From b770475741b7c33d57331f3139c55a3f237ad274 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 5 Nov 2024 16:03:48 +0100
Subject: create facade folder

---
 contributing.md                   |   1 +
 src/crepe/CMakeLists.txt          |  11 +--
 src/crepe/SDLApp.cpp              |  71 -----------------
 src/crepe/SDLApp.h                |  26 -------
 src/crepe/SDLContext.cpp          | 157 --------------------------------------
 src/crepe/SDLContext.h            |  49 ------------
 src/crepe/Sound.cpp               |  60 ---------------
 src/crepe/Sound.h                 |  81 --------------------
 src/crepe/SoundContext.cpp        |  20 -----
 src/crepe/SoundContext.h          |  26 -------
 src/crepe/api/AudioSource.cpp     |   2 +-
 src/crepe/api/Texture.cpp         |   2 +-
 src/crepe/facade/CMakeLists.txt   |  14 ++++
 src/crepe/facade/SDLApp.cpp       |  71 +++++++++++++++++
 src/crepe/facade/SDLApp.h         |  26 +++++++
 src/crepe/facade/SDLContext.cpp   | 157 ++++++++++++++++++++++++++++++++++++++
 src/crepe/facade/SDLContext.h     |  48 ++++++++++++
 src/crepe/facade/Sound.cpp        |  60 +++++++++++++++
 src/crepe/facade/Sound.h          |  81 ++++++++++++++++++++
 src/crepe/facade/SoundContext.cpp |  20 +++++
 src/crepe/facade/SoundContext.h   |  26 +++++++
 src/crepe/system/RenderSystem.cpp |   2 +-
 src/example/asset_manager.cpp     |   2 +-
 src/example/audio_internal.cpp    |   2 +-
 src/example/particle.cpp          |   2 +-
 25 files changed, 512 insertions(+), 505 deletions(-)
 delete mode 100644 src/crepe/SDLApp.cpp
 delete mode 100644 src/crepe/SDLApp.h
 delete mode 100644 src/crepe/SDLContext.cpp
 delete mode 100644 src/crepe/SDLContext.h
 delete mode 100644 src/crepe/Sound.cpp
 delete mode 100644 src/crepe/Sound.h
 delete mode 100644 src/crepe/SoundContext.cpp
 delete mode 100644 src/crepe/SoundContext.h
 create mode 100644 src/crepe/facade/CMakeLists.txt
 create mode 100644 src/crepe/facade/SDLApp.cpp
 create mode 100644 src/crepe/facade/SDLApp.h
 create mode 100644 src/crepe/facade/SDLContext.cpp
 create mode 100644 src/crepe/facade/SDLContext.h
 create mode 100644 src/crepe/facade/Sound.cpp
 create mode 100644 src/crepe/facade/Sound.h
 create mode 100644 src/crepe/facade/SoundContext.cpp
 create mode 100644 src/crepe/facade/SoundContext.h

(limited to 'src/example')

diff --git a/contributing.md b/contributing.md
index 35d777d..2fe46f7 100644
--- a/contributing.md
+++ b/contributing.md
@@ -403,6 +403,7 @@ that you can click on to open them.
   |`crepe/api/`|User-facing APIs|
   |`crepe/util/`|Standalone utilities and helper functions|
   |`crepe/system/`|(ECS) system classes|
+  |`crepe/facade/`|Library façades|
 - Do not (indirectly) include private *dependency* headers in API header files,
   as these are no longer accessible when the engine is installed
 - All code is implemented under the `crepe` namespace.
diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 7f976db..8830e05 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -1,28 +1,21 @@
 target_sources(crepe PUBLIC
 	Asset.cpp
-	Sound.cpp
-	SoundContext.cpp
 	Particle.cpp
-	SDLApp.cpp
 	ComponentManager.cpp
 	Component.cpp
 	Collider.cpp
-	SDLContext.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Asset.h
-	Sound.h
-	SoundContext.h
-	SDLContext.h
 	ComponentManager.h
 	ComponentManager.hpp
 	Component.h
 	Collider.h
-	SDLContext.h
 )
 
 add_subdirectory(api)
-add_subdirectory(util)
+add_subdirectory(facade)
 add_subdirectory(system)
+add_subdirectory(util)
 
diff --git a/src/crepe/SDLApp.cpp b/src/crepe/SDLApp.cpp
deleted file mode 100644
index c6ddeaa..0000000
--- a/src/crepe/SDLApp.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <iostream>
-
-#include "SDLApp.h"
-
-SDLApp::SDLApp(int window_width, int window_height)
-	: window_width(window_width), window_height(window_height), window(nullptr),
-	  renderer(nullptr) {}
-
-// FIXME: why is there clean_up and ~SDLApp?
-SDLApp::~SDLApp() { clean_up(); }
-
-bool SDLApp::initialize() {
-	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
-		// FIXME: throw exception
-		std::cerr << "SDL Initialization Error: " << SDL_GetError()
-				  << std::endl;
-		return false;
-	}
-
-	window = SDL_CreateWindow("Particle System", SDL_WINDOWPOS_CENTERED,
-							  SDL_WINDOWPOS_CENTERED, window_width,
-							  window_height, SDL_WINDOW_SHOWN);
-	if (!window) {
-		// FIXME: throw exception
-		std::cerr << "Window Creation Error: " << SDL_GetError() << std::endl;
-		return false;
-	}
-
-	renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
-	if (!renderer) {
-		// FIXME: throw exception
-		std::cerr << "Renderer Creation Error: " << SDL_GetError() << std::endl;
-		return false;
-	}
-
-	return true;
-}
-
-void SDLApp::handle_events(bool & running) {
-	SDL_Event event;
-	while (SDL_PollEvent(&event)) {
-		if (event.type == SDL_QUIT) {
-			running = false;
-		}
-	}
-}
-
-void SDLApp::clear_screen() {
-	SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
-	SDL_RenderClear(renderer);
-}
-
-void SDLApp::present_screen() { SDL_RenderPresent(renderer); }
-
-void SDLApp::draw_square(int x, int y, int size) {
-	SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
-	SDL_Rect rect = {x, y, size, size};
-	SDL_RenderFillRect(renderer, &rect);
-}
-
-SDL_Texture * square_texture = nullptr; // Load this with an image or create it
-
-void SDLApp::clean_up() {
-	if (renderer) {
-		SDL_DestroyRenderer(renderer);
-	}
-	if (window) {
-		SDL_DestroyWindow(window);
-	}
-	SDL_Quit();
-}
diff --git a/src/crepe/SDLApp.h b/src/crepe/SDLApp.h
deleted file mode 100644
index e67947b..0000000
--- a/src/crepe/SDLApp.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <SDL2/SDL.h>
-
-#include "api/ParticleEmitter.h"
-
-class SDLApp {
-public:
-	SDLApp(int window_width, int window_height);
-	~SDLApp();
-
-	bool initialize();
-	void handle_events(bool & running);
-	void clear_screen();
-	void present_screen();
-	void draw_square(int x, int y, int size);
-	void clean_up();
-	void draw_particles(const std::vector<crepe::ParticleEmitter> & emitters);
-	void draw_multiple_squares(const std::vector<SDL_Rect> & squares);
-
-private:
-	int window_width;
-	int window_height;
-	SDL_Window * window;
-	SDL_Renderer * renderer;
-};
diff --git a/src/crepe/SDLContext.cpp b/src/crepe/SDLContext.cpp
deleted file mode 100644
index e61faa3..0000000
--- a/src/crepe/SDLContext.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
-#include <SDL2/SDL_render.h>
-#include <SDL2/SDL_surface.h>
-#include <SDL2/SDL_video.h>
-#include <cmath>
-#include <cstddef>
-#include <iostream>
-
-#include "api/Sprite.h"
-#include "api/Texture.h"
-#include "api/Transform.h"
-#include "util/log.h"
-
-#include "SDLContext.h"
-
-using namespace crepe;
-
-SDLContext & SDLContext::get_instance() {
-	static SDLContext instance;
-	return instance;
-}
-
-void SDLContext::handle_events(bool & running) {
-	SDL_Event event;
-	while (SDL_PollEvent(&event)) {
-		if (event.type == SDL_QUIT) {
-			running = false;
-		}
-	}
-}
-
-SDLContext::~SDLContext() {
-	dbg_trace();
-
-	if (this->game_renderer != nullptr)
-		SDL_DestroyRenderer(this->game_renderer);
-
-	if (this->game_window != nullptr) {
-		SDL_DestroyWindow(this->game_window);
-	}
-
-	// TODO: how are we going to ensure that these are called from the same
-	// thread that SDL_Init() was called on? This has caused problems for me
-	// before.
-	IMG_Quit();
-	SDL_Quit();
-}
-
-void SDLContext::clear_screen() { SDL_RenderClear(this->game_renderer); }
-
-SDLContext::SDLContext() {
-	dbg_trace();
-	// FIXME: read window defaults from config manager
-
-	if (SDL_Init(SDL_INIT_VIDEO) < 0) {
-		// FIXME: throw exception
-		std::cerr << "SDL could not initialize! SDL_Error: " << SDL_GetError()
-				  << std::endl;
-		return;
-	}
-
-	this->game_window = SDL_CreateWindow(
-		"Crepe Game Engine", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
-		1920, 1080, SDL_WINDOW_SHOWN);
-	if (!this->game_window) {
-		// FIXME: throw exception
-		std::cerr << "Window could not be created! SDL_Error: "
-				  << SDL_GetError() << std::endl;
-	}
-
-	this->game_renderer
-		= SDL_CreateRenderer(this->game_window, -1, SDL_RENDERER_ACCELERATED);
-	if (!this->game_renderer) {
-		// FIXME: throw exception
-		std::cerr << "Renderer could not be created! SDL_Error: "
-				  << SDL_GetError() << std::endl;
-		SDL_DestroyWindow(this->game_window);
-		return;
-	}
-
-	int img_flags = IMG_INIT_PNG;
-	if (!(IMG_Init(img_flags) & img_flags)) {
-		// FIXME: throw exception
-		std::cout << "SDL_image could not initialize! SDL_image Error: "
-				  << IMG_GetError() << std::endl;
-	}
-}
-
-void SDLContext::present_screen() { SDL_RenderPresent(this->game_renderer); }
-
-void SDLContext::draw(const Sprite & sprite, const Transform & transform) {
-
-	static SDL_RendererFlip render_flip
-		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * sprite.flip.flip_x)
-							  | (SDL_FLIP_VERTICAL * sprite.flip.flip_y));
-
-	int w, h;
-	SDL_QueryTexture(sprite.sprite_image->texture, NULL, NULL, &w, &h);
-	// needs maybe camera for position
-	SDL_Rect dstrect = {
-		.x = static_cast<int>(transform.position.x),
-		.y = static_cast<int>(transform.position.y),
-		.w = static_cast<int>(w * transform.scale),
-		.h = static_cast<int>(h * transform.scale),
-	};
-
-	double degrees = transform.rotation * 180 / M_PI;
-	SDL_RenderCopyEx(this->game_renderer, sprite.sprite_image->texture, NULL,
-					 &dstrect, degrees, NULL, render_flip);
-}
-
-/*
-SDL_Texture * SDLContext::setTextureFromPath(const char * path, SDL_Rect & clip,
-											 const int row, const int col) {
-	dbg_trace();
-
-	SDL_Surface * tmp = IMG_Load(path);
-	if (!tmp) {
-		std::cerr << "Error surface " << IMG_GetError << std::endl;
-	}
-
-	clip.
-		w = tmp->w / col;
-	clip.h = tmp->h / row;
-
-	SDL_Texture * CreatedTexture
-		= SDL_CreateTextureFromSurface(this->game_renderer, tmp);
-
-	if (!CreatedTexture) {
-		std::cerr << "Error could not create texture " << IMG_GetError
-				  << std::endl;
-	}
-	SDL_FreeSurface(tmp);
-
-	return CreatedTexture;
-}
-*/
-
-SDL_Texture * SDLContext::texture_from_path(const char * path) {
-	dbg_trace();
-
-	SDL_Surface * tmp = IMG_Load(path);
-	if (!tmp) {
-		std::cerr << "Error surface " << IMG_GetError << std::endl;
-	}
-	SDL_Texture * created_texture
-		= SDL_CreateTextureFromSurface(this->game_renderer, tmp);
-
-	if (!created_texture) {
-		std::cerr << "Error could not create texture " << IMG_GetError
-				  << std::endl;
-	}
-	SDL_FreeSurface(tmp);
-
-	return created_texture;
-}
diff --git a/src/crepe/SDLContext.h b/src/crepe/SDLContext.h
deleted file mode 100644
index 94fc549..0000000
--- a/src/crepe/SDLContext.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <SDL2/SDL_render.h>
-#include <SDL2/SDL_video.h>
-
-#include "api/Sprite.h"
-#include "api/Transform.h"
-
-#include "system/RenderSystem.h"
-
-namespace crepe {
-
-class Texture;
-class SDLContext {
-
-public:
-	// singleton
-	static SDLContext & get_instance();
-	SDLContext(const SDLContext &) = delete;
-	SDLContext(SDLContext &&) = delete;
-	SDLContext & operator=(const SDLContext &) = delete;
-	SDLContext & operator=(SDLContext &&) = delete;
-
-	//TODO decide events wouter?
-
-private:
-	void handle_events(bool & running);
-
-private:
-	SDLContext();
-	virtual ~SDLContext();
-
-private:
-	friend class Texture;
-	SDL_Texture * texture_from_path(const char *);
-	//SDL_Texture* setTextureFromPath(const char*, SDL_Rect& clip, const int row, const int col);
-
-private:
-	friend class RenderSystem;
-	void draw(const Sprite &, const Transform &);
-	void clear_screen();
-	void present_screen();
-
-private:
-	SDL_Window * game_window = nullptr;
-	SDL_Renderer * game_renderer = nullptr;
-};
-
-} // namespace crepe
diff --git a/src/crepe/Sound.cpp b/src/crepe/Sound.cpp
deleted file mode 100644
index 64fa281..0000000
--- a/src/crepe/Sound.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "util/log.h"
-
-#include "Sound.h"
-#include "SoundContext.h"
-
-using namespace crepe;
-
-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<Asset>(src));
-}
-
-void Sound::load(std::unique_ptr<Asset> res) {
-	this->sample.load(res->canonical());
-}
-
-void Sound::play() {
-	SoundContext & ctx = SoundContext::get_instance();
-	if (ctx.engine.getPause(this->handle)) {
-		// resume if paused
-		ctx.engine.setPause(this->handle, false);
-	} else {
-		// or start new sound
-		this->handle = ctx.engine.play(this->sample, this->volume);
-		ctx.engine.setLooping(this->handle, this->looping);
-	}
-}
-
-void Sound::pause() {
-	SoundContext & ctx = SoundContext::get_instance();
-	if (ctx.engine.getPause(this->handle)) return;
-	ctx.engine.setPause(this->handle, true);
-}
-
-void Sound::rewind() {
-	SoundContext & ctx = SoundContext::get_instance();
-	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
-	ctx.engine.seek(this->handle, 0);
-}
-
-void Sound::set_volume(float volume) {
-	this->volume = volume;
-
-	SoundContext & ctx = SoundContext::get_instance();
-	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
-	ctx.engine.setVolume(this->handle, this->volume);
-}
-
-void Sound::set_looping(bool looping) {
-	this->looping = looping;
-
-	SoundContext & ctx = SoundContext::get_instance();
-	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
deleted file mode 100644
index 917b57e..0000000
--- a/src/crepe/Sound.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <soloud/soloud.h>
-#include <soloud/soloud_wav.h>
-
-#include "Asset.h"
-
-namespace crepe {
-
-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 Get playback volume / gain
-	 *
-	 * \return Volume
-	 */
-	float get_volume() const { return this->volume; }
-	/**
-	 * \brief Set looping behavior for this sample
-	 *
-	 * \param looping  Looping behavior (false = one-shot, true = loop)
-	 */
-	void set_looping(bool looping);
-	/**
-	 * \brief Get looping behavior
-	 *
-	 * \return true if looping, false if one-shot
-	 */
-	bool get_looping() const { return this->looping; }
-
-public:
-	Sound(const char * src);
-	Sound(std::unique_ptr<Asset> res);
-
-private:
-	void load(std::unique_ptr<Asset> res);
-
-private:
-	SoLoud::Wav sample;
-	SoLoud::handle handle;
-
-	float volume = 1.0f;
-	bool looping = false;
-};
-
-} // namespace crepe
diff --git a/src/crepe/SoundContext.cpp b/src/crepe/SoundContext.cpp
deleted file mode 100644
index 72047d2..0000000
--- a/src/crepe/SoundContext.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "util/log.h"
-
-#include "SoundContext.h"
-
-using namespace crepe;
-
-SoundContext & SoundContext::get_instance() {
-	static SoundContext instance;
-	return instance;
-}
-
-SoundContext::SoundContext() {
-	dbg_trace();
-	engine.init();
-}
-
-SoundContext::~SoundContext() {
-	dbg_trace();
-	engine.deinit();
-}
diff --git a/src/crepe/SoundContext.h b/src/crepe/SoundContext.h
deleted file mode 100644
index d3123d2..0000000
--- a/src/crepe/SoundContext.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <soloud/soloud.h>
-
-#include "Sound.h"
-
-namespace crepe {
-
-class SoundContext {
-private:
-	SoundContext();
-	virtual ~SoundContext();
-
-	// singleton
-	static SoundContext & get_instance();
-	SoundContext(const SoundContext &) = delete;
-	SoundContext(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 2bacc75..63fd0d7 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -1,6 +1,6 @@
 #include <memory>
 
-#include "../Sound.h"
+#include "../facade/Sound.h"
 
 #include "AudioSource.h"
 
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
index b5001a6..8fc5c13 100644
--- a/src/crepe/api/Texture.cpp
+++ b/src/crepe/api/Texture.cpp
@@ -1,6 +1,6 @@
 #include <SDL2/SDL_render.h>
 
-#include "../SDLContext.h"
+#include "../facade/SDLContext.h"
 #include "../util/log.h"
 
 #include "Asset.h"
diff --git a/src/crepe/facade/CMakeLists.txt b/src/crepe/facade/CMakeLists.txt
new file mode 100644
index 0000000..dbddcc6
--- /dev/null
+++ b/src/crepe/facade/CMakeLists.txt
@@ -0,0 +1,14 @@
+target_sources(crepe PUBLIC
+	Sound.cpp
+	SoundContext.cpp
+	SDLApp.cpp
+	SDLContext.cpp
+)
+
+target_sources(crepe PUBLIC FILE_SET HEADERS FILES
+	Sound.h
+	SoundContext.h
+	SDLContext.h
+	SDLContext.h
+)
+
diff --git a/src/crepe/facade/SDLApp.cpp b/src/crepe/facade/SDLApp.cpp
new file mode 100644
index 0000000..c6ddeaa
--- /dev/null
+++ b/src/crepe/facade/SDLApp.cpp
@@ -0,0 +1,71 @@
+#include <iostream>
+
+#include "SDLApp.h"
+
+SDLApp::SDLApp(int window_width, int window_height)
+	: window_width(window_width), window_height(window_height), window(nullptr),
+	  renderer(nullptr) {}
+
+// FIXME: why is there clean_up and ~SDLApp?
+SDLApp::~SDLApp() { clean_up(); }
+
+bool SDLApp::initialize() {
+	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
+		// FIXME: throw exception
+		std::cerr << "SDL Initialization Error: " << SDL_GetError()
+				  << std::endl;
+		return false;
+	}
+
+	window = SDL_CreateWindow("Particle System", SDL_WINDOWPOS_CENTERED,
+							  SDL_WINDOWPOS_CENTERED, window_width,
+							  window_height, SDL_WINDOW_SHOWN);
+	if (!window) {
+		// FIXME: throw exception
+		std::cerr << "Window Creation Error: " << SDL_GetError() << std::endl;
+		return false;
+	}
+
+	renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
+	if (!renderer) {
+		// FIXME: throw exception
+		std::cerr << "Renderer Creation Error: " << SDL_GetError() << std::endl;
+		return false;
+	}
+
+	return true;
+}
+
+void SDLApp::handle_events(bool & running) {
+	SDL_Event event;
+	while (SDL_PollEvent(&event)) {
+		if (event.type == SDL_QUIT) {
+			running = false;
+		}
+	}
+}
+
+void SDLApp::clear_screen() {
+	SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
+	SDL_RenderClear(renderer);
+}
+
+void SDLApp::present_screen() { SDL_RenderPresent(renderer); }
+
+void SDLApp::draw_square(int x, int y, int size) {
+	SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
+	SDL_Rect rect = {x, y, size, size};
+	SDL_RenderFillRect(renderer, &rect);
+}
+
+SDL_Texture * square_texture = nullptr; // Load this with an image or create it
+
+void SDLApp::clean_up() {
+	if (renderer) {
+		SDL_DestroyRenderer(renderer);
+	}
+	if (window) {
+		SDL_DestroyWindow(window);
+	}
+	SDL_Quit();
+}
diff --git a/src/crepe/facade/SDLApp.h b/src/crepe/facade/SDLApp.h
new file mode 100644
index 0000000..6d8f3f4
--- /dev/null
+++ b/src/crepe/facade/SDLApp.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <SDL2/SDL.h>
+
+#include "../api/ParticleEmitter.h"
+
+class SDLApp {
+public:
+	SDLApp(int window_width, int window_height);
+	~SDLApp();
+
+	bool initialize();
+	void handle_events(bool & running);
+	void clear_screen();
+	void present_screen();
+	void draw_square(int x, int y, int size);
+	void clean_up();
+	void draw_particles(const std::vector<crepe::ParticleEmitter> & emitters);
+	void draw_multiple_squares(const std::vector<SDL_Rect> & squares);
+
+private:
+	int window_width;
+	int window_height;
+	SDL_Window * window;
+	SDL_Renderer * renderer;
+};
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
new file mode 100644
index 0000000..8da93e9
--- /dev/null
+++ b/src/crepe/facade/SDLContext.cpp
@@ -0,0 +1,157 @@
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_image.h>
+#include <SDL2/SDL_render.h>
+#include <SDL2/SDL_surface.h>
+#include <SDL2/SDL_video.h>
+#include <cmath>
+#include <cstddef>
+#include <iostream>
+
+#include "../api/Sprite.h"
+#include "../api/Texture.h"
+#include "../api/Transform.h"
+#include "../util/log.h"
+
+#include "SDLContext.h"
+
+using namespace crepe;
+
+SDLContext & SDLContext::get_instance() {
+	static SDLContext instance;
+	return instance;
+}
+
+void SDLContext::handle_events(bool & running) {
+	SDL_Event event;
+	while (SDL_PollEvent(&event)) {
+		if (event.type == SDL_QUIT) {
+			running = false;
+		}
+	}
+}
+
+SDLContext::~SDLContext() {
+	dbg_trace();
+
+	if (this->game_renderer != nullptr)
+		SDL_DestroyRenderer(this->game_renderer);
+
+	if (this->game_window != nullptr) {
+		SDL_DestroyWindow(this->game_window);
+	}
+
+	// TODO: how are we going to ensure that these are called from the same
+	// thread that SDL_Init() was called on? This has caused problems for me
+	// before.
+	IMG_Quit();
+	SDL_Quit();
+}
+
+void SDLContext::clear_screen() { SDL_RenderClear(this->game_renderer); }
+
+SDLContext::SDLContext() {
+	dbg_trace();
+	// FIXME: read window defaults from config manager
+
+	if (SDL_Init(SDL_INIT_VIDEO) < 0) {
+		// FIXME: throw exception
+		std::cerr << "SDL could not initialize! SDL_Error: " << SDL_GetError()
+				  << std::endl;
+		return;
+	}
+
+	this->game_window = SDL_CreateWindow(
+		"Crepe Game Engine", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+		1920, 1080, SDL_WINDOW_SHOWN);
+	if (!this->game_window) {
+		// FIXME: throw exception
+		std::cerr << "Window could not be created! SDL_Error: "
+				  << SDL_GetError() << std::endl;
+	}
+
+	this->game_renderer
+		= SDL_CreateRenderer(this->game_window, -1, SDL_RENDERER_ACCELERATED);
+	if (!this->game_renderer) {
+		// FIXME: throw exception
+		std::cerr << "Renderer could not be created! SDL_Error: "
+				  << SDL_GetError() << std::endl;
+		SDL_DestroyWindow(this->game_window);
+		return;
+	}
+
+	int img_flags = IMG_INIT_PNG;
+	if (!(IMG_Init(img_flags) & img_flags)) {
+		// FIXME: throw exception
+		std::cout << "SDL_image could not initialize! SDL_image Error: "
+				  << IMG_GetError() << std::endl;
+	}
+}
+
+void SDLContext::present_screen() { SDL_RenderPresent(this->game_renderer); }
+
+void SDLContext::draw(const Sprite & sprite, const Transform & transform) {
+
+	static SDL_RendererFlip render_flip
+		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * sprite.flip.flip_x)
+							  | (SDL_FLIP_VERTICAL * sprite.flip.flip_y));
+
+	int w, h;
+	SDL_QueryTexture(sprite.sprite_image->texture, NULL, NULL, &w, &h);
+	// needs maybe camera for position
+	SDL_Rect dstrect = {
+		.x = static_cast<int>(transform.position.x),
+		.y = static_cast<int>(transform.position.y),
+		.w = static_cast<int>(w * transform.scale),
+		.h = static_cast<int>(h * transform.scale),
+	};
+
+	double degrees = transform.rotation * 180 / M_PI;
+	SDL_RenderCopyEx(this->game_renderer, sprite.sprite_image->texture, NULL,
+					 &dstrect, degrees, NULL, render_flip);
+}
+
+/*
+SDL_Texture * SDLContext::setTextureFromPath(const char * path, SDL_Rect & clip,
+											 const int row, const int col) {
+	dbg_trace();
+
+	SDL_Surface * tmp = IMG_Load(path);
+	if (!tmp) {
+		std::cerr << "Error surface " << IMG_GetError << std::endl;
+	}
+
+	clip.
+		w = tmp->w / col;
+	clip.h = tmp->h / row;
+
+	SDL_Texture * CreatedTexture
+		= SDL_CreateTextureFromSurface(this->game_renderer, tmp);
+
+	if (!CreatedTexture) {
+		std::cerr << "Error could not create texture " << IMG_GetError
+				  << std::endl;
+	}
+	SDL_FreeSurface(tmp);
+
+	return CreatedTexture;
+}
+*/
+
+SDL_Texture * SDLContext::texture_from_path(const char * path) {
+	dbg_trace();
+
+	SDL_Surface * tmp = IMG_Load(path);
+	if (!tmp) {
+		std::cerr << "Error surface " << IMG_GetError << std::endl;
+	}
+	SDL_Texture * created_texture
+		= SDL_CreateTextureFromSurface(this->game_renderer, tmp);
+
+	if (!created_texture) {
+		std::cerr << "Error could not create texture " << IMG_GetError
+				  << std::endl;
+	}
+	SDL_FreeSurface(tmp);
+
+	return created_texture;
+}
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
new file mode 100644
index 0000000..f1ba8a6
--- /dev/null
+++ b/src/crepe/facade/SDLContext.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <SDL2/SDL_render.h>
+#include <SDL2/SDL_video.h>
+
+#include "../api/Sprite.h"
+#include "../api/Transform.h"
+#include "../system/RenderSystem.h"
+
+namespace crepe {
+
+class Texture;
+class SDLContext {
+
+public:
+	// singleton
+	static SDLContext & get_instance();
+	SDLContext(const SDLContext &) = delete;
+	SDLContext(SDLContext &&) = delete;
+	SDLContext & operator=(const SDLContext &) = delete;
+	SDLContext & operator=(SDLContext &&) = delete;
+
+	//TODO decide events wouter?
+
+private:
+	void handle_events(bool & running);
+
+private:
+	SDLContext();
+	virtual ~SDLContext();
+
+private:
+	friend class Texture;
+	SDL_Texture * texture_from_path(const char *);
+	//SDL_Texture* setTextureFromPath(const char*, SDL_Rect& clip, const int row, const int col);
+
+private:
+	friend class RenderSystem;
+	void draw(const Sprite &, const Transform &);
+	void clear_screen();
+	void present_screen();
+
+private:
+	SDL_Window * game_window = nullptr;
+	SDL_Renderer * game_renderer = nullptr;
+};
+
+} // namespace crepe
diff --git a/src/crepe/facade/Sound.cpp b/src/crepe/facade/Sound.cpp
new file mode 100644
index 0000000..648ec81
--- /dev/null
+++ b/src/crepe/facade/Sound.cpp
@@ -0,0 +1,60 @@
+#include "../util/log.h"
+
+#include "Sound.h"
+#include "SoundContext.h"
+
+using namespace crepe;
+
+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<Asset>(src));
+}
+
+void Sound::load(std::unique_ptr<Asset> res) {
+	this->sample.load(res->canonical());
+}
+
+void Sound::play() {
+	SoundContext & ctx = SoundContext::get_instance();
+	if (ctx.engine.getPause(this->handle)) {
+		// resume if paused
+		ctx.engine.setPause(this->handle, false);
+	} else {
+		// or start new sound
+		this->handle = ctx.engine.play(this->sample, this->volume);
+		ctx.engine.setLooping(this->handle, this->looping);
+	}
+}
+
+void Sound::pause() {
+	SoundContext & ctx = SoundContext::get_instance();
+	if (ctx.engine.getPause(this->handle)) return;
+	ctx.engine.setPause(this->handle, true);
+}
+
+void Sound::rewind() {
+	SoundContext & ctx = SoundContext::get_instance();
+	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
+	ctx.engine.seek(this->handle, 0);
+}
+
+void Sound::set_volume(float volume) {
+	this->volume = volume;
+
+	SoundContext & ctx = SoundContext::get_instance();
+	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
+	ctx.engine.setVolume(this->handle, this->volume);
+}
+
+void Sound::set_looping(bool looping) {
+	this->looping = looping;
+
+	SoundContext & ctx = SoundContext::get_instance();
+	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
+	ctx.engine.setLooping(this->handle, this->looping);
+}
diff --git a/src/crepe/facade/Sound.h b/src/crepe/facade/Sound.h
new file mode 100644
index 0000000..183bd7c
--- /dev/null
+++ b/src/crepe/facade/Sound.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include <memory>
+#include <soloud/soloud.h>
+#include <soloud/soloud_wav.h>
+
+#include "../Asset.h"
+
+namespace crepe {
+
+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 Get playback volume / gain
+	 *
+	 * \return Volume
+	 */
+	float get_volume() const { return this->volume; }
+	/**
+	 * \brief Set looping behavior for this sample
+	 *
+	 * \param looping  Looping behavior (false = one-shot, true = loop)
+	 */
+	void set_looping(bool looping);
+	/**
+	 * \brief Get looping behavior
+	 *
+	 * \return true if looping, false if one-shot
+	 */
+	bool get_looping() const { return this->looping; }
+
+public:
+	Sound(const char * src);
+	Sound(std::unique_ptr<Asset> res);
+
+private:
+	void load(std::unique_ptr<Asset> res);
+
+private:
+	SoLoud::Wav sample;
+	SoLoud::handle handle;
+
+	float volume = 1.0f;
+	bool looping = false;
+};
+
+} // namespace crepe
diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
new file mode 100644
index 0000000..5e5a3a9
--- /dev/null
+++ b/src/crepe/facade/SoundContext.cpp
@@ -0,0 +1,20 @@
+#include "../util/log.h"
+
+#include "SoundContext.h"
+
+using namespace crepe;
+
+SoundContext & SoundContext::get_instance() {
+	static SoundContext instance;
+	return instance;
+}
+
+SoundContext::SoundContext() {
+	dbg_trace();
+	engine.init();
+}
+
+SoundContext::~SoundContext() {
+	dbg_trace();
+	engine.deinit();
+}
diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h
new file mode 100644
index 0000000..d3123d2
--- /dev/null
+++ b/src/crepe/facade/SoundContext.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <soloud/soloud.h>
+
+#include "Sound.h"
+
+namespace crepe {
+
+class SoundContext {
+private:
+	SoundContext();
+	virtual ~SoundContext();
+
+	// singleton
+	static SoundContext & get_instance();
+	SoundContext(const SoundContext &) = delete;
+	SoundContext(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/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index ee3cdf2..96c94e9 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -2,7 +2,7 @@
 #include <vector>
 
 #include "../ComponentManager.h"
-#include "../SDLContext.h"
+#include "../facade/SDLContext.h"
 #include "../api/Sprite.h"
 #include "../api/Transform.h"
 #include "../util/log.h"
diff --git a/src/example/asset_manager.cpp b/src/example/asset_manager.cpp
index f0d4575..ba18b62 100644
--- a/src/example/asset_manager.cpp
+++ b/src/example/asset_manager.cpp
@@ -1,4 +1,4 @@
-#include <crepe/Sound.h>
+#include <crepe/facade/Sound.h>
 #include <crepe/api/AssetManager.h>
 #include <crepe/api/Texture.h>
 
diff --git a/src/example/audio_internal.cpp b/src/example/audio_internal.cpp
index 7586441..0b36daa 100644
--- a/src/example/audio_internal.cpp
+++ b/src/example/audio_internal.cpp
@@ -3,7 +3,7 @@
  * Standalone example for usage of the internal \c Sound class.
  */
 
-#include <crepe/Sound.h>
+#include <crepe/facade/Sound.h>
 #include <crepe/api/Config.h>
 #include <crepe/util/log.h>
 
diff --git a/src/example/particle.cpp b/src/example/particle.cpp
index 38cff25..83b1e8a 100644
--- a/src/example/particle.cpp
+++ b/src/example/particle.cpp
@@ -5,7 +5,7 @@
 #include <crepe/Component.h>
 #include <crepe/ComponentManager.h>
 #include <crepe/Particle.h>
-#include <crepe/SDLApp.h>
+#include <crepe/facade/SDLApp.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/ParticleEmitter.h>
 #include <crepe/system/ParticleSystem.h>
-- 
cgit v1.2.3


From 5b248d068a94902be9ca4d00fe07d551f64c49b9 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 5 Nov 2024 16:14:32 +0100
Subject: `make format`

---
 src/crepe/system/RenderSystem.cpp | 2 +-
 src/example/asset_manager.cpp     | 2 +-
 src/example/audio_internal.cpp    | 2 +-
 src/example/particle.cpp          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/example')

diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 96c94e9..5a07cc2 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -2,9 +2,9 @@
 #include <vector>
 
 #include "../ComponentManager.h"
-#include "../facade/SDLContext.h"
 #include "../api/Sprite.h"
 #include "../api/Transform.h"
+#include "../facade/SDLContext.h"
 #include "../util/log.h"
 
 #include "RenderSystem.h"
diff --git a/src/example/asset_manager.cpp b/src/example/asset_manager.cpp
index ba18b62..cf64f89 100644
--- a/src/example/asset_manager.cpp
+++ b/src/example/asset_manager.cpp
@@ -1,6 +1,6 @@
-#include <crepe/facade/Sound.h>
 #include <crepe/api/AssetManager.h>
 #include <crepe/api/Texture.h>
+#include <crepe/facade/Sound.h>
 
 using namespace crepe;
 
diff --git a/src/example/audio_internal.cpp b/src/example/audio_internal.cpp
index 0b36daa..1ea839d 100644
--- a/src/example/audio_internal.cpp
+++ b/src/example/audio_internal.cpp
@@ -3,8 +3,8 @@
  * Standalone example for usage of the internal \c Sound class.
  */
 
-#include <crepe/facade/Sound.h>
 #include <crepe/api/Config.h>
+#include <crepe/facade/Sound.h>
 #include <crepe/util/log.h>
 
 #include <thread>
diff --git a/src/example/particle.cpp b/src/example/particle.cpp
index 83b1e8a..47ad2e2 100644
--- a/src/example/particle.cpp
+++ b/src/example/particle.cpp
@@ -5,9 +5,9 @@
 #include <crepe/Component.h>
 #include <crepe/ComponentManager.h>
 #include <crepe/Particle.h>
-#include <crepe/facade/SDLApp.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/ParticleEmitter.h>
+#include <crepe/facade/SDLApp.h>
 #include <crepe/system/ParticleSystem.h>
 
 using namespace crepe;
-- 
cgit v1.2.3