From 29f2d4537cf4d4d4c74c16447a45a5d7034161f4 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 10 Dec 2024 09:47:46 +0100
Subject: sdlfontcontext

---
 src/crepe/facade/CMakeLists.txt     |  2 ++
 src/crepe/facade/SDLFontContext.cpp | 51 +++++++++++++++++++++++++++++++++++++
 src/crepe/facade/SDLFontContext.h   | 15 +++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 src/crepe/facade/SDLFontContext.cpp
 create mode 100644 src/crepe/facade/SDLFontContext.h

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/CMakeLists.txt b/src/crepe/facade/CMakeLists.txt
index 4cc53bc..9b73323 100644
--- a/src/crepe/facade/CMakeLists.txt
+++ b/src/crepe/facade/CMakeLists.txt
@@ -3,6 +3,7 @@ target_sources(crepe PUBLIC
 	SoundContext.cpp
 	SDLContext.cpp
 	DB.cpp
+	SDLFontContext.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -10,5 +11,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	SoundContext.h
 	SDLContext.h
 	DB.h
+	SDLFontContext.h
 )
 
diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
new file mode 100644
index 0000000..6ce5efd
--- /dev/null
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -0,0 +1,51 @@
+#include "SDLFontContext.h"
+#include <stdexcept>
+
+using namespace crepe;
+using namespace std;
+
+SDLFontContext::SDLFontContext(){
+	if (!FcInit()) {
+            throw std::runtime_error("Failed to initialize Fontconfig.");
+    }
+}
+
+SDLFontContext::~SDLFontContext(){
+	FcFini();
+}
+Asset SDLFontContext::get_font_asset(const std::string & font_family) {
+    // Create a pattern to search for the font family
+    FcPattern* pattern = FcNameParse(reinterpret_cast<const FcChar8*>(font_family.c_str()));
+    if (!pattern) {
+        throw std::runtime_error("Failed to create font pattern.");
+    }
+
+    // Default configuration
+    FcConfig* config = FcConfigGetCurrent();
+    if (!config) {
+        FcPatternDestroy(pattern);
+        throw std::runtime_error("Failed to get current Fontconfig configuration.");
+    }
+
+    // Match the font pattern
+    FcResult result;
+    FcPattern* matched_pattern = FcFontMatch(config, pattern, &result);
+    FcPatternDestroy(pattern);
+
+    if (!matched_pattern) {
+        throw std::runtime_error("No matching font found.");
+    }
+
+    // Extract the file path
+    FcChar8* file_path = nullptr;
+    if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch || !file_path) {
+        FcPatternDestroy(matched_pattern);
+        throw std::runtime_error("Failed to get font file path.");
+    }
+
+    // Convert the file path to a std::string
+    std::string font_file_path(reinterpret_cast<const char*>(file_path));
+    FcPatternDestroy(matched_pattern);
+
+    return Asset(font_file_path);
+}
diff --git a/src/crepe/facade/SDLFontContext.h b/src/crepe/facade/SDLFontContext.h
new file mode 100644
index 0000000..3b2e162
--- /dev/null
+++ b/src/crepe/facade/SDLFontContext.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <SDL2/SDL_ttf.h>
+#include <fontconfig/fontconfig.h>
+#include "../api/Asset.h"
+namespace crepe {
+	class SDLFontContext{
+	public:
+		SDLFontContext();
+		~SDLFontContext();
+		Asset get_font_asset(const std::string & font_family);
+	private:
+	};
+
+}
-- 
cgit v1.2.3


From b2c72ee8ce282bb13b0fbeb2ddb01fdfd6ad1280 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 10 Dec 2024 12:27:59 +0100
Subject: font progress

---
 src/crepe/api/Config.h              | 11 +++++++++
 src/crepe/facade/SDLFontContext.cpp | 19 ++++++++-------
 src/crepe/facade/SDLFontContext.h   |  5 +++-
 src/crepe/facade/font.cpp           | 21 +++++++++++++++++
 src/crepe/facade/font.h             | 47 +++++++++++++++++++++++++++++++++++++
 src/example/CMakeLists.txt          |  1 +
 src/example/loadfont.cpp            | 13 ++++++++++
 7 files changed, 108 insertions(+), 9 deletions(-)
 create mode 100644 src/crepe/facade/font.cpp
 create mode 100644 src/crepe/facade/font.h
 create mode 100644 src/example/loadfont.cpp

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index a9745c3..e4808fe 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -86,6 +86,17 @@ public:
 		 */
 		std::string root_pattern = ".crepe-root";
 	} asset;
+	//! Default font options
+	struct {
+		/**
+		 * \brief Default font size
+		 *
+		 * using the SDL_ttf library the font size needs to be set when loading the font. 
+		 * This config option is the font size at which all fonts will be loaded initially.
+		 * 
+		 */
+		int font_size = 16;
+	} font;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
index 6ce5efd..a4be143 100644
--- a/src/crepe/facade/SDLFontContext.cpp
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -1,19 +1,22 @@
-#include "SDLFontContext.h"
 #include <stdexcept>
 
+#include "SDLFontContext.h"
+
+
 using namespace crepe;
 using namespace std;
 
 SDLFontContext::SDLFontContext(){
-	if (!FcInit()) {
-            throw std::runtime_error("Failed to initialize Fontconfig.");
-    }
+	
 }
 
 SDLFontContext::~SDLFontContext(){
-	FcFini();
+	
 }
-Asset SDLFontContext::get_font_asset(const std::string & font_family) {
+unique_ptr<Asset> SDLFontContext::get_font_asset(const std::string & font_family) {
+	if (!FcInit()) {
+            throw std::runtime_error("Failed to initialize Fontconfig.");
+    }
     // Create a pattern to search for the font family
     FcPattern* pattern = FcNameParse(reinterpret_cast<const FcChar8*>(font_family.c_str()));
     if (!pattern) {
@@ -46,6 +49,6 @@ Asset SDLFontContext::get_font_asset(const std::string & font_family) {
     // Convert the file path to a std::string
     std::string font_file_path(reinterpret_cast<const char*>(file_path));
     FcPatternDestroy(matched_pattern);
-
-    return Asset(font_file_path);
+	FcFini();
+    return std::move(make_unique<Asset>(font_file_path));
 }
diff --git a/src/crepe/facade/SDLFontContext.h b/src/crepe/facade/SDLFontContext.h
index 3b2e162..cd91383 100644
--- a/src/crepe/facade/SDLFontContext.h
+++ b/src/crepe/facade/SDLFontContext.h
@@ -1,14 +1,17 @@
 #pragma once
 
+#include <memory>
 #include <SDL2/SDL_ttf.h>
 #include <fontconfig/fontconfig.h>
+
 #include "../api/Asset.h"
+
 namespace crepe {
 	class SDLFontContext{
 	public:
 		SDLFontContext();
 		~SDLFontContext();
-		Asset get_font_asset(const std::string & font_family);
+		std::unique_ptr<Asset> get_font_asset(const std::string & font_family);
 	private:
 	};
 
diff --git a/src/crepe/facade/font.cpp b/src/crepe/facade/font.cpp
new file mode 100644
index 0000000..259a6cd
--- /dev/null
+++ b/src/crepe/facade/font.cpp
@@ -0,0 +1,21 @@
+#include "font.h"
+#include "../api/Config.h"
+using namespace std;
+using namespace crepe;
+
+void Font::load(unique_ptr<Asset> res){
+	const char* font_path = res->get_path();
+	int font_size = Config::get_instance().font.font_size;
+    this->font = std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)>(
+        TTF_OpenFont(font_path, font_size), &TTF_CloseFont); 
+
+    if (!font) {
+        throw std::runtime_error("Failed to load font: " + std::string(TTF_GetError()));
+    }
+}
+Font::Font(const char* src){
+	this->load(make_unique<Asset>(src));
+}
+Font::Font(std::unique_ptr<Asset> res){
+	this->load(std::move(res));
+}
diff --git a/src/crepe/facade/font.h b/src/crepe/facade/font.h
new file mode 100644
index 0000000..f5c7785
--- /dev/null
+++ b/src/crepe/facade/font.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include <memory>
+#include <SDL2/SDL_ttf.h>
+
+#include "../api/Asset.h"
+
+namespace crepe {
+
+/**
+ * \brief Font resource facade
+ *
+ * This class is a wrapper around an SDL_ttf font instance, encapsulating font loading and usage.
+ */
+class Font {
+public:
+    /**
+     * \param src The file path to the font file.
+     */
+    Font(const char* src);
+
+    /**
+     * \param res A unique pointer to an Asset holding the font resource.
+     */
+    Font(std::unique_ptr<Asset> res);
+
+    /**
+     * \brief Destructor to clean up font resources.
+     */
+    ~Font() = default;
+
+	void draw(const vec2& pos, const vec2&)
+private:
+    /**
+     * \brief Load the font from the given resource.
+     * 
+     * This method is used by both constructors to load the font resource.
+     * 
+     * \param res A unique pointer to an Asset holding the font resource.
+     */
+    void load(std::unique_ptr<Asset> res);
+
+private:
+    std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)> font;  ///< The SDL_ttf font object with custom deleter.
+};
+
+} // namespace crepe
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 8ef71bb..7fc81d7 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -21,3 +21,4 @@ add_example(savemgr)
 add_example(rendering_particle)
 add_example(game)
 add_example(button)
+add_example(loadfont)
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
new file mode 100644
index 0000000..8931ce3
--- /dev/null
+++ b/src/example/loadfont.cpp
@@ -0,0 +1,13 @@
+#include <iostream>
+#include <memory>
+
+#include <crepe/facade/SDLFontContext.h>
+
+using namespace crepe;
+
+int main(){
+	SDLFontContext font_facade;
+	std::unique_ptr<Asset> asset = font_facade.get_font_asset("OpenSymbol");
+	std::cout << "path: " << asset->get_path() << std::endl;
+	return 0;
+}
-- 
cgit v1.2.3


From 007fe1ecb5e9f76539cdffd6a96afe22c8b2d214 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 11 Dec 2024 18:21:03 +0100
Subject: save

---
 src/crepe/facade/Font.cpp | 24 ++++++++++++++++++++++++
 src/crepe/facade/Font.h   | 33 +++++++++++++++++++++++++++++++++
 src/crepe/facade/font.cpp | 21 ---------------------
 src/crepe/facade/font.h   | 31 -------------------------------
 4 files changed, 57 insertions(+), 52 deletions(-)
 create mode 100644 src/crepe/facade/Font.cpp
 create mode 100644 src/crepe/facade/Font.h
 delete mode 100644 src/crepe/facade/font.cpp
 delete mode 100644 src/crepe/facade/font.h

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
new file mode 100644
index 0000000..2ad176a
--- /dev/null
+++ b/src/crepe/facade/Font.cpp
@@ -0,0 +1,24 @@
+#include "font.h"
+#include "../api/Config.h"
+using namespace std;
+using namespace crepe;
+
+void Font::load(unique_ptr<Asset> res){
+	const char* font_path = res->get_path();
+	int font_size = Config::get_instance().font.font_size;
+    this->font = std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)>(
+        TTF_OpenFont(font_path, font_size), &TTF_CloseFont); 
+
+    if (!font) {
+        throw std::runtime_error("Failed to load font: " + std::string(TTF_GetError()));
+    }
+}
+Font::Font(const char* src){
+	this->load(make_unique<Asset>(src));
+}
+Font::Font(std::unique_ptr<Asset> res){
+	this->load(std::move(res));
+}
+const TTF_Font& Font::get_font() const{
+	return this->font;
+}
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
new file mode 100644
index 0000000..e34ac63
--- /dev/null
+++ b/src/crepe/facade/Font.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <memory>
+#include <SDL2/SDL_ttf.h>
+
+#include "../api/Asset.h"
+#include "../api/Config.h"
+
+namespace crepe {
+
+/**
+ * \brief Font resource facade
+ *
+ * This class is a wrapper around an SDL_ttf font instance, encapsulating font loading and usage.
+ */
+class Font : public Resource{
+public:
+    /**.
+	 * \param src Asset with texture data to load.
+	 * \param mediator use the SDLContext reference to load the image
+	 */
+    Font(const Asset & src, Mediator & mediator);
+
+
+    ~Font() = default
+	const TTF_Font& get_font() const;
+private:
+	//! The SDL_ttf font object with custom deleter.
+    std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)> font;
+	int default_font_size = Config::get_instance().font.font_size;
+};
+
+} // namespace crepe
diff --git a/src/crepe/facade/font.cpp b/src/crepe/facade/font.cpp
deleted file mode 100644
index 259a6cd..0000000
--- a/src/crepe/facade/font.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "font.h"
-#include "../api/Config.h"
-using namespace std;
-using namespace crepe;
-
-void Font::load(unique_ptr<Asset> res){
-	const char* font_path = res->get_path();
-	int font_size = Config::get_instance().font.font_size;
-    this->font = std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)>(
-        TTF_OpenFont(font_path, font_size), &TTF_CloseFont); 
-
-    if (!font) {
-        throw std::runtime_error("Failed to load font: " + std::string(TTF_GetError()));
-    }
-}
-Font::Font(const char* src){
-	this->load(make_unique<Asset>(src));
-}
-Font::Font(std::unique_ptr<Asset> res){
-	this->load(std::move(res));
-}
diff --git a/src/crepe/facade/font.h b/src/crepe/facade/font.h
deleted file mode 100644
index a8d8040..0000000
--- a/src/crepe/facade/font.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <SDL2/SDL_ttf.h>
-
-#include "../api/Asset.h"
-
-namespace crepe {
-
-/**
- * \brief Font resource facade
- *
- * This class is a wrapper around an SDL_ttf font instance, encapsulating font loading and usage.
- */
-class Font : public Resource{
-public:
-    /**
-     * \param res A unique pointer to an Asset holding the font resource.
-     */
-    Font(const Asset & src, Mediator & mediator);
-
-    /**
-     * \brief Destructor to clean up font resources.
-     */
-    ~Font() = default;
-private:
-	//! The SDL_ttf font object with custom deleter.
-    std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)> font; 
-};
-
-} // namespace crepe
-- 
cgit v1.2.3


From e75e355c3a59d53a1d64fd8fae3331b2234083e2 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 11 Dec 2024 22:17:43 +0100
Subject: text component pretty much finished

---
 src/crepe/api/CMakeLists.txt        |  2 ++
 src/crepe/api/Config.h              |  4 ++--
 src/crepe/api/Text.cpp              |  6 ++++++
 src/crepe/api/Text.h                |  8 ++++----
 src/crepe/facade/Font.cpp           | 10 +++++++---
 src/crepe/facade/Font.h             | 12 ++++++------
 src/crepe/facade/SDLFontContext.cpp | 11 +++++------
 src/crepe/facade/SDLFontContext.h   |  8 ++++++++
 src/example/loadfont.cpp            | 23 +++++++++++++++++------
 9 files changed, 57 insertions(+), 27 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index fb11c8d..90e4d1f 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -20,6 +20,7 @@ target_sources(crepe PUBLIC
 	Button.cpp
 	UIObject.cpp
 	AI.cpp
+	Text.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -49,4 +50,5 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Button.h
 	UIObject.h
 	AI.h
+	Text.h
 )
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index def4c49..159be99 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -81,11 +81,11 @@ struct Config final {
 		/**
 		 * \brief Default font size
 		 *
-		 * using the SDL_ttf library the font size needs to be set when loading the font. 
+		 * Using the SDL_ttf library the font size needs to be set when loading the font. 
 		 * This config option is the font size at which all fonts will be loaded initially.
 		 * 
 		 */
-		int font_size = 16;
+		unsigned int size = 16;
 	} font;
 
 	//! Audio system settings
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index e69de29..dd44dd9 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -0,0 +1,6 @@
+#include "Text.h"
+
+using namespace crepe;
+
+Text::Text(game_object_id_t id,const vec2 & dimensions, const vec2 & offset, const Asset & font) : UIObject(id,dimensions,offset),source(font){}
+
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index 9dd275b..d5f47fa 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -11,11 +11,11 @@
 namespace crepe{
 class Text : public UIObject{
 public:
-	Text(game_object_id_t id,const vec2 & dimensions, const vec2 & offset, const Asset & font, int font_size);
+	Text(game_object_id_t id,const vec2 & dimensions, const vec2 & offset, const Asset & font);
 
 	//! Label text.
 	std::string text;
-	//! Label text color
+	//! Label text color.
 	Color text_color = Color::BLACK;
 	/**
 	 *  \brief fontsize for text rendering
@@ -26,8 +26,8 @@ public:
 	 * The default font size that is loaded is set in the Config.
 	 * Instead this value is used to upscale the font texture which can cause blurring or distorted text when upscaling or downscaling too much.
 	 */
-	int font_size = 16;
-
+	unsigned int font_size = 16;
+	//! Font asset
 	const Asset source;
 private:
 };
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 2ad176a..b600b01 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -1,24 +1,28 @@
-#include "font.h"
 #include "../api/Config.h"
+
+#include "font.h"
+
 using namespace std;
 using namespace crepe;
 
 void Font::load(unique_ptr<Asset> res){
 	const char* font_path = res->get_path();
-	int font_size = Config::get_instance().font.font_size;
     this->font = std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)>(
-        TTF_OpenFont(font_path, font_size), &TTF_CloseFont); 
+        TTF_OpenFont(font_path, this->default_font_size), &TTF_CloseFont); 
 
     if (!font) {
         throw std::runtime_error("Failed to load font: " + std::string(TTF_GetError()));
     }
 }
+
 Font::Font(const char* src){
 	this->load(make_unique<Asset>(src));
 }
+
 Font::Font(std::unique_ptr<Asset> res){
 	this->load(std::move(res));
 }
+
 const TTF_Font& Font::get_font() const{
 	return this->font;
 }
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index e34ac63..8bf9fc9 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -9,17 +9,17 @@
 namespace crepe {
 
 /**
- * \brief Font resource facade
+ * \brief Resource for managing font creation and destruction
  *
  * This class is a wrapper around an SDL_ttf font instance, encapsulating font loading and usage.
  */
 class Font : public Resource{
 public:
-    /**.
-	 * \param src Asset with texture data to load.
-	 * \param mediator use the SDLContext reference to load the image
+    /**
+	 * \param src Asset with font data to load.
+	 * \param mediator use the SDLContext reference to load text
 	 */
-    Font(const Asset & src, Mediator & mediator);
+    Font( src, Mediator & mediator);
 
 
     ~Font() = default
@@ -27,7 +27,7 @@ public:
 private:
 	//! The SDL_ttf font object with custom deleter.
     std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)> font;
-	int default_font_size = Config::get_instance().font.font_size;
+	unsigned int default_font_size = Config::get_instance().font.size;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
index a4be143..d7a0bff 100644
--- a/src/crepe/facade/SDLFontContext.cpp
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -7,16 +7,16 @@ using namespace crepe;
 using namespace std;
 
 SDLFontContext::SDLFontContext(){
-	
+	if (!FcInit()) {
+            throw std::runtime_error("Failed to initialize Fontconfig.");
+    }
 }
 
 SDLFontContext::~SDLFontContext(){
-	
+		FcFini();
 }
 unique_ptr<Asset> SDLFontContext::get_font_asset(const std::string & font_family) {
-	if (!FcInit()) {
-            throw std::runtime_error("Failed to initialize Fontconfig.");
-    }
+	
     // Create a pattern to search for the font family
     FcPattern* pattern = FcNameParse(reinterpret_cast<const FcChar8*>(font_family.c_str()));
     if (!pattern) {
@@ -49,6 +49,5 @@ unique_ptr<Asset> SDLFontContext::get_font_asset(const std::string & font_family
     // Convert the file path to a std::string
     std::string font_file_path(reinterpret_cast<const char*>(file_path));
     FcPatternDestroy(matched_pattern);
-	FcFini();
     return std::move(make_unique<Asset>(font_file_path));
 }
diff --git a/src/crepe/facade/SDLFontContext.h b/src/crepe/facade/SDLFontContext.h
index cd91383..c890b2d 100644
--- a/src/crepe/facade/SDLFontContext.h
+++ b/src/crepe/facade/SDLFontContext.h
@@ -11,6 +11,14 @@ namespace crepe {
 	public:
 		SDLFontContext();
 		~SDLFontContext();
+		/**
+		 * 
+		 * \brief Facade function to convert a font_family into an asset.
+		 * 
+		 * This function uses the FontConfig library to convert a font family name (Arial, Inter, Helvetica) and converts it to the font source path.
+		 * 
+		 * \param font_family Name of the font family name.
+		 */
 		std::unique_ptr<Asset> get_font_asset(const std::string & font_family);
 	private:
 	};
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 8931ce3..0002026 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -1,13 +1,24 @@
 #include <iostream>
+#include <exception>
 #include <memory>
-
 #include <crepe/facade/SDLFontContext.h>
+#include <crepe/api/Text.h>
 
 using namespace crepe;
 
-int main(){
-	SDLFontContext font_facade;
-	std::unique_ptr<Asset> asset = font_facade.get_font_asset("OpenSymbol");
-	std::cout << "path: " << asset->get_path() << std::endl;
-	return 0;
+int main() {
+    SDLFontContext font_facade;
+
+    // Create a unique pointer to the font asset
+    std::unique_ptr<Asset> asset = font_facade.get_font_asset("OpenSymbol");
+    std::cout << "path: " << asset->get_path() << std::endl;
+	try{
+		  // Correct way to create a unique pointer for Text
+    std::unique_ptr<Text> label = std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), *asset);
+	}catch (const std::exception& e) {
+    std::cout << "Standard exception thrown: " << e.what() << std::endl;
+	}
+  
+
+    return 0;
 }
-- 
cgit v1.2.3


From 297d621987c224db26eadfb9bde9235741387496 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 12 Dec 2024 19:46:15 +0100
Subject: more cleanup + script utilities

---
 src/crepe/api/Animator.cpp             |  2 +-
 src/crepe/api/BehaviorScript.hpp       |  3 --
 src/crepe/api/Camera.cpp               |  2 +-
 src/crepe/api/Script.h                 | 78 +++++++++++++++++-----------------
 src/crepe/api/Script.hpp               | 23 ++++++++--
 src/crepe/api/Sprite.cpp               |  2 +-
 src/crepe/api/Transform.cpp            |  2 +-
 src/crepe/facade/DB.cpp                |  2 +-
 src/crepe/facade/SDLContext.cpp        |  2 +-
 src/crepe/facade/Sound.cpp             |  2 +-
 src/crepe/facade/SoundContext.cpp      |  2 +-
 src/crepe/facade/Texture.cpp           |  2 +-
 src/crepe/manager/ComponentManager.cpp |  2 +-
 src/crepe/manager/LoopTimerManager.cpp |  2 +-
 src/crepe/manager/ResourceManager.cpp  |  2 +-
 src/crepe/system/ScriptSystem.cpp      |  1 +
 src/crepe/util/Log.cpp                 |  1 +
 src/crepe/util/Log.h                   | 21 ---------
 src/crepe/util/dbg.h                   | 19 +++++++++
 src/example/replay.cpp                 |  6 ++-
 20 files changed, 98 insertions(+), 78 deletions(-)
 create mode 100644 src/crepe/util/dbg.h

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 4ce4bf0..203cef3 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -1,5 +1,5 @@
 
-#include "util/Log.h"
+#include "util/dbg.h"
 
 #include "Animator.h"
 #include "Component.h"
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index b9bb1e2..353d5e2 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -2,8 +2,6 @@
 
 #include <type_traits>
 
-#include "../util/Log.h"
-
 #include "BehaviorScript.h"
 #include "Script.h"
 
@@ -11,7 +9,6 @@ namespace crepe {
 
 template <class T, typename... Args>
 BehaviorScript & BehaviorScript::set_script(Args &&... args) {
-	dbg_trace();
 	static_assert(std::is_base_of<Script, T>::value);
 	this->script = std::unique_ptr<Script>(new T(std::forward<Args>(args)...));
 
diff --git a/src/crepe/api/Camera.cpp b/src/crepe/api/Camera.cpp
index 179dc18..19a3296 100644
--- a/src/crepe/api/Camera.cpp
+++ b/src/crepe/api/Camera.cpp
@@ -1,4 +1,4 @@
-#include "util/Log.h"
+#include "util/dbg.h"
 
 #include "Camera.h"
 #include "Component.h"
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index c797db0..18a029b 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -8,6 +8,7 @@
 #include "../system/CollisionSystem.h"
 #include "../types.h"
 #include "../util/OptionalRef.h"
+#include "../util/Log.h"
 
 namespace crepe {
 
@@ -58,83 +59,85 @@ protected:
 
 protected:
 	/**
-	 * \name Utility functions
+	 * \name Component query functions
+	 * \see ComponentManager
 	 * \{
 	 */
-
 	/**
 	 * \brief Get single component of type \c T on this game object
-	 *
 	 * \tparam T Type of component
-	 *
 	 * \returns Reference to component
-	 *
 	 * \throws std::runtime_error if this game object does not have a component with type \c T
 	 */
 	template <typename T>
 	T & get_component() const;
-	// TODO: make get_component calls for component types that can have more than 1 instance
-	// cause compile-time errors
-
 	/**
 	 * \brief Get all components of type \c T on this game object
-	 *
 	 * \tparam T Type of component
-	 *
 	 * \returns List of component references
 	 */
 	template <typename T>
 	RefVector<T> get_components() const;
-
-	/**
-	 * \copydoc ComponentManager::get_components_by_id
-	 * \see ComponentManager::get_components_by_id
-	 */
+	//! \copydoc ComponentManager::get_components_by_id
 	template <typename T>
 	RefVector<T> get_components_by_id(game_object_id_t id) const;
-	/**
-	 * \copydoc ComponentManager::get_components_by_name
-	 * \see ComponentManager::get_components_by_name
-	 */
+	//! \copydoc ComponentManager::get_components_by_name
 	template <typename T>
 	RefVector<T> get_components_by_name(const std::string & name) const;
-	/**
-	 * \copydoc ComponentManager::get_components_by_tag
-	 * \see ComponentManager::get_components_by_tag
-	 */
+	//! \copydoc ComponentManager::get_components_by_tag
 	template <typename T>
 	RefVector<T> get_components_by_tag(const std::string & tag) const;
+	//! \}
 
 	/**
-	 * \brief Log a message using Log::logf
-	 *
-	 * \tparam Args Log::logf parameters
-	 * \param args  Log::logf parameters
+	 * \name Logging functions
+	 * \see Log
+	 * \{
 	 */
-	template <typename... Args>
-	void logf(Args &&... args);
+	//! \copydoc Log::logf
+	template <class... Args>
+	void logf(const Log::Level & level, std::format_string<Args...> fmt, Args &&... args);
+	//! \copydoc Log::logf
+	template <class... Args>
+	void logf(std::format_string<Args...> fmt, Args &&... args);
+	// \}
 
 	/**
-	 * \brief Subscribe to an event with an explicit channel
-	 * \see EventManager::subscribe
+	 * \name Event manager functions
+	 * \see EventManager
+	 * \{
 	 */
+	//! \copydoc EventManager::subscribe
 	template <typename EventType>
 	void subscribe(const EventHandler<EventType> & callback, event_channel_t channel);
-	/**
-	 * \brief Subscribe to an event on EventManager::CHANNEL_ALL
-	 * \see EventManager::subscribe
-	 */
+	//! \copydoc EventManager::subscribe
 	template <typename EventType>
 	void subscribe(const EventHandler<EventType> & callback);
+	//! \copydoc EventManager::trigger_event
+	template <typename EventType>
+	void trigger_event(const EventType & event = {}, event_channel_t channel = EventManager::CHANNEL_ALL);
+	//! \copydoc EventManager::queue_event
+	template <typename EventType>
+	void queue_event(const EventType & event = {}, event_channel_t channel = EventManager::CHANNEL_ALL);
+	//! \}
 
 	/**
-	 * \brief Set the next scene using SceneManager
-	 * \see SceneManager::set_next_scene
+	 * \name Scene-related functions
+	 * \see SceneManager
+	 * \{
 	 */
+	//! \copydoc SceneManager::set_next_scene
 	void set_next_scene(const std::string & name);
+	//! \}
 
+	/**
+	 * \name Save data management functions
+	 * \see SaveManager
+	 * \{
+	 */
 	//! Retrieve SaveManager reference
 	SaveManager & get_save_manager() const;
+	//! \}
 
 	//! Replay management functions
 	struct replay { // NOLINT
@@ -152,7 +155,6 @@ protected:
 		replay(OptionalRef<Mediator> & mediator) : mediator(mediator) {}
 		friend class Script;
 	} replay{mediator};
-
 	//! \}
 
 private:
diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp
index 547fb8b..2553fd1 100644
--- a/src/crepe/api/Script.hpp
+++ b/src/crepe/api/Script.hpp
@@ -24,9 +24,14 @@ RefVector<T> Script::get_components() const {
 	return this->get_components_by_id<T>(this->game_object_id);
 }
 
-template <typename... Args>
-void Script::logf(Args &&... args) {
-	Log::logf(std::forward<Args>(args)...);
+template <class... Args>
+void Script::logf(const Log::Level & level, std::format_string<Args...> fmt, Args &&... args) {
+	Log::logf(level, fmt, std::forward<Args>(args)...);
+}
+
+template <class... Args>
+void Script::logf(std::format_string<Args...> fmt, Args &&... args) {
+	Log::logf(fmt, std::forward<Args>(args)...);
 }
 
 template <typename EventType>
@@ -55,6 +60,18 @@ void Script::subscribe(const EventHandler<EventType> & callback) {
 	this->subscribe_internal(callback, EventManager::CHANNEL_ALL);
 }
 
+template <typename EventType>
+void Script::trigger_event(const EventType & event, event_channel_t channel) {
+	EventManager & mgr = this->mediator->event_manager;
+	mgr.trigger_event(event, channel);
+}
+
+template <typename EventType>
+void Script::queue_event(const EventType & event, event_channel_t channel) {
+	EventManager & mgr = this->mediator->event_manager;
+	mgr.queue_event(event, channel);
+}
+
 template <typename T>
 RefVector<T> Script::get_components_by_id(game_object_id_t id) const {
 	Mediator & mediator = this->mediator;
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index ba684ba..0107c7b 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -1,6 +1,6 @@
 #include <cmath>
 
-#include "../util/Log.h"
+#include "../util/dbg.h"
 #include "api/Asset.h"
 
 #include "Component.h"
diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp
index 5fc886b..32b44e1 100644
--- a/src/crepe/api/Transform.cpp
+++ b/src/crepe/api/Transform.cpp
@@ -1,4 +1,4 @@
-#include "../util/Log.h"
+#include "../util/dbg.h"
 
 #include "Transform.h"
 
diff --git a/src/crepe/facade/DB.cpp b/src/crepe/facade/DB.cpp
index 95cf606..d45cd82 100644
--- a/src/crepe/facade/DB.cpp
+++ b/src/crepe/facade/DB.cpp
@@ -1,6 +1,6 @@
 #include <cstring>
 
-#include "util/Log.h"
+#include "util/dbg.h"
 
 #include "DB.h"
 
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 20bb030..fccc15f 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -19,7 +19,7 @@
 #include "../api/Color.h"
 #include "../api/Config.h"
 #include "../api/Sprite.h"
-#include "../util/Log.h"
+#include "../util/dbg.h"
 #include "manager/Mediator.h"
 
 #include "SDLContext.h"
diff --git a/src/crepe/facade/Sound.cpp b/src/crepe/facade/Sound.cpp
index 97e455e..b1e6463 100644
--- a/src/crepe/facade/Sound.cpp
+++ b/src/crepe/facade/Sound.cpp
@@ -1,5 +1,5 @@
 #include "../api/Asset.h"
-#include "../util/Log.h"
+#include "../util/dbg.h"
 
 #include "Sound.h"
 
diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
index b1f8cb3..5091e07 100644
--- a/src/crepe/facade/SoundContext.cpp
+++ b/src/crepe/facade/SoundContext.cpp
@@ -1,4 +1,4 @@
-#include "../util/Log.h"
+#include "../util/dbg.h"
 
 #include "SoundContext.h"
 
diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp
index b63403d..23a9c8e 100644
--- a/src/crepe/facade/Texture.cpp
+++ b/src/crepe/facade/Texture.cpp
@@ -1,4 +1,4 @@
-#include "../util/Log.h"
+#include "../util/dbg.h"
 #include "facade/SDLContext.h"
 #include "manager/Mediator.h"
 
diff --git a/src/crepe/manager/ComponentManager.cpp b/src/crepe/manager/ComponentManager.cpp
index 5f5c050..bc104d3 100644
--- a/src/crepe/manager/ComponentManager.cpp
+++ b/src/crepe/manager/ComponentManager.cpp
@@ -1,7 +1,7 @@
 #include "../api/GameObject.h"
 #include "../api/Metadata.h"
 #include "../types.h"
-#include "../util/Log.h"
+#include "../util/dbg.h"
 
 #include "ComponentManager.h"
 
diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp
index 9819632..a98a29d 100644
--- a/src/crepe/manager/LoopTimerManager.cpp
+++ b/src/crepe/manager/LoopTimerManager.cpp
@@ -1,7 +1,7 @@
 #include <chrono>
 #include <thread>
 
-#include "../util/Log.h"
+#include "../util/dbg.h"
 
 #include "LoopTimerManager.h"
 
diff --git a/src/crepe/manager/ResourceManager.cpp b/src/crepe/manager/ResourceManager.cpp
index a141a46..5713183 100644
--- a/src/crepe/manager/ResourceManager.cpp
+++ b/src/crepe/manager/ResourceManager.cpp
@@ -1,4 +1,4 @@
-#include "util/Log.h"
+#include "util/dbg.h"
 
 #include "ResourceManager.h"
 
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index ab79fc3..11da618 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -1,3 +1,4 @@
+#include "../util/dbg.h"
 #include "../api/BehaviorScript.h"
 #include "../api/Script.h"
 #include "../manager/ComponentManager.h"
diff --git a/src/crepe/util/Log.cpp b/src/crepe/util/Log.cpp
index 84d80a8..e11a8d9 100644
--- a/src/crepe/util/Log.cpp
+++ b/src/crepe/util/Log.cpp
@@ -3,6 +3,7 @@
 
 #include "../api/Config.h"
 
+#include "LogColor.h"
 #include "Log.h"
 
 using namespace crepe;
diff --git a/src/crepe/util/Log.h b/src/crepe/util/Log.h
index fc0bb3a..b43fe30 100644
--- a/src/crepe/util/Log.h
+++ b/src/crepe/util/Log.h
@@ -2,27 +2,6 @@
 
 #include <format>
 
-// allow user to disable debug macros
-#ifndef CREPE_DISABLE_MACROS
-
-#include "LogColor.h"
-
-// utility macros
-#define _crepe_logf_here(level, fmt, ...) \
-	crepe::Log::logf(level, "{}" fmt, \
-					 crepe::LogColor().fg_white(false).str(std::format( \
-						 "{} ({}:{})", __PRETTY_FUNCTION__, __FILE_NAME__, __LINE__)), \
-					 __VA_ARGS__)
-
-// very illegal global function-style macros
-// NOLINTBEGIN
-#define dbg_logf(fmt, ...) _crepe_logf_here(crepe::Log::Level::DEBUG, ": " fmt, __VA_ARGS__)
-#define dbg_log(str) _crepe_logf_here(crepe::Log::Level::DEBUG, ": {}", str)
-#define dbg_trace() _crepe_logf_here(crepe::Log::Level::TRACE, "", "")
-// NOLINTEND
-
-#endif
-
 namespace crepe {
 
 /**
diff --git a/src/crepe/util/dbg.h b/src/crepe/util/dbg.h
new file mode 100644
index 0000000..500e959
--- /dev/null
+++ b/src/crepe/util/dbg.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "Log.h"
+#include "LogColor.h"
+
+// utility macros
+#define _crepe_logf_here(level, fmt, ...) \
+	crepe::Log::logf(level, "{}" fmt, \
+					 crepe::LogColor().fg_white(false).str(std::format( \
+						 "{} ({}:{})", __PRETTY_FUNCTION__, __FILE_NAME__, __LINE__)), \
+					 __VA_ARGS__)
+
+// very illegal global function-style macros
+// NOLINTBEGIN
+#define dbg_logf(fmt, ...) _crepe_logf_here(crepe::Log::Level::DEBUG, ": " fmt, __VA_ARGS__)
+#define dbg_log(str) _crepe_logf_here(crepe::Log::Level::DEBUG, ": {}", str)
+#define dbg_trace() _crepe_logf_here(crepe::Log::Level::TRACE, "", "")
+// NOLINTEND
+
diff --git a/src/example/replay.cpp b/src/example/replay.cpp
index 4c606d7..7faf6cb 100644
--- a/src/example/replay.cpp
+++ b/src/example/replay.cpp
@@ -27,17 +27,21 @@ class Timeline : public Script {
 		switch (i++) {
 			default: break;
 			case 10:
+				logf("record start");
 				replay.record_start();
 				break;
 			case 60:
+				logf("record end, playing recording");
 				this->recording = replay.record_end();
 				replay.play(this->recording);
 				break;
 			case 61:
+				logf("done, releasing recording");
 				replay.release(this->recording);
 				break;
 			case 72:
-				throw;
+				logf("exit");
+				queue_event<ShutDownEvent>();
 				break;
 		};
 	}
-- 
cgit v1.2.3


From 431d7cceb25db86f31a8c89440f3cdd2c7bf061f Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 12 Dec 2024 20:45:49 +0100
Subject: load font almost working

---
 src/crepe/api/Text.cpp          |   2 +-
 src/crepe/api/Text.h            |  49 ++++++----
 src/crepe/facade/Font.cpp       |   4 +-
 src/crepe/facade/Font.h         |  15 +--
 src/crepe/facade/SDLContext.cpp | 202 ++++++++++++++++++++++++++--------------
 src/example/loadfont.cpp        |  13 +--
 6 files changed, 181 insertions(+), 104 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index dd44dd9..12d01f1 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -2,5 +2,5 @@
 
 using namespace crepe;
 
-Text::Text(game_object_id_t id,const vec2 & dimensions, const vec2 & offset, const Asset & font) : UIObject(id,dimensions,offset),source(font){}
+Text::Text(game_object_id_t id,const vec2 & dimensions, const vec2 & offset,std::string text,std::string font_family) : UIObject(id,dimensions,offset),text(text), font_family(font_family){}
 
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index d5f47fa..51bab98 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -9,27 +9,42 @@
 #include "UIObject.h"
 
 namespace crepe{
+
+/**
+ * \brief Text UIObject component for displaying text
+ * 
+ * This class can be used to display text on screen. By setting the font_family to a font already stored on the current device it will automatically be loaded in.
+ */
 class Text : public UIObject{
 public:
-	Text(game_object_id_t id,const vec2 & dimensions, const vec2 & offset, const Asset & font);
+	Text(game_object_id_t id,const vec2 & dimensions, const vec2 & offset,std::string text,std::string font_family);
+	//! Text data that does not have to be set in the constructor
+	struct Data {
+		//! Label text color.
+		Color text_color = Color::BLACK;
+		/**
+		 *  \brief fontsize for text rendering
+		 * 
+		 * \note this is not the actual font size that is loaded in.
+		 * 
+		 * Since SDL_TTF requires the font size when loading in the font it is not possible to switch the font size.
+		 * The default font size that is loaded is set in the Config.
+		 * Instead this value is used to upscale the font texture which can cause blurring or distorted text when upscaling or downscaling too much.
+		 */
+		unsigned int font_size = 16;
+		//! Layer sorting level of the text
+		const int sorting_in_layer = 0;
 
+		//! Order within the sorting text
+		const int order_in_layer = 0;
+	};
+public:
+	//! font family name such as (Arial,Helvetica,Inter)
+	std::string font_family = "";
 	//! Label text.
-	std::string text;
-	//! Label text color.
-	Color text_color = Color::BLACK;
-	/**
-	 *  \brief fontsize for text rendering
-	 * 
-	 * \note this is not the actual font size that is loaded in.
-	 * 
-	 * Since SDL_TTF requires the font size when loading in the font it is not possible to switch the font size.
-	 * The default font size that is loaded is set in the Config.
-	 * Instead this value is used to upscale the font texture which can cause blurring or distorted text when upscaling or downscaling too much.
-	 */
-	unsigned int font_size = 16;
-	//! Font asset
-	const Asset source;
-private:
+	std::string text = "";
+	// Data instance for data not gotten from constructor
+	Data data;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index b600b01..66835ee 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -23,6 +23,6 @@ Font::Font(std::unique_ptr<Asset> res){
 	this->load(std::move(res));
 }
 
-const TTF_Font& Font::get_font() const{
-	return this->font;
+TTF_Font* Font::get_font() const{
+	return this->font.get();
 }
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index 8bf9fc9..dd1cebf 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -17,17 +17,20 @@ class Font : public Resource{
 public:
     /**
 	 * \param src Asset with font data to load.
-	 * \param mediator use the SDLContext reference to load text
+	 * \param mediator use the SDLContext reference to get_font()
 	 */
-    Font( src, Mediator & mediator);
+    Font(const Asset & src, Mediator & mediator);
 
-
-    ~Font() = default
-	const TTF_Font& get_font() const;
+	/**
+	 * \brief getter for TTF_Font
+	 * 
+	 * \param src Asset with font data to load.
+	 * \param mediator use the SDLContext reference to get_font()
+	 */
+	TTF_Font* get_font() const;
 private:
 	//! The SDL_ttf font object with custom deleter.
     std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)> font;
-	unsigned int default_font_size = Config::get_instance().font.size;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index d71a9c8..8f6c02c 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -18,18 +18,23 @@
 #include "../api/Color.h"
 #include "../api/Config.h"
 #include "../api/Sprite.h"
+#include "../api/Texture.h"
 #include "../util/Log.h"
-#include "manager/Mediator.h"
 
 #include "SDLContext.h"
-#include "Texture.h"
 #include "types.h"
 
 using namespace crepe;
 using namespace std;
 
-SDLContext::SDLContext(Mediator & mediator) {
+SDLContext & SDLContext::get_instance() {
+	static SDLContext instance;
+	return instance;
+}
+
+SDLContext::SDLContext() {
 	dbg_trace();
+
 	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
 		throw runtime_error(format("SDLContext: SDL_Init error: {}", SDL_GetError()));
 	}
@@ -57,8 +62,6 @@ SDLContext::SDLContext(Mediator & mediator) {
 	if (!(IMG_Init(img_flags) & img_flags)) {
 		throw runtime_error("SDLContext: SDL_image could not initialize!");
 	}
-
-	mediator.sdl_context = *this;
 }
 
 SDLContext::~SDLContext() {
@@ -74,11 +77,12 @@ SDLContext::~SDLContext() {
 	SDL_Quit();
 }
 
-Keycode SDLContext::sdl_to_keycode(SDL_Keycode sdl_key) {
+Keycode SDLContext::sdl_to_keycode(SDL_Scancode sdl_key) {
 	static const std::array<Keycode, SDL_NUM_SCANCODES> LOOKUP_TABLE = [] {
 		std::array<Keycode, SDL_NUM_SCANCODES> table{};
 		table.fill(Keycode::NONE);
 
+		// Map all SDL scancodes to Keycodes
 		table[SDL_SCANCODE_SPACE] = Keycode::SPACE;
 		table[SDL_SCANCODE_APOSTROPHE] = Keycode::APOSTROPHE;
 		table[SDL_SCANCODE_COMMA] = Keycode::COMMA;
@@ -180,13 +184,27 @@ Keycode SDLContext::sdl_to_keycode(SDL_Keycode sdl_key) {
 
 		return table;
 	}();
-
 	if (sdl_key < 0 || sdl_key >= SDL_NUM_SCANCODES) {
 		return Keycode::NONE;
 	}
-
 	return LOOKUP_TABLE[sdl_key];
 }
+std::array<bool, Keycode::NUM_KEYCODES> SDLContext::get_keyboard_state() {
+	// Array to hold the key states (true if pressed, false if not)
+	std::array<bool, Keycode::NUM_KEYCODES> keyState{};
+	SDL_PumpEvents();
+	const Uint8 * current_state = SDL_GetKeyboardState(nullptr);
+
+	for (int i = 0; i < SDL_NUM_SCANCODES; ++i) {
+		Keycode key = sdl_to_keycode(static_cast<SDL_Scancode>(i));
+
+		if (key != Keycode::NONE) {
+			keyState[key] = current_state[i] != 0;
+		}
+	}
+
+	return keyState;
+}
 
 MouseButton SDLContext::sdl_to_mousebutton(Uint8 sdl_button) {
 	static const std::array<MouseButton, 5> MOUSE_BUTTON_LOOKUP_TABLE = [] {
@@ -218,19 +236,25 @@ void SDLContext::present_screen() {
 	SDL_RenderPresent(this->game_renderer.get());
 }
 
+SDL_Rect SDLContext::get_src_rect(const Sprite & sprite) const {
+	return SDL_Rect{
+		.x = sprite.mask.x,
+		.y = sprite.mask.y,
+		.w = sprite.mask.w,
+		.h = sprite.mask.h,
+	};
+}
+
 SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 
 	const Sprite::Data & data = ctx.sprite.data;
 
-	float aspect_ratio
-		= (ctx.sprite.aspect_ratio == 0) ? ctx.texture.get_ratio() : ctx.sprite.aspect_ratio;
-
 	vec2 size = data.size;
 	if (data.size.x == 0 && data.size.y != 0) {
-		size.x = data.size.y * aspect_ratio;
+		size.x = data.size.y * ctx.sprite.aspect_ratio;
 	}
 	if (data.size.y == 0 && data.size.x != 0) {
-		size.y = data.size.x / aspect_ratio;
+		size.y = data.size.x / ctx.sprite.aspect_ratio;
 	}
 
 	const CameraValues & cam = ctx.cam;
@@ -251,24 +275,15 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 }
 
 void SDLContext::draw(const RenderContext & ctx) {
+
 	const Sprite::Data & data = ctx.sprite.data;
 	SDL_RendererFlip render_flip
 		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * data.flip.flip_x)
 							  | (SDL_FLIP_VERTICAL * data.flip.flip_y));
 
-	SDL_Rect srcrect;
-	SDL_Rect * srcrect_ptr = NULL;
-	if (ctx.sprite.mask.w != 0 || ctx.sprite.mask.h != 0) {
-		srcrect.w = ctx.sprite.mask.w;
-		srcrect.h = ctx.sprite.mask.h;
-		srcrect.x = ctx.sprite.mask.x;
-		srcrect.y = ctx.sprite.mask.y;
-		srcrect_ptr = &srcrect;
-	}
-
+	SDL_Rect srcrect = this->get_src_rect(ctx.sprite);
 	SDL_FRect dstrect = this->get_dst_rect(SDLContext::DestinationRectangleData{
 		.sprite = ctx.sprite,
-		.texture = ctx.texture,
 		.cam = ctx.cam,
 		.pos = ctx.pos,
 		.img_scale = ctx.scale,
@@ -276,9 +291,9 @@ void SDLContext::draw(const RenderContext & ctx) {
 
 	double angle = ctx.angle + data.angle_offset;
 
-	this->set_color_texture(ctx.texture, ctx.sprite.data.color);
-	SDL_RenderCopyExF(this->game_renderer.get(), ctx.texture.get_img(), srcrect_ptr, &dstrect,
-					  angle, NULL, render_flip);
+	this->set_color_texture(ctx.sprite.texture, ctx.sprite.data.color);
+	SDL_RenderCopyExF(this->game_renderer.get(), ctx.sprite.texture.texture.get(), &srcrect,
+					  &dstrect, angle, NULL, render_flip);
 }
 
 SDLContext::CameraValues SDLContext::set_camera(const Camera & cam) {
@@ -340,6 +355,8 @@ SDLContext::CameraValues SDLContext::set_camera(const Camera & cam) {
 	return ret_cam;
 }
 
+uint64_t SDLContext::get_ticks() const { return SDL_GetTicks64(); }
+
 std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>>
 SDLContext::texture_from_path(const std::string & path) {
 
@@ -366,71 +383,112 @@ SDLContext::texture_from_path(const std::string & path) {
 
 ivec2 SDLContext::get_size(const Texture & ctx) {
 	ivec2 size;
-	SDL_QueryTexture(ctx.get_img(), NULL, NULL, &size.x, &size.y);
+	SDL_QueryTexture(ctx.texture.get(), NULL, NULL, &size.x, &size.y);
 	return size;
 }
 
+void SDLContext::delay(int ms) const { SDL_Delay(ms); }
+
 std::vector<SDLContext::EventData> SDLContext::get_events() {
 	std::vector<SDLContext::EventData> event_list;
 	SDL_Event event;
+
+	// Handle general SDL events
 	while (SDL_PollEvent(&event)) {
 		switch (event.type) {
 			case SDL_QUIT:
-				event_list.push_back(EventData{
-					.event_type = SDLContext::EventType::SHUTDOWN,
-				});
+				event_list.push_back({SDLContext::EventType::SHUTDOWN, {}, {}, {}});
 				break;
 			case SDL_KEYDOWN:
-				event_list.push_back(EventData{
-					.event_type = SDLContext::EventType::KEYDOWN,
-					.key = sdl_to_keycode(event.key.keysym.scancode),
-					.key_repeat = (event.key.repeat != 0),
-				});
+				event_list.push_back(
+					{SDLContext::EventType::KEYDOWN,
+					 {sdl_to_keycode(event.key.keysym.scancode), event.key.repeat != 0},
+					 {},
+					 {}});
 				break;
 			case SDL_KEYUP:
-				event_list.push_back(EventData{
-					.event_type = SDLContext::EventType::KEYUP,
-					.key = sdl_to_keycode(event.key.keysym.scancode),
-				});
+				event_list.push_back({SDLContext::EventType::KEYUP,
+									  {sdl_to_keycode(event.key.keysym.scancode), false},
+									  {},
+									  {}});
 				break;
 			case SDL_MOUSEBUTTONDOWN:
-				event_list.push_back(EventData{
-					.event_type = SDLContext::EventType::MOUSEDOWN,
-					.mouse_button = sdl_to_mousebutton(event.button.button),
-					.mouse_position = {event.button.x, event.button.y},
-				});
+				event_list.push_back({SDLContext::EventType::MOUSEDOWN,
+									  {},
+									  {sdl_to_mousebutton(event.button.button),
+									   {event.button.x, event.button.y}},
+									  {}});
+				break;
+			case SDL_MOUSEBUTTONUP:
+				event_list.push_back({SDLContext::EventType::MOUSEUP,
+									  {},
+									  {sdl_to_mousebutton(event.button.button),
+									   {event.button.x, event.button.y}},
+									  {}});
+				break;
+			case SDL_MOUSEMOTION:
+				event_list.push_back({SDLContext::EventType::MOUSEMOVE,
+									  {},
+									  {{},
+									   {event.motion.x, event.motion.y},
+									   -1,
+									   INFINITY,
+									   {event.motion.xrel, event.motion.yrel}},
+									  {}});
 				break;
-			case SDL_MOUSEBUTTONUP: {
-				int x, y;
-				SDL_GetMouseState(&x, &y);
-				event_list.push_back(EventData{
-					.event_type = SDLContext::EventType::MOUSEUP,
-					.mouse_button = sdl_to_mousebutton(event.button.button),
-					.mouse_position = {event.button.x, event.button.y},
-				});
-			} break;
-
-			case SDL_MOUSEMOTION: {
+			case SDL_MOUSEWHEEL:
 				event_list.push_back(
-					EventData{.event_type = SDLContext::EventType::MOUSEMOVE,
-							  .mouse_position = {event.motion.x, event.motion.y},
-							  .rel_mouse_move = {event.motion.xrel, event.motion.yrel}});
-			} break;
-
-			case SDL_MOUSEWHEEL: {
-				event_list.push_back(EventData{
-					.event_type = SDLContext::EventType::MOUSEWHEEL,
-					.mouse_position = {event.motion.x, event.motion.y},
-					// TODO: why is this needed?
-					.scroll_direction = event.wheel.y < 0 ? -1 : 1,
-					.scroll_delta = event.wheel.preciseY,
-				});
-			} break;
+					{SDLContext::EventType::MOUSEWHEEL,
+					 {},
+					 {{}, {}, event.wheel.y < 0 ? -1 : 1, event.wheel.preciseY, {}},
+					 {}});
+				break;
+
+			// Forward window events for further processing
+			case SDL_WINDOWEVENT:
+				this->handle_window_event(event.window, event_list);
+				break;
 		}
 	}
+
 	return event_list;
 }
+
+// Separate function for SDL_WINDOWEVENT subtypes
+void SDLContext::handle_window_event(const SDL_WindowEvent & window_event,
+									 std::vector<SDLContext::EventData> & event_list) {
+	switch (window_event.event) {
+		case SDL_WINDOWEVENT_EXPOSED:
+			event_list.push_back({SDLContext::EventType::WINDOW_EXPOSE, {}, {}, {}});
+			break;
+		case SDL_WINDOWEVENT_RESIZED:
+			event_list.push_back({SDLContext::EventType::WINDOW_RESIZE,
+								  {},
+								  {},
+								  {{}, {window_event.data1, window_event.data2}}});
+			break;
+		case SDL_WINDOWEVENT_MOVED:
+			event_list.push_back({SDLContext::EventType::WINDOW_MOVE,
+								  {},
+								  {},
+								  {{window_event.data1, window_event.data2}, {}}});
+			break;
+		case SDL_WINDOWEVENT_MINIMIZED:
+			event_list.push_back({SDLContext::EventType::WINDOW_MINIMIZE, {}, {}, {}});
+			break;
+		case SDL_WINDOWEVENT_MAXIMIZED:
+			event_list.push_back({SDLContext::EventType::WINDOW_MAXIMIZE, {}, {}, {}});
+			break;
+		case SDL_WINDOWEVENT_FOCUS_GAINED:
+			event_list.push_back({SDLContext::EventType::WINDOW_FOCUS_GAIN, {}, {}, {}});
+			break;
+		case SDL_WINDOWEVENT_FOCUS_LOST:
+			event_list.push_back({SDLContext::EventType::WINDOW_FOCUS_LOST, {}, {}, {}});
+			break;
+	}
+}
+
 void SDLContext::set_color_texture(const Texture & texture, const Color & color) {
-	SDL_SetTextureColorMod(texture.get_img(), color.r, color.g, color.b);
-	SDL_SetTextureAlphaMod(texture.get_img(), color.a);
+	SDL_SetTextureColorMod(texture.texture.get(), color.r, color.g, color.b);
+	SDL_SetTextureAlphaMod(texture.texture.get(), color.a);
 }
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 0002026..fe5466f 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -3,18 +3,19 @@
 #include <memory>
 #include <crepe/facade/SDLFontContext.h>
 #include <crepe/api/Text.h>
-
+#include <crepe/facade/Font.h>
+#include <crepe/manager/Mediator.h>
 using namespace crepe;
 
 int main() {
     SDLFontContext font_facade;
-
-    // Create a unique pointer to the font asset
-    std::unique_ptr<Asset> asset = font_facade.get_font_asset("OpenSymbol");
-    std::cout << "path: " << asset->get_path() << std::endl;
+	Mediator mediator;
 	try{
 		  // Correct way to create a unique pointer for Text
-    std::unique_ptr<Text> label = std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), *asset);
+    std::unique_ptr<Text> label = std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test","OpenSymbol");
+	std::unique_ptr<Asset> asset = font_facade.get_font_asset(label->font_family);
+	std::cout << "path: " << asset->get_path() << std::endl;
+	std::unique_ptr<Font> font = make_unique<Font>(asset,mediator)
 	}catch (const std::exception& e) {
     std::cout << "Standard exception thrown: " << e.what() << std::endl;
 	}
-- 
cgit v1.2.3


From 3ed4e51e23b5093a44a166b2f11ff66164e5cff1 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 12 Dec 2024 21:09:55 +0100
Subject: font working

---
 src/CMakeLists.txt              |   2 +
 src/crepe/facade/CMakeLists.txt |   2 +
 src/crepe/facade/Font.cpp       |  31 +++---
 src/crepe/facade/Font.h         |   2 +-
 src/crepe/facade/SDLContext.cpp | 206 +++++++++++++++-------------------------
 src/crepe/facade/SDLContext.h   |   1 +
 src/example/loadfont.cpp        |   6 +-
 7 files changed, 100 insertions(+), 150 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2b8873f..a525c74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,6 +9,7 @@ project(crepe C CXX)
 
 find_package(SDL2 REQUIRED)
 find_package(SDL2_image REQUIRED)
+find_package(SDL2_ttf REQUIRED)
 find_package(SoLoud REQUIRED)
 find_package(GTest REQUIRED)
 find_package(whereami REQUIRED)
@@ -25,6 +26,7 @@ target_include_directories(crepe
 target_link_libraries(crepe
 	PRIVATE soloud
 	PUBLIC SDL2
+	PUBLIC SDL2_ttf
 	PUBLIC SDL2_image
 	PUBLIC ${BERKELEY_DB}
 	PUBLIC whereami
diff --git a/src/crepe/facade/CMakeLists.txt b/src/crepe/facade/CMakeLists.txt
index f4d71ff..e61b680 100644
--- a/src/crepe/facade/CMakeLists.txt
+++ b/src/crepe/facade/CMakeLists.txt
@@ -5,6 +5,7 @@ target_sources(crepe PUBLIC
 	SDLContext.cpp
 	DB.cpp
 	SDLFontContext.cpp
+	Font.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -14,5 +15,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	SDLContext.h
 	DB.h
 	SDLFontContext.h
+	Font.h
 )
 
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 66835ee..37dee3a 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -1,28 +1,25 @@
 #include "../api/Config.h"
 
-#include "font.h"
+#include "Font.h"
 
 using namespace std;
 using namespace crepe;
 
-void Font::load(unique_ptr<Asset> res){
-	const char* font_path = res->get_path();
-    this->font = std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)>(
-        TTF_OpenFont(font_path, this->default_font_size), &TTF_CloseFont); 
+Font::Font(const Asset& src, Mediator& mediator) 
+    : Resource(src, mediator), font(nullptr, TTF_CloseFont) {
+    // Get the font file path from the Asset
+    const std::string font_path = src.get_path();
 
-    if (!font) {
-        throw std::runtime_error("Failed to load font: " + std::string(TTF_GetError()));
-    }
-}
+    // Attempt to load the font
+    this->font.reset(TTF_OpenFont(font_path.c_str(), Config::get_instance().font.size));
 
-Font::Font(const char* src){
-	this->load(make_unique<Asset>(src));
-}
-
-Font::Font(std::unique_ptr<Asset> res){
-	this->load(std::move(res));
+    // Check if font loading failed
+    if (!this->font) {
+        throw runtime_error(format("Failed to load font from path: {}" 
+                                 ". SDL_ttf error: {}",font_path, TTF_GetError()));
+    }
 }
 
-TTF_Font* Font::get_font() const{
-	return this->font.get();
+TTF_Font* Font::get_font() const {
+    return this->font.get();
 }
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index dd1cebf..a27676b 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -5,7 +5,7 @@
 
 #include "../api/Asset.h"
 #include "../api/Config.h"
-
+#include "../Resource.h"
 namespace crepe {
 
 /**
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 8f6c02c..38d12f6 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -18,23 +18,21 @@
 #include "../api/Color.h"
 #include "../api/Config.h"
 #include "../api/Sprite.h"
-#include "../api/Texture.h"
 #include "../util/Log.h"
+#include "manager/Mediator.h"
 
 #include "SDLContext.h"
+#include "Texture.h"
 #include "types.h"
 
 using namespace crepe;
 using namespace std;
 
-SDLContext & SDLContext::get_instance() {
-	static SDLContext instance;
-	return instance;
-}
-
-SDLContext::SDLContext() {
+SDLContext::SDLContext(Mediator & mediator) {
 	dbg_trace();
-
+	if (TTF_Init() == -1) {
+        throw runtime_error(format("SDL_ttf initialization failed: {}", TTF_GetError()));
+    }
 	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
 		throw runtime_error(format("SDLContext: SDL_Init error: {}", SDL_GetError()));
 	}
@@ -62,6 +60,8 @@ SDLContext::SDLContext() {
 	if (!(IMG_Init(img_flags) & img_flags)) {
 		throw runtime_error("SDLContext: SDL_image could not initialize!");
 	}
+
+	mediator.sdl_context = *this;
 }
 
 SDLContext::~SDLContext() {
@@ -75,14 +75,14 @@ SDLContext::~SDLContext() {
 	// before.
 	IMG_Quit();
 	SDL_Quit();
+	TTF_Quit();
 }
 
-Keycode SDLContext::sdl_to_keycode(SDL_Scancode sdl_key) {
+Keycode SDLContext::sdl_to_keycode(SDL_Keycode sdl_key) {
 	static const std::array<Keycode, SDL_NUM_SCANCODES> LOOKUP_TABLE = [] {
 		std::array<Keycode, SDL_NUM_SCANCODES> table{};
 		table.fill(Keycode::NONE);
 
-		// Map all SDL scancodes to Keycodes
 		table[SDL_SCANCODE_SPACE] = Keycode::SPACE;
 		table[SDL_SCANCODE_APOSTROPHE] = Keycode::APOSTROPHE;
 		table[SDL_SCANCODE_COMMA] = Keycode::COMMA;
@@ -184,26 +184,12 @@ Keycode SDLContext::sdl_to_keycode(SDL_Scancode sdl_key) {
 
 		return table;
 	}();
+
 	if (sdl_key < 0 || sdl_key >= SDL_NUM_SCANCODES) {
 		return Keycode::NONE;
 	}
-	return LOOKUP_TABLE[sdl_key];
-}
-std::array<bool, Keycode::NUM_KEYCODES> SDLContext::get_keyboard_state() {
-	// Array to hold the key states (true if pressed, false if not)
-	std::array<bool, Keycode::NUM_KEYCODES> keyState{};
-	SDL_PumpEvents();
-	const Uint8 * current_state = SDL_GetKeyboardState(nullptr);
 
-	for (int i = 0; i < SDL_NUM_SCANCODES; ++i) {
-		Keycode key = sdl_to_keycode(static_cast<SDL_Scancode>(i));
-
-		if (key != Keycode::NONE) {
-			keyState[key] = current_state[i] != 0;
-		}
-	}
-
-	return keyState;
+	return LOOKUP_TABLE[sdl_key];
 }
 
 MouseButton SDLContext::sdl_to_mousebutton(Uint8 sdl_button) {
@@ -236,25 +222,19 @@ void SDLContext::present_screen() {
 	SDL_RenderPresent(this->game_renderer.get());
 }
 
-SDL_Rect SDLContext::get_src_rect(const Sprite & sprite) const {
-	return SDL_Rect{
-		.x = sprite.mask.x,
-		.y = sprite.mask.y,
-		.w = sprite.mask.w,
-		.h = sprite.mask.h,
-	};
-}
-
 SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 
 	const Sprite::Data & data = ctx.sprite.data;
 
+	float aspect_ratio
+		= (ctx.sprite.aspect_ratio == 0) ? ctx.texture.get_ratio() : ctx.sprite.aspect_ratio;
+
 	vec2 size = data.size;
 	if (data.size.x == 0 && data.size.y != 0) {
-		size.x = data.size.y * ctx.sprite.aspect_ratio;
+		size.x = data.size.y * aspect_ratio;
 	}
 	if (data.size.y == 0 && data.size.x != 0) {
-		size.y = data.size.x / ctx.sprite.aspect_ratio;
+		size.y = data.size.x / aspect_ratio;
 	}
 
 	const CameraValues & cam = ctx.cam;
@@ -275,15 +255,24 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 }
 
 void SDLContext::draw(const RenderContext & ctx) {
-
 	const Sprite::Data & data = ctx.sprite.data;
 	SDL_RendererFlip render_flip
 		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * data.flip.flip_x)
 							  | (SDL_FLIP_VERTICAL * data.flip.flip_y));
 
-	SDL_Rect srcrect = this->get_src_rect(ctx.sprite);
+	SDL_Rect srcrect;
+	SDL_Rect * srcrect_ptr = NULL;
+	if (ctx.sprite.mask.w != 0 || ctx.sprite.mask.h != 0) {
+		srcrect.w = ctx.sprite.mask.w;
+		srcrect.h = ctx.sprite.mask.h;
+		srcrect.x = ctx.sprite.mask.x;
+		srcrect.y = ctx.sprite.mask.y;
+		srcrect_ptr = &srcrect;
+	}
+
 	SDL_FRect dstrect = this->get_dst_rect(SDLContext::DestinationRectangleData{
 		.sprite = ctx.sprite,
+		.texture = ctx.texture,
 		.cam = ctx.cam,
 		.pos = ctx.pos,
 		.img_scale = ctx.scale,
@@ -291,9 +280,9 @@ void SDLContext::draw(const RenderContext & ctx) {
 
 	double angle = ctx.angle + data.angle_offset;
 
-	this->set_color_texture(ctx.sprite.texture, ctx.sprite.data.color);
-	SDL_RenderCopyExF(this->game_renderer.get(), ctx.sprite.texture.texture.get(), &srcrect,
-					  &dstrect, angle, NULL, render_flip);
+	this->set_color_texture(ctx.texture, ctx.sprite.data.color);
+	SDL_RenderCopyExF(this->game_renderer.get(), ctx.texture.get_img(), srcrect_ptr, &dstrect,
+					  angle, NULL, render_flip);
 }
 
 SDLContext::CameraValues SDLContext::set_camera(const Camera & cam) {
@@ -355,8 +344,6 @@ SDLContext::CameraValues SDLContext::set_camera(const Camera & cam) {
 	return ret_cam;
 }
 
-uint64_t SDLContext::get_ticks() const { return SDL_GetTicks64(); }
-
 std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>>
 SDLContext::texture_from_path(const std::string & path) {
 
@@ -383,112 +370,71 @@ SDLContext::texture_from_path(const std::string & path) {
 
 ivec2 SDLContext::get_size(const Texture & ctx) {
 	ivec2 size;
-	SDL_QueryTexture(ctx.texture.get(), NULL, NULL, &size.x, &size.y);
+	SDL_QueryTexture(ctx.get_img(), NULL, NULL, &size.x, &size.y);
 	return size;
 }
 
-void SDLContext::delay(int ms) const { SDL_Delay(ms); }
-
 std::vector<SDLContext::EventData> SDLContext::get_events() {
 	std::vector<SDLContext::EventData> event_list;
 	SDL_Event event;
-
-	// Handle general SDL events
 	while (SDL_PollEvent(&event)) {
 		switch (event.type) {
 			case SDL_QUIT:
-				event_list.push_back({SDLContext::EventType::SHUTDOWN, {}, {}, {}});
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::SHUTDOWN,
+				});
 				break;
 			case SDL_KEYDOWN:
-				event_list.push_back(
-					{SDLContext::EventType::KEYDOWN,
-					 {sdl_to_keycode(event.key.keysym.scancode), event.key.repeat != 0},
-					 {},
-					 {}});
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::KEYDOWN,
+					.key = sdl_to_keycode(event.key.keysym.scancode),
+					.key_repeat = (event.key.repeat != 0),
+				});
 				break;
 			case SDL_KEYUP:
-				event_list.push_back({SDLContext::EventType::KEYUP,
-									  {sdl_to_keycode(event.key.keysym.scancode), false},
-									  {},
-									  {}});
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::KEYUP,
+					.key = sdl_to_keycode(event.key.keysym.scancode),
+				});
 				break;
 			case SDL_MOUSEBUTTONDOWN:
-				event_list.push_back({SDLContext::EventType::MOUSEDOWN,
-									  {},
-									  {sdl_to_mousebutton(event.button.button),
-									   {event.button.x, event.button.y}},
-									  {}});
-				break;
-			case SDL_MOUSEBUTTONUP:
-				event_list.push_back({SDLContext::EventType::MOUSEUP,
-									  {},
-									  {sdl_to_mousebutton(event.button.button),
-									   {event.button.x, event.button.y}},
-									  {}});
-				break;
-			case SDL_MOUSEMOTION:
-				event_list.push_back({SDLContext::EventType::MOUSEMOVE,
-									  {},
-									  {{},
-									   {event.motion.x, event.motion.y},
-									   -1,
-									   INFINITY,
-									   {event.motion.xrel, event.motion.yrel}},
-									  {}});
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::MOUSEDOWN,
+					.mouse_button = sdl_to_mousebutton(event.button.button),
+					.mouse_position = {event.button.x, event.button.y},
+				});
 				break;
-			case SDL_MOUSEWHEEL:
+			case SDL_MOUSEBUTTONUP: {
+				int x, y;
+				SDL_GetMouseState(&x, &y);
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::MOUSEUP,
+					.mouse_button = sdl_to_mousebutton(event.button.button),
+					.mouse_position = {event.button.x, event.button.y},
+				});
+			} break;
+
+			case SDL_MOUSEMOTION: {
 				event_list.push_back(
-					{SDLContext::EventType::MOUSEWHEEL,
-					 {},
-					 {{}, {}, event.wheel.y < 0 ? -1 : 1, event.wheel.preciseY, {}},
-					 {}});
-				break;
-
-			// Forward window events for further processing
-			case SDL_WINDOWEVENT:
-				this->handle_window_event(event.window, event_list);
-				break;
+					EventData{.event_type = SDLContext::EventType::MOUSEMOVE,
+							  .mouse_position = {event.motion.x, event.motion.y},
+							  .rel_mouse_move = {event.motion.xrel, event.motion.yrel}});
+			} break;
+
+			case SDL_MOUSEWHEEL: {
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::MOUSEWHEEL,
+					.mouse_position = {event.motion.x, event.motion.y},
+					// TODO: why is this needed?
+					.scroll_direction = event.wheel.y < 0 ? -1 : 1,
+					.scroll_delta = event.wheel.preciseY,
+				});
+			} break;
 		}
 	}
-
 	return event_list;
 }
-
-// Separate function for SDL_WINDOWEVENT subtypes
-void SDLContext::handle_window_event(const SDL_WindowEvent & window_event,
-									 std::vector<SDLContext::EventData> & event_list) {
-	switch (window_event.event) {
-		case SDL_WINDOWEVENT_EXPOSED:
-			event_list.push_back({SDLContext::EventType::WINDOW_EXPOSE, {}, {}, {}});
-			break;
-		case SDL_WINDOWEVENT_RESIZED:
-			event_list.push_back({SDLContext::EventType::WINDOW_RESIZE,
-								  {},
-								  {},
-								  {{}, {window_event.data1, window_event.data2}}});
-			break;
-		case SDL_WINDOWEVENT_MOVED:
-			event_list.push_back({SDLContext::EventType::WINDOW_MOVE,
-								  {},
-								  {},
-								  {{window_event.data1, window_event.data2}, {}}});
-			break;
-		case SDL_WINDOWEVENT_MINIMIZED:
-			event_list.push_back({SDLContext::EventType::WINDOW_MINIMIZE, {}, {}, {}});
-			break;
-		case SDL_WINDOWEVENT_MAXIMIZED:
-			event_list.push_back({SDLContext::EventType::WINDOW_MAXIMIZE, {}, {}, {}});
-			break;
-		case SDL_WINDOWEVENT_FOCUS_GAINED:
-			event_list.push_back({SDLContext::EventType::WINDOW_FOCUS_GAIN, {}, {}, {}});
-			break;
-		case SDL_WINDOWEVENT_FOCUS_LOST:
-			event_list.push_back({SDLContext::EventType::WINDOW_FOCUS_LOST, {}, {}, {}});
-			break;
-	}
-}
-
 void SDLContext::set_color_texture(const Texture & texture, const Color & color) {
-	SDL_SetTextureColorMod(texture.texture.get(), color.r, color.g, color.b);
-	SDL_SetTextureAlphaMod(texture.texture.get(), color.a);
+	SDL_SetTextureColorMod(texture.get_img(), color.r, color.g, color.b);
+	SDL_SetTextureAlphaMod(texture.get_img(), color.a);
 }
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 46b779f..6b725e3 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -5,6 +5,7 @@
 #include <SDL2/SDL_rect.h>
 #include <SDL2/SDL_render.h>
 #include <SDL2/SDL_video.h>
+#include <SDL2/SDL_ttf.h>
 #include <cmath>
 #include <functional>
 #include <memory>
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index fe5466f..52454a1 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -5,17 +5,19 @@
 #include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
 #include <crepe/manager/Mediator.h>
+#include <crepe/facade/SDLContext.h>
 using namespace crepe;
-
 int main() {
+	
     SDLFontContext font_facade;
 	Mediator mediator;
+	SDLContext sdl_context{mediator};
 	try{
 		  // Correct way to create a unique pointer for Text
     std::unique_ptr<Text> label = std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test","OpenSymbol");
 	std::unique_ptr<Asset> asset = font_facade.get_font_asset(label->font_family);
 	std::cout << "path: " << asset->get_path() << std::endl;
-	std::unique_ptr<Font> font = make_unique<Font>(asset,mediator)
+	std::unique_ptr<Font> font = std::make_unique<Font>(*asset,mediator);
 	}catch (const std::exception& e) {
     std::cout << "Standard exception thrown: " << e.what() << std::endl;
 	}
-- 
cgit v1.2.3


From 054b1ebea645bb8916f87e0d8f0f85d59e998eaf Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 12 Dec 2024 21:16:19 +0100
Subject: font facade added to SDLContext

---
 src/crepe/api/Text.h          |  6 ++++--
 src/crepe/facade/Font.h       | 31 ++++++++++++++++++-------------
 src/crepe/facade/SDLContext.h |  5 ++++-
 3 files changed, 26 insertions(+), 16 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index 51bab98..8436611 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -20,8 +20,6 @@ public:
 	Text(game_object_id_t id,const vec2 & dimensions, const vec2 & offset,std::string text,std::string font_family);
 	//! Text data that does not have to be set in the constructor
 	struct Data {
-		//! Label text color.
-		Color text_color = Color::BLACK;
 		/**
 		 *  \brief fontsize for text rendering
 		 * 
@@ -32,11 +30,15 @@ public:
 		 * Instead this value is used to upscale the font texture which can cause blurring or distorted text when upscaling or downscaling too much.
 		 */
 		unsigned int font_size = 16;
+
 		//! Layer sorting level of the text
 		const int sorting_in_layer = 0;
 
 		//! Order within the sorting text
 		const int order_in_layer = 0;
+
+		//! Label text color.
+		Color text_color = Color::BLACK;
 	};
 public:
 	//! font family name such as (Arial,Helvetica,Inter)
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index a27676b..fbc1b8f 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -1,35 +1,40 @@
 #pragma once
-
-#include <memory>
 #include <SDL2/SDL_ttf.h>
+#include <memory>
 
 #include "../api/Asset.h"
 #include "../api/Config.h"
 #include "../Resource.h"
+
 namespace crepe {
 
 /**
  * \brief Resource for managing font creation and destruction
  *
  * This class is a wrapper around an SDL_ttf font instance, encapsulating font loading and usage.
+ * It loads a font from an Asset and manages its lifecycle. The font is automatically unloaded
+ * when this object is destroyed.
  */
 class Font : public Resource{
 public:
     /**
-	 * \param src Asset with font data to load.
-	 * \param mediator use the SDLContext reference to get_font()
-	 */
+     * \param src The Asset containing the font file path and metadata to load the font.
+     * \param mediator The Mediator object used for managing the SDL context or related systems.
+     */
     Font(const Asset & src, Mediator & mediator);
 
-	/**
-	 * \brief getter for TTF_Font
-	 * 
-	 * \param src Asset with font data to load.
-	 * \param mediator use the SDLContext reference to get_font()
-	 */
-	TTF_Font* get_font() const;
+    /**
+     * \brief Gets the underlying TTF_Font resource.
+     * 
+     * This function returns the raw pointer to the SDL_ttf TTF_Font object that represents
+     * the loaded font. This can be used with SDL_ttf functions to render text.
+     * 
+     * \return The raw TTF_Font object wrapped in a unique pointer.
+     */
+    TTF_Font* get_font() const;
+
 private:
-	//! The SDL_ttf font object with custom deleter.
+    //! The SDL_ttf font object with custom deleter.
     std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)> font;
 };
 
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 6b725e3..bbbb542 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -16,9 +16,10 @@
 #include "api/KeyCodes.h"
 #include "api/Sprite.h"
 #include "api/Transform.h"
-
 #include "types.h"
 
+#include "SDLFontContext.h"
+
 namespace crepe {
 
 class Texture;
@@ -226,6 +227,7 @@ public:
 	void set_color_texture(const Texture & texture, const Color & color);
 
 private:
+
 	//! sdl Window
 	std::unique_ptr<SDL_Window, std::function<void(SDL_Window *)>> game_window;
 
@@ -234,6 +236,7 @@ private:
 
 	//! black bars rectangle to draw
 	SDL_FRect black_bars[2] = {};
+	SDLFontContext font_facade{};
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From 24818173c970829553d75787ed6a60e6c95e16c6 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 12 Dec 2024 21:17:29 +0100
Subject: fontcontext removed from sdlcontext

---
 src/crepe/facade/SDLContext.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index bbbb542..957ee32 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -18,7 +18,6 @@
 #include "api/Transform.h"
 #include "types.h"
 
-#include "SDLFontContext.h"
 
 namespace crepe {
 
@@ -236,7 +235,6 @@ private:
 
 	//! black bars rectangle to draw
 	SDL_FRect black_bars[2] = {};
-	SDLFontContext font_facade{};
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From 2eaebb2a79ef71589a0be89cfe419f874fbadd09 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 12 Dec 2024 21:21:16 +0100
Subject: removed asset manager

---
 src/crepe/api/AssetManager.h        | 62 -------------------------------------
 src/crepe/facade/SDLFontContext.cpp | 18 +++++------
 2 files changed, 9 insertions(+), 71 deletions(-)
 delete mode 100644 src/crepe/api/AssetManager.h

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/AssetManager.h b/src/crepe/api/AssetManager.h
deleted file mode 100644
index 3b1cc4b..0000000
--- a/src/crepe/api/AssetManager.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma once
-
-#include <any>
-#include <memory>
-#include <string>
-#include <unordered_map>
-
-namespace crepe {
-
-/**
- * \brief The AssetManager is responsible for storing and managing assets over multiple scenes.
- *
- * The AssetManager ensures that assets are loaded once and can be accessed across different
- * scenes. It caches assets to avoid reloading them every time a scene is loaded. Assets are
- * retained in memory until the AssetManager is destroyed, at which point the cached assets are
- * cleared.
- */
-class AssetManager {
-
-private:
-	//! A cache that holds all the assets, accessible by their file path, over multiple scenes.
-	std::unordered_map<std::string, std::any> asset_cache;
-
-private:
-	AssetManager();
-	virtual ~AssetManager();
-
-public:
-	AssetManager(const AssetManager &) = delete;
-	AssetManager(AssetManager &&) = delete;
-	AssetManager & operator=(const AssetManager &) = delete;
-	AssetManager & operator=(AssetManager &&) = delete;
-
-	/**
-	 * \brief Retrieves the singleton instance of the AssetManager.
-	 *
-	 * \return A reference to the single instance of the AssetManager.
-	 */
-	static AssetManager & get_instance();
-
-public:
-	/**
-	 * \brief Caches an asset by loading it from the given file path.
-	 *
-	 * \param file_path The path to the asset file to load.
-	 * \param reload If true, the asset will be reloaded from the file, even if it is already
-	 * cached.
-	 * \tparam T The type of asset to cache (e.g., texture, sound, etc.).
-	 *
-	 * \return A shared pointer to the cached asset.
-	 *
-	 * This template function caches the asset at the given file path. If the asset is already
-	 * cached and `reload` is false, the existing cached version will be returned. Otherwise, the
-	 * asset will be reloaded and added to the cache.
-	 */
-	template <typename T>
-	std::shared_ptr<T> cache(const std::string & file_path, bool reload = false);
-};
-
-} // namespace crepe
-
-#include "AssetManager.hpp"
diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
index d7a0bff..e7f04cc 100644
--- a/src/crepe/facade/SDLFontContext.cpp
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -8,26 +8,26 @@ using namespace std;
 
 SDLFontContext::SDLFontContext(){
 	if (!FcInit()) {
-            throw std::runtime_error("Failed to initialize Fontconfig.");
+            throw runtime_error("Failed to initialize Fontconfig.");
     }
 }
 
 SDLFontContext::~SDLFontContext(){
 		FcFini();
 }
-unique_ptr<Asset> SDLFontContext::get_font_asset(const std::string & font_family) {
+unique_ptr<Asset> SDLFontContext::get_font_asset(const string & font_family) {
 	
     // Create a pattern to search for the font family
     FcPattern* pattern = FcNameParse(reinterpret_cast<const FcChar8*>(font_family.c_str()));
     if (!pattern) {
-        throw std::runtime_error("Failed to create font pattern.");
+        throw runtime_error("Failed to create font pattern.");
     }
 
     // Default configuration
     FcConfig* config = FcConfigGetCurrent();
     if (!config) {
         FcPatternDestroy(pattern);
-        throw std::runtime_error("Failed to get current Fontconfig configuration.");
+        throw runtime_error("Failed to get current Fontconfig configuration.");
     }
 
     // Match the font pattern
@@ -36,18 +36,18 @@ unique_ptr<Asset> SDLFontContext::get_font_asset(const std::string & font_family
     FcPatternDestroy(pattern);
 
     if (!matched_pattern) {
-        throw std::runtime_error("No matching font found.");
+        throw runtime_error("No matching font found.");
     }
 
     // Extract the file path
     FcChar8* file_path = nullptr;
     if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch || !file_path) {
         FcPatternDestroy(matched_pattern);
-        throw std::runtime_error("Failed to get font file path.");
+        throw runtime_error("Failed to get font file path.");
     }
 
-    // Convert the file path to a std::string
-    std::string font_file_path(reinterpret_cast<const char*>(file_path));
+    // Convert the file path to a string
+    string font_file_path(reinterpret_cast<const char*>(file_path));
     FcPatternDestroy(matched_pattern);
-    return std::move(make_unique<Asset>(font_file_path));
+    return move(make_unique<Asset>(font_file_path));
 }
-- 
cgit v1.2.3


From 1658c71bb7d3676699e9519131d6ea542e74fc83 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 12 Dec 2024 21:22:06 +0100
Subject: added enter between functions

---
 src/crepe/facade/SDLContext.h       | 1 -
 src/crepe/facade/SDLFontContext.cpp | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 554880f..d7b8365 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -18,7 +18,6 @@
 #include "api/Transform.h"
 #include "types.h"
 
-
 namespace crepe {
 
 class Texture;
diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
index e7f04cc..4fb0e88 100644
--- a/src/crepe/facade/SDLFontContext.cpp
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -15,6 +15,7 @@ SDLFontContext::SDLFontContext(){
 SDLFontContext::~SDLFontContext(){
 		FcFini();
 }
+
 unique_ptr<Asset> SDLFontContext::get_font_asset(const string & font_family) {
 	
     // Create a pattern to search for the font family
-- 
cgit v1.2.3


From f9f06f54dd1a66350afd42f6eec761565a4d3d77 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 12 Dec 2024 21:23:46 +0100
Subject: added pattern removal on exception

---
 src/crepe/facade/SDLFontContext.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
index 4fb0e88..851016b 100644
--- a/src/crepe/facade/SDLFontContext.cpp
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -37,6 +37,7 @@ unique_ptr<Asset> SDLFontContext::get_font_asset(const string & font_family) {
     FcPatternDestroy(pattern);
 
     if (!matched_pattern) {
+		FcPatternDestroy(matched_pattern);
         throw runtime_error("No matching font found.");
     }
 
-- 
cgit v1.2.3


From 5ef7c56e44a864e580810952450c43c0f9a7b6e0 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 12 Dec 2024 21:26:03 +0100
Subject: make format

---
 src/crepe/api/Text.cpp              |  7 +++-
 src/crepe/api/Text.h                |  8 ++--
 src/crepe/facade/Font.cpp           | 28 ++++++-------
 src/crepe/facade/Font.h             | 16 ++++----
 src/crepe/facade/SDLContext.cpp     |  4 +-
 src/crepe/facade/SDLContext.h       |  3 +-
 src/crepe/facade/SDLFontContext.cpp | 80 ++++++++++++++++++-------------------
 src/crepe/facade/SDLFontContext.h   | 21 +++++-----
 src/example/loadfont.cpp            | 34 ++++++++--------
 9 files changed, 102 insertions(+), 99 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 12d01f1..b30ccf6 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -2,5 +2,8 @@
 
 using namespace crepe;
 
-Text::Text(game_object_id_t id,const vec2 & dimensions, const vec2 & offset,std::string text,std::string font_family) : UIObject(id,dimensions,offset),text(text), font_family(font_family){}
-
+Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, std::string text,
+		   std::string font_family)
+	: UIObject(id, dimensions, offset),
+	  text(text),
+	  font_family(font_family) {}
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index 8436611..ebf413b 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -8,16 +8,17 @@
 #include "Color.h"
 #include "UIObject.h"
 
-namespace crepe{
+namespace crepe {
 
 /**
  * \brief Text UIObject component for displaying text
  * 
  * This class can be used to display text on screen. By setting the font_family to a font already stored on the current device it will automatically be loaded in.
  */
-class Text : public UIObject{
+class Text : public UIObject {
 public:
-	Text(game_object_id_t id,const vec2 & dimensions, const vec2 & offset,std::string text,std::string font_family);
+	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, std::string text,
+		 std::string font_family);
 	//! Text data that does not have to be set in the constructor
 	struct Data {
 		/**
@@ -40,6 +41,7 @@ public:
 		//! Label text color.
 		Color text_color = Color::BLACK;
 	};
+
 public:
 	//! font family name such as (Arial,Helvetica,Inter)
 	std::string font_family = "";
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 37dee3a..85b0e13 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -5,21 +5,21 @@
 using namespace std;
 using namespace crepe;
 
-Font::Font(const Asset& src, Mediator& mediator) 
-    : Resource(src, mediator), font(nullptr, TTF_CloseFont) {
-    // Get the font file path from the Asset
-    const std::string font_path = src.get_path();
+Font::Font(const Asset & src, Mediator & mediator)
+	: Resource(src, mediator),
+	  font(nullptr, TTF_CloseFont) {
+	// Get the font file path from the Asset
+	const std::string font_path = src.get_path();
 
-    // Attempt to load the font
-    this->font.reset(TTF_OpenFont(font_path.c_str(), Config::get_instance().font.size));
+	// Attempt to load the font
+	this->font.reset(TTF_OpenFont(font_path.c_str(), Config::get_instance().font.size));
 
-    // Check if font loading failed
-    if (!this->font) {
-        throw runtime_error(format("Failed to load font from path: {}" 
-                                 ". SDL_ttf error: {}",font_path, TTF_GetError()));
-    }
+	// Check if font loading failed
+	if (!this->font) {
+		throw runtime_error(format("Failed to load font from path: {}"
+								   ". SDL_ttf error: {}",
+								   font_path, TTF_GetError()));
+	}
 }
 
-TTF_Font* Font::get_font() const {
-    return this->font.get();
-}
+TTF_Font * Font::get_font() const { return this->font.get(); }
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index fbc1b8f..983ef31 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -2,9 +2,9 @@
 #include <SDL2/SDL_ttf.h>
 #include <memory>
 
+#include "../Resource.h"
 #include "../api/Asset.h"
 #include "../api/Config.h"
-#include "../Resource.h"
 
 namespace crepe {
 
@@ -15,15 +15,15 @@ namespace crepe {
  * It loads a font from an Asset and manages its lifecycle. The font is automatically unloaded
  * when this object is destroyed.
  */
-class Font : public Resource{
+class Font : public Resource {
 public:
-    /**
+	/**
      * \param src The Asset containing the font file path and metadata to load the font.
      * \param mediator The Mediator object used for managing the SDL context or related systems.
      */
-    Font(const Asset & src, Mediator & mediator);
+	Font(const Asset & src, Mediator & mediator);
 
-    /**
+	/**
      * \brief Gets the underlying TTF_Font resource.
      * 
      * This function returns the raw pointer to the SDL_ttf TTF_Font object that represents
@@ -31,11 +31,11 @@ public:
      * 
      * \return The raw TTF_Font object wrapped in a unique pointer.
      */
-    TTF_Font* get_font() const;
+	TTF_Font * get_font() const;
 
 private:
-    //! The SDL_ttf font object with custom deleter.
-    std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)> font;
+	//! The SDL_ttf font object with custom deleter.
+	std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)> font;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 274c14a..cbb0f3b 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -32,8 +32,8 @@ using namespace std;
 SDLContext::SDLContext(Mediator & mediator) {
 	dbg_trace();
 	if (TTF_Init() == -1) {
-        throw runtime_error(format("SDL_ttf initialization failed: {}", TTF_GetError()));
-    }
+		throw runtime_error(format("SDL_ttf initialization failed: {}", TTF_GetError()));
+	}
 	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
 		throw runtime_error(format("SDLContext: SDL_Init error: {}", SDL_GetError()));
 	}
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index d7b8365..76cd99a 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -4,8 +4,8 @@
 #include <SDL2/SDL_keycode.h>
 #include <SDL2/SDL_rect.h>
 #include <SDL2/SDL_render.h>
-#include <SDL2/SDL_video.h>
 #include <SDL2/SDL_ttf.h>
+#include <SDL2/SDL_video.h>
 #include <cmath>
 #include <functional>
 #include <memory>
@@ -225,7 +225,6 @@ public:
 	void set_color_texture(const Texture & texture, const Color & color);
 
 private:
-
 	//! sdl Window
 	std::unique_ptr<SDL_Window, std::function<void(SDL_Window *)>> game_window;
 
diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
index 851016b..2bccac4 100644
--- a/src/crepe/facade/SDLFontContext.cpp
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -2,54 +2,52 @@
 
 #include "SDLFontContext.h"
 
-
 using namespace crepe;
 using namespace std;
 
-SDLFontContext::SDLFontContext(){
+SDLFontContext::SDLFontContext() {
 	if (!FcInit()) {
-            throw runtime_error("Failed to initialize Fontconfig.");
-    }
+		throw runtime_error("Failed to initialize Fontconfig.");
+	}
 }
 
-SDLFontContext::~SDLFontContext(){
-		FcFini();
-}
+SDLFontContext::~SDLFontContext() { FcFini(); }
 
 unique_ptr<Asset> SDLFontContext::get_font_asset(const string & font_family) {
-	
-    // Create a pattern to search for the font family
-    FcPattern* pattern = FcNameParse(reinterpret_cast<const FcChar8*>(font_family.c_str()));
-    if (!pattern) {
-        throw runtime_error("Failed to create font pattern.");
-    }
-
-    // Default configuration
-    FcConfig* config = FcConfigGetCurrent();
-    if (!config) {
-        FcPatternDestroy(pattern);
-        throw runtime_error("Failed to get current Fontconfig configuration.");
-    }
-
-    // Match the font pattern
-    FcResult result;
-    FcPattern* matched_pattern = FcFontMatch(config, pattern, &result);
-    FcPatternDestroy(pattern);
-
-    if (!matched_pattern) {
+
+	// Create a pattern to search for the font family
+	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
+	if (!pattern) {
+		throw runtime_error("Failed to create font pattern.");
+	}
+
+	// Default configuration
+	FcConfig * config = FcConfigGetCurrent();
+	if (!config) {
+		FcPatternDestroy(pattern);
+		throw runtime_error("Failed to get current Fontconfig configuration.");
+	}
+
+	// Match the font pattern
+	FcResult result;
+	FcPattern * matched_pattern = FcFontMatch(config, pattern, &result);
+	FcPatternDestroy(pattern);
+
+	if (!matched_pattern) {
 		FcPatternDestroy(matched_pattern);
-        throw runtime_error("No matching font found.");
-    }
-
-    // Extract the file path
-    FcChar8* file_path = nullptr;
-    if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch || !file_path) {
-        FcPatternDestroy(matched_pattern);
-        throw runtime_error("Failed to get font file path.");
-    }
-
-    // Convert the file path to a string
-    string font_file_path(reinterpret_cast<const char*>(file_path));
-    FcPatternDestroy(matched_pattern);
-    return move(make_unique<Asset>(font_file_path));
+		throw runtime_error("No matching font found.");
+	}
+
+	// Extract the file path
+	FcChar8 * file_path = nullptr;
+	if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch
+		|| !file_path) {
+		FcPatternDestroy(matched_pattern);
+		throw runtime_error("Failed to get font file path.");
+	}
+
+	// Convert the file path to a string
+	string font_file_path(reinterpret_cast<const char *>(file_path));
+	FcPatternDestroy(matched_pattern);
+	return move(make_unique<Asset>(font_file_path));
 }
diff --git a/src/crepe/facade/SDLFontContext.h b/src/crepe/facade/SDLFontContext.h
index c890b2d..b9e1f23 100644
--- a/src/crepe/facade/SDLFontContext.h
+++ b/src/crepe/facade/SDLFontContext.h
@@ -1,17 +1,17 @@
 #pragma once
 
-#include <memory>
 #include <SDL2/SDL_ttf.h>
 #include <fontconfig/fontconfig.h>
+#include <memory>
 
 #include "../api/Asset.h"
 
 namespace crepe {
-	class SDLFontContext{
-	public:
-		SDLFontContext();
-		~SDLFontContext();
-		/**
+class SDLFontContext {
+public:
+	SDLFontContext();
+	~SDLFontContext();
+	/**
 		 * 
 		 * \brief Facade function to convert a font_family into an asset.
 		 * 
@@ -19,8 +19,9 @@ namespace crepe {
 		 * 
 		 * \param font_family Name of the font family name.
 		 */
-		std::unique_ptr<Asset> get_font_asset(const std::string & font_family);
-	private:
-	};
+	std::unique_ptr<Asset> get_font_asset(const std::string & font_family);
+
+private:
+};
 
-}
+} // namespace crepe
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 52454a1..efd5a98 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -1,27 +1,27 @@
-#include <iostream>
-#include <exception>
-#include <memory>
-#include <crepe/facade/SDLFontContext.h>
 #include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
-#include <crepe/manager/Mediator.h>
 #include <crepe/facade/SDLContext.h>
+#include <crepe/facade/SDLFontContext.h>
+#include <crepe/manager/Mediator.h>
+#include <exception>
+#include <iostream>
+#include <memory>
 using namespace crepe;
 int main() {
-	
-    SDLFontContext font_facade;
+
+	SDLFontContext font_facade;
 	Mediator mediator;
 	SDLContext sdl_context{mediator};
-	try{
-		  // Correct way to create a unique pointer for Text
-    std::unique_ptr<Text> label = std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test","OpenSymbol");
-	std::unique_ptr<Asset> asset = font_facade.get_font_asset(label->font_family);
-	std::cout << "path: " << asset->get_path() << std::endl;
-	std::unique_ptr<Font> font = std::make_unique<Font>(*asset,mediator);
-	}catch (const std::exception& e) {
-    std::cout << "Standard exception thrown: " << e.what() << std::endl;
+	try {
+		// Correct way to create a unique pointer for Text
+		std::unique_ptr<Text> label
+			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test", "OpenSymbol");
+		std::unique_ptr<Asset> asset = font_facade.get_font_asset(label->font_family);
+		std::cout << "path: " << asset->get_path() << std::endl;
+		std::unique_ptr<Font> font = std::make_unique<Font>(*asset, mediator);
+	} catch (const std::exception & e) {
+		std::cout << "Standard exception thrown: " << e.what() << std::endl;
 	}
-  
 
-    return 0;
+	return 0;
 }
-- 
cgit v1.2.3


From cb8af2747fa6999d1a4b97c4785a9cfb37b535c4 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 12 Dec 2024 21:26:31 +0100
Subject: removed reference

---
 src/crepe/facade/SDLFontContext.cpp | 2 +-
 src/crepe/facade/SDLFontContext.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
index 2bccac4..1037ac4 100644
--- a/src/crepe/facade/SDLFontContext.cpp
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -13,7 +13,7 @@ SDLFontContext::SDLFontContext() {
 
 SDLFontContext::~SDLFontContext() { FcFini(); }
 
-unique_ptr<Asset> SDLFontContext::get_font_asset(const string & font_family) {
+unique_ptr<Asset> SDLFontContext::get_font_asset(const string font_family) {
 
 	// Create a pattern to search for the font family
 	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
diff --git a/src/crepe/facade/SDLFontContext.h b/src/crepe/facade/SDLFontContext.h
index b9e1f23..efeaa33 100644
--- a/src/crepe/facade/SDLFontContext.h
+++ b/src/crepe/facade/SDLFontContext.h
@@ -19,7 +19,7 @@ public:
 		 * 
 		 * \param font_family Name of the font family name.
 		 */
-	std::unique_ptr<Asset> get_font_asset(const std::string & font_family);
+	std::unique_ptr<Asset> get_font_asset(const std::string font_family);
 
 private:
 };
-- 
cgit v1.2.3


From 86e3dcbc1e5b2fe07d89d6cde21f4b9e687962fa Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 12 Dec 2024 21:49:39 +0100
Subject: fixed format

---
 src/crepe/facade/Font.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 85b0e13..a39af75 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -16,8 +16,7 @@ Font::Font(const Asset & src, Mediator & mediator)
 
 	// Check if font loading failed
 	if (!this->font) {
-		throw runtime_error(format("Failed to load font from path: {}"
-								   ". SDL_ttf error: {}",
+		throw runtime_error(format("Failed to load font from path: {}. SDL_ttf error: {}",
 								   font_path, TTF_GetError()));
 	}
 }
-- 
cgit v1.2.3


From aa1f1f9460fa713e00fd1830b08be743395110ce Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Sat, 14 Dec 2024 14:37:55 +0100
Subject: sdl_ttf to submodules + feedback changes

---
 .vscode/launch.json                 | 28 ++++++++++++++++++++++++++++
 mwe/events/include/event.h          |  2 +-
 readme.md                           |  1 +
 src/CMakeLists.txt                  |  4 ++--
 src/crepe/api/Text.cpp              |  3 ++-
 src/crepe/api/Text.h                |  4 ++--
 src/crepe/facade/Font.cpp           | 17 ++++++-----------
 src/crepe/facade/Font.h             |  2 +-
 src/crepe/facade/SDLFontContext.cpp |  4 ++--
 src/crepe/facade/SDLFontContext.h   |  6 +++++-
 src/example/loadfont.cpp            |  8 ++++----
 11 files changed, 54 insertions(+), 25 deletions(-)
 create mode 100644 .vscode/launch.json

(limited to 'src/crepe/facade')

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..07bd65f
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,28 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug test_main",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/src/build/test_main",  // Path to your executable
+            "args": [],  // Optional: add any arguments here if needed
+            "stopAtEntry": false,  // Set to true if you want to break at the entry point
+            "cwd": "${workspaceFolder}",  // Working directory for the program
+            "environment": [],
+            "externalConsole": false,  // Set to true to use an external console
+            "MIMode": "gdb",  // Use "lldb" if you're using LLDB instead of GDB
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ],
+            "miDebuggerPath": "/usr/bin/gdb",  // Path to gdb, adjust based on your system
+            "preLaunchTask": "",  // Optional: specify a pre-launch task like building your project
+            "sourceFileMap": {},
+            "logging": { "moduleLoad": false, "engineLogging": false }
+        }
+    ]
+}
diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index ee1bf52..e1b220b 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -148,7 +148,7 @@ private:
 };
 class ShutDownEvent : public Event {
 public:
-	ShutDownEvent() : Event("ShutDownEvent") {};
+	ShutDownEvent() : Event("ShutDownEvent"){};
 
 	REGISTER_EVENT_TYPE(ShutDownEvent)
 
diff --git a/readme.md b/readme.md
index d309b30..984a368 100644
--- a/readme.md
+++ b/readme.md
@@ -60,6 +60,7 @@ Then, follow these steps for each library you want to install:
    $ cd lib/googletest
    $ cd lib/sdl2
    $ cd lib/soloud/contrib
+   $ cd lib/sdl_ttf
    $ cd lib/sdl_image
    $ cd lib/sdl_ttf
    $ cd lib/whereami
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a525c74..696856c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ find_package(SoLoud REQUIRED)
 find_package(GTest REQUIRED)
 find_package(whereami REQUIRED)
 find_library(BERKELEY_DB db)
-find_package(Fontconfig REQUIRED)
+find_library(FONTCONFIG_LIB fontconfig)
 
 add_library(crepe SHARED)
 add_executable(test_main EXCLUDE_FROM_ALL)
@@ -30,7 +30,7 @@ target_link_libraries(crepe
 	PUBLIC SDL2_image
 	PUBLIC ${BERKELEY_DB}
 	PUBLIC whereami
-	PUBLIC ${Fontconfig_LIBRARIES}
+	PUBLIC ${FONTCONFIG_LIB}
 )
 
 add_subdirectory(crepe)
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index c072ee7..9de9038 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -3,7 +3,8 @@
 using namespace crepe;
 
 Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const std::string & text,
-		   const std::string & font_family)
+		   const std::string & font_family,const Data & data)
 	: UIObject(id, dimensions, offset),
 	  text(text),
+	  data(data),
 	  font_family(font_family) {}
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index 2ad1db3..96e1265 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -15,8 +15,6 @@ namespace crepe {
  */
 class Text : public UIObject {
 public:
-	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const std::string &,
-		 const std::string & font_family);
 	//! Text data that does not have to be set in the constructor
 	struct Data {
 		/**
@@ -41,6 +39,8 @@ public:
 	};
 
 public:
+	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const std::string &,
+		 const std::string & font_family, const Data& data);
 	//! font family name such as (Arial,Helvetica,Inter)
 	std::string font_family = "";
 	//! Label text.
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index a39af75..f111af9 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -8,17 +8,12 @@ using namespace crepe;
 Font::Font(const Asset & src, Mediator & mediator)
 	: Resource(src, mediator),
 	  font(nullptr, TTF_CloseFont) {
-	// Get the font file path from the Asset
-	const std::string font_path = src.get_path();
-
-	// Attempt to load the font
-	this->font.reset(TTF_OpenFont(font_path.c_str(), Config::get_instance().font.size));
-
-	// Check if font loading failed
-	if (!this->font) {
-		throw runtime_error(format("Failed to load font from path: {}. SDL_ttf error: {}",
-								   font_path, TTF_GetError()));
-	}
+	Config & config = Config::get_instance();
+	const std::string FONT_PATH = src.get_path();
+	TTF_Font * font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
+	if (font == NULL)
+		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
+	this->font = { font, [] (TTF_Font * font) { TTF_CloseFont(font); } };
 }
 
 TTF_Font * Font::get_font() const { return this->font.get(); }
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index 983ef31..f7d5b50 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -35,7 +35,7 @@ public:
 
 private:
 	//! The SDL_ttf font object with custom deleter.
-	std::unique_ptr<TTF_Font, decltype(&TTF_CloseFont)> font;
+	std::unique_ptr<TTF_Font, std::function<void(TTF_Font*)>> font;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
index 1037ac4..5123b3b 100644
--- a/src/crepe/facade/SDLFontContext.cpp
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -13,7 +13,7 @@ SDLFontContext::SDLFontContext() {
 
 SDLFontContext::~SDLFontContext() { FcFini(); }
 
-unique_ptr<Asset> SDLFontContext::get_font_asset(const string font_family) {
+Asset SDLFontContext::get_font_asset(const string font_family) {
 
 	// Create a pattern to search for the font family
 	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
@@ -49,5 +49,5 @@ unique_ptr<Asset> SDLFontContext::get_font_asset(const string font_family) {
 	// Convert the file path to a string
 	string font_file_path(reinterpret_cast<const char *>(file_path));
 	FcPatternDestroy(matched_pattern);
-	return move(make_unique<Asset>(font_file_path));
+	return Asset(font_file_path);
 }
diff --git a/src/crepe/facade/SDLFontContext.h b/src/crepe/facade/SDLFontContext.h
index efeaa33..cb3ca9d 100644
--- a/src/crepe/facade/SDLFontContext.h
+++ b/src/crepe/facade/SDLFontContext.h
@@ -11,6 +11,10 @@ class SDLFontContext {
 public:
 	SDLFontContext();
 	~SDLFontContext();
+	SDLFontContext(const SDLFontContext &) = delete;
+	SDLFontContext(SDLFontContext &&) = delete;
+	SDLFontContext & operator=(const SDLFontContext &) = delete;
+	SDLFontContext & operator=(SDLFontContext &&) = delete;
 	/**
 		 * 
 		 * \brief Facade function to convert a font_family into an asset.
@@ -19,7 +23,7 @@ public:
 		 * 
 		 * \param font_family Name of the font family name.
 		 */
-	std::unique_ptr<Asset> get_font_asset(const std::string font_family);
+	Asset get_font_asset(const std::string font_family);
 
 private:
 };
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 3cbe559..a52e7f0 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -15,10 +15,10 @@ int main() {
 	try {
 		// Correct way to create a unique pointer for Text
 		std::unique_ptr<Text> label
-			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test", "OpenSymbol");
-		std::unique_ptr<Asset> asset = font_facade.get_font_asset(label->font_family);
-		std::cout << "path: " << asset->get_path() << std::endl;
-		std::unique_ptr<Font> font = std::make_unique<Font>(*asset, mediator);
+			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test", "OpenSymbol",Text::Data{});
+		Asset asset = font_facade.get_font_asset(label->font_family);
+		std::cout << "path: " << asset.get_path() << std::endl;
+		std::unique_ptr<Font> font = std::make_unique<Font>(asset, mediator);
 		// Get the TTF_Font from the Font object
 		TTF_Font* ttf_font = font->get_font();
 
-- 
cgit v1.2.3


From fda61be91cd8667fa2b51e3b8a17ba6b93b728c8 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Sat, 14 Dec 2024 14:45:10 +0100
Subject: feedback changes

---
 src/crepe/facade/SDLContext.cpp     | 3 ++-
 src/crepe/facade/SDLContext.h       | 1 -
 src/crepe/facade/SDLFontContext.cpp | 8 ++++----
 src/example/loadfont.cpp            | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index cbb0f3b..47dda81 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -7,6 +7,7 @@
 #include <SDL2/SDL_render.h>
 #include <SDL2/SDL_surface.h>
 #include <SDL2/SDL_video.h>
+#include <SDL2/SDL_ttf.h>
 #include <array>
 #include <cmath>
 #include <cstddef>
@@ -75,8 +76,8 @@ SDLContext::~SDLContext() {
 	// thread that SDL_Init() was called on? This has caused problems for me
 	// before.
 	IMG_Quit();
-	SDL_Quit();
 	TTF_Quit();
+	SDL_Quit();
 }
 
 Keycode SDLContext::sdl_to_keycode(SDL_Keycode sdl_key) {
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 76cd99a..efdd6fe 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -4,7 +4,6 @@
 #include <SDL2/SDL_keycode.h>
 #include <SDL2/SDL_rect.h>
 #include <SDL2/SDL_render.h>
-#include <SDL2/SDL_ttf.h>
 #include <SDL2/SDL_video.h>
 #include <cmath>
 #include <functional>
diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
index 5123b3b..e0b9a89 100644
--- a/src/crepe/facade/SDLFontContext.cpp
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -17,13 +17,13 @@ Asset SDLFontContext::get_font_asset(const string font_family) {
 
 	// Create a pattern to search for the font family
 	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
-	if (!pattern) {
+	if (pattern == NULL) {
 		throw runtime_error("Failed to create font pattern.");
 	}
 
 	// Default configuration
 	FcConfig * config = FcConfigGetCurrent();
-	if (!config) {
+	if (config == NULL) {
 		FcPatternDestroy(pattern);
 		throw runtime_error("Failed to get current Fontconfig configuration.");
 	}
@@ -33,7 +33,7 @@ Asset SDLFontContext::get_font_asset(const string font_family) {
 	FcPattern * matched_pattern = FcFontMatch(config, pattern, &result);
 	FcPatternDestroy(pattern);
 
-	if (!matched_pattern) {
+	if (matched_pattern == NULL) {
 		FcPatternDestroy(matched_pattern);
 		throw runtime_error("No matching font found.");
 	}
@@ -41,7 +41,7 @@ Asset SDLFontContext::get_font_asset(const string font_family) {
 	// Extract the file path
 	FcChar8 * file_path = nullptr;
 	if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch
-		|| !file_path) {
+		|| file_path == NULL) {
 		FcPatternDestroy(matched_pattern);
 		throw runtime_error("Failed to get font file path.");
 	}
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index a52e7f0..6020908 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -21,7 +21,8 @@ int main() {
 		std::unique_ptr<Font> font = std::make_unique<Font>(asset, mediator);
 		// Get the TTF_Font from the Font object
 		TTF_Font* ttf_font = font->get_font();
-
+		//example if the asset is not correct for font
+		//std::unique_ptr<Font> fontThrow = std::make_unique<Font>(Asset("../help.txt"), mediator);
 		// Check if the font is loaded properly
 		if (ttf_font != nullptr) {
 			std::cout << "Font successfully loaded!" << std::endl;
-- 
cgit v1.2.3


From 9579f2a385de42cf74d50038c79a58c14eb0d980 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Sat, 14 Dec 2024 14:45:28 +0100
Subject: make format

---
 src/crepe/api/Text.cpp          | 4 ++--
 src/crepe/api/Text.h            | 4 ++--
 src/crepe/facade/Font.cpp       | 2 +-
 src/crepe/facade/Font.h         | 2 +-
 src/crepe/facade/SDLContext.cpp | 2 +-
 src/example/loadfont.cpp        | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 9de9038..568af7f 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -2,8 +2,8 @@
 
 using namespace crepe;
 
-Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const std::string & text,
-		   const std::string & font_family,const Data & data)
+Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
+		   const std::string & text, const std::string & font_family, const Data & data)
 	: UIObject(id, dimensions, offset),
 	  text(text),
 	  data(data),
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index 96e1265..64b2008 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -39,8 +39,8 @@ public:
 	};
 
 public:
-	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const std::string &,
-		 const std::string & font_family, const Data& data);
+	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
+		 const std::string &, const std::string & font_family, const Data & data);
 	//! font family name such as (Arial,Helvetica,Inter)
 	std::string font_family = "";
 	//! Label text.
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index f111af9..1ee3de1 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -13,7 +13,7 @@ Font::Font(const Asset & src, Mediator & mediator)
 	TTF_Font * font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
 	if (font == NULL)
 		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
-	this->font = { font, [] (TTF_Font * font) { TTF_CloseFont(font); } };
+	this->font = {font, [](TTF_Font * font) { TTF_CloseFont(font); }};
 }
 
 TTF_Font * Font::get_font() const { return this->font.get(); }
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index f7d5b50..e93bfe9 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -35,7 +35,7 @@ public:
 
 private:
 	//! The SDL_ttf font object with custom deleter.
-	std::unique_ptr<TTF_Font, std::function<void(TTF_Font*)>> font;
+	std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>> font;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 47dda81..d1d109c 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -6,8 +6,8 @@
 #include <SDL2/SDL_rect.h>
 #include <SDL2/SDL_render.h>
 #include <SDL2/SDL_surface.h>
-#include <SDL2/SDL_video.h>
 #include <SDL2/SDL_ttf.h>
+#include <SDL2/SDL_video.h>
 #include <array>
 #include <cmath>
 #include <cstddef>
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 6020908..dae64bc 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -14,13 +14,13 @@ int main() {
 	SDLContext sdl_context{mediator};
 	try {
 		// Correct way to create a unique pointer for Text
-		std::unique_ptr<Text> label
-			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test", "OpenSymbol",Text::Data{});
+		std::unique_ptr<Text> label = std::make_unique<Text>(
+			1, vec2(100, 100), vec2(0, 0), "test test", "OpenSymbol", Text::Data{});
 		Asset asset = font_facade.get_font_asset(label->font_family);
 		std::cout << "path: " << asset.get_path() << std::endl;
 		std::unique_ptr<Font> font = std::make_unique<Font>(asset, mediator);
 		// Get the TTF_Font from the Font object
-		TTF_Font* ttf_font = font->get_font();
+		TTF_Font * ttf_font = font->get_font();
 		//example if the asset is not correct for font
 		//std::unique_ptr<Font> fontThrow = std::make_unique<Font>(Asset("../help.txt"), mediator);
 		// Check if the font is loaded properly
-- 
cgit v1.2.3


From fa0d298afafdc81d00164765903161205cf09a7e Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 14 Dec 2024 16:24:08 +0100
Subject: move DB fix from `loek/doxygen` to `loek/savemgr`

---
 src/crepe/facade/DB.cpp           | 13 ++-----
 src/crepe/facade/DB.h             |  2 -
 src/crepe/manager/SaveManager.cpp | 49 ++++++++++++------------
 src/crepe/manager/SaveManager.h   |  6 +--
 src/doc/feature/proxy.dox         | 43 +++++++++++++++++++++
 src/doc/feature/savemgr.dox       | 80 +++++++++++++++++++++++++++++++++++++++
 src/test/DBTest.cpp               |  9 +++++
 src/test/SaveManagerTest.cpp      | 17 +++++++--
 src/test/main.cpp                 |  3 +-
 9 files changed, 179 insertions(+), 43 deletions(-)
 create mode 100644 src/doc/feature/proxy.dox
 create mode 100644 src/doc/feature/savemgr.dox

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/DB.cpp b/src/crepe/facade/DB.cpp
index 95cf606..2232a21 100644
--- a/src/crepe/facade/DB.cpp
+++ b/src/crepe/facade/DB.cpp
@@ -21,12 +21,6 @@ DB::DB(const string & path) {
 	const char * file = path.empty() ? NULL : path.c_str();
 	ret = this->db->open(this->db.get(), NULL, file, NULL, libdb::DB_BTREE, DB_CREATE, 0);
 	if (ret != 0) throw runtime_error(format("db->open: {}", libdb::db_strerror(ret)));
-
-	// create cursor
-	libdb::DBC * cursor;
-	ret = this->db->cursor(this->db.get(), NULL, &cursor, 0);
-	if (ret != 0) throw runtime_error(format("db->cursor: {}", libdb::db_strerror(ret)));
-	this->cursor = {cursor, [](libdb::DBC * cursor) { cursor->close(cursor); }};
 }
 
 libdb::DBT DB::to_thing(const string & thing) const noexcept {
@@ -42,10 +36,10 @@ string DB::get(const string & key) {
 	libdb::DBT db_val;
 	memset(&db_val, 0, sizeof(libdb::DBT));
 
-	int ret = this->cursor->get(this->cursor.get(), &db_key, &db_val, DB_FIRST);
+	int ret = this->db->get(this->db.get(), NULL, &db_key, &db_val, 0);
 	if (ret == 0) return {static_cast<char *>(db_val.data), db_val.size};
 
-	string err = format("cursor->get: {}", libdb::db_strerror(ret));
+	string err = format("db->get: {}", libdb::db_strerror(ret));
 	if (ret == DB_NOTFOUND) throw out_of_range(err);
 	else throw runtime_error(err);
 }
@@ -54,7 +48,7 @@ void DB::set(const string & key, const string & value) {
 	libdb::DBT db_key = this->to_thing(key);
 	libdb::DBT db_val = this->to_thing(value);
 	int ret = this->db->put(this->db.get(), NULL, &db_key, &db_val, 0);
-	if (ret != 0) throw runtime_error(format("cursor->get: {}", libdb::db_strerror(ret)));
+	if (ret != 0) throw runtime_error(format("db->get: {}", libdb::db_strerror(ret)));
 }
 
 bool DB::has(const std::string & key) {
@@ -65,3 +59,4 @@ bool DB::has(const std::string & key) {
 	}
 	return true;
 }
+
diff --git a/src/crepe/facade/DB.h b/src/crepe/facade/DB.h
index 115c0f1..84cdf19 100644
--- a/src/crepe/facade/DB.h
+++ b/src/crepe/facade/DB.h
@@ -61,8 +61,6 @@ public:
 private:
 	//! RAII wrapper around \c DB struct
 	std::unique_ptr<libdb::DB, std::function<void(libdb::DB *)>> db;
-	//! RAII wrapper around \c DBC struct
-	std::unique_ptr<libdb::DBC, std::function<void(libdb::DBC *)>> cursor;
 
 private:
 	/**
diff --git a/src/crepe/manager/SaveManager.cpp b/src/crepe/manager/SaveManager.cpp
index 691ea2f..f313ed2 100644
--- a/src/crepe/manager/SaveManager.cpp
+++ b/src/crepe/manager/SaveManager.cpp
@@ -128,10 +128,33 @@ template void SaveManager::set(const string &, const int64_t &);
 template void SaveManager::set(const string &, const float &);
 template void SaveManager::set(const string &, const double &);
 
+template <typename T>
+T SaveManager::get(const string & key) {
+	return this->deserialize<T>(this->get_db().get(key));
+}
+template uint8_t SaveManager::get(const string &);
+template int8_t SaveManager::get(const string &);
+template uint16_t SaveManager::get(const string &);
+template int16_t SaveManager::get(const string &);
+template uint32_t SaveManager::get(const string &);
+template int32_t SaveManager::get(const string &);
+template uint64_t SaveManager::get(const string &);
+template int64_t SaveManager::get(const string &);
+template float SaveManager::get(const string &);
+template double SaveManager::get(const string &);
+template string SaveManager::get(const string &);
+
 template <typename T>
 ValueBroker<T> SaveManager::get(const string & key, const T & default_value) {
 	if (!this->has(key)) this->set<T>(key, default_value);
-	return this->get<T>(key);
+	T value;
+	return {
+		[this, key](const T & target) { this->set<T>(key, target); },
+		[this, key, value]() mutable -> const T & {
+			value = this->get<T>(key);
+			return value;
+		},
+	};
 }
 template ValueBroker<uint8_t> SaveManager::get(const string &, const uint8_t &);
 template ValueBroker<int8_t> SaveManager::get(const string &, const int8_t &);
@@ -144,27 +167,3 @@ template ValueBroker<int64_t> SaveManager::get(const string &, const int64_t &);
 template ValueBroker<float> SaveManager::get(const string &, const float &);
 template ValueBroker<double> SaveManager::get(const string &, const double &);
 template ValueBroker<string> SaveManager::get(const string &, const string &);
-
-template <typename T>
-ValueBroker<T> SaveManager::get(const string & key) {
-	T value;
-	return {
-		[this, key](const T & target) { this->set<T>(key, target); },
-		[this, key, value]() mutable -> const T & {
-			DB & db = this->get_db();
-			value = this->deserialize<T>(db.get(key));
-			return value;
-		},
-	};
-}
-template ValueBroker<uint8_t> SaveManager::get(const string &);
-template ValueBroker<int8_t> SaveManager::get(const string &);
-template ValueBroker<uint16_t> SaveManager::get(const string &);
-template ValueBroker<int16_t> SaveManager::get(const string &);
-template ValueBroker<uint32_t> SaveManager::get(const string &);
-template ValueBroker<int32_t> SaveManager::get(const string &);
-template ValueBroker<uint64_t> SaveManager::get(const string &);
-template ValueBroker<int64_t> SaveManager::get(const string &);
-template ValueBroker<float> SaveManager::get(const string &);
-template ValueBroker<double> SaveManager::get(const string &);
-template ValueBroker<string> SaveManager::get(const string &);
diff --git a/src/crepe/manager/SaveManager.h b/src/crepe/manager/SaveManager.h
index 61a978d..1e34bc0 100644
--- a/src/crepe/manager/SaveManager.h
+++ b/src/crepe/manager/SaveManager.h
@@ -36,17 +36,17 @@ public:
 	ValueBroker<T> get(const std::string & key, const T & default_value);
 
 	/**
-	 * \brief Get a read/write reference to a value
+	 * \brief Get a value directly
 	 *
 	 * \param key  The value key
 	 *
-	 * \return Read/write reference to the value
+	 * \return The value
 	 *
 	 * \note Attempting to read this value before it is initialized (i.e. set) will result in an
 	 * exception
 	 */
 	template <typename T>
-	ValueBroker<T> get(const std::string & key);
+	T get(const std::string & key);
 
 	/**
 	 * \brief Set a value directly
diff --git a/src/doc/feature/proxy.dox b/src/doc/feature/proxy.dox
new file mode 100644
index 0000000..66bbd2f
--- /dev/null
+++ b/src/doc/feature/proxy.dox
@@ -0,0 +1,43 @@
+// vim:ft=doxygen
+namespace crepe {
+/**
+
+\defgroup feature_proxy Proxy utility
+\ingroup feature
+\brief Use ValueBroker as if it were a regular variable
+
+Proxy provides operators that allow you to use a ValueBroker instance as if it
+were a regular variable. Proxy implements a constructor that allows it to be
+used as a substitute return type for any function that returns ValueBroker.
+
+\see ValueBroker
+\see Proxy
+
+\par Example
+
+```cpp
+#include <crepe/util/Proxy.h>
+#include <crepe/ValueBroker.h>
+
+int calculation(int value) {
+	return 3 * value;
+}
+
+void anywhere() {
+	crepe::ValueBroker<int> foo_handle;
+	crepe::Proxy foo = foo_handle;
+
+	// implicitly calls .set()
+	foo += 10;
+
+	// implicitly calls .get()
+	int out = calculation(foo);
+
+	// explicitly cast (also calls .get())
+	int casted = int(foo);
+}
+
+```
+
+*/
+}
diff --git a/src/doc/feature/savemgr.dox b/src/doc/feature/savemgr.dox
new file mode 100644
index 0000000..6aeab03
--- /dev/null
+++ b/src/doc/feature/savemgr.dox
@@ -0,0 +1,80 @@
+// vim:ft=doxygen
+namespace crepe {
+/**
+
+\defgroup feature_savemgr Save data
+\ingroup feature
+\brief Functions to persistently store and retrieve arbitrary values
+
+The SaveManager may be used to persistently store game state such as player
+progress, statistics, achievements, etc. It works like a key-value store, where
+the key is a string and the value is an arbitrary type.
+
+SaveManager implements the following:
+
+- Storage and retrieval of primitive types and strings.
+- Automatic initialization of the database using default values.
+- The underlying database format is journaled, which reduces the likelihood of
+	players losing save data when an unexpected crash occurs while the SaveManager
+	is writing to disk.
+
+\see SaveManager
+
+\par Example
+
+The SaveManager instance reference may be retrieved by calling \c
+get_save_manager(). This function is available---
+
+- Within (derivatives of) Script
+
+- \todo Within (derivatives of) Scene
+
+- \todo As a public member function of LoopManager
+
+```cpp
+// Retrieve save manager
+crepe::SaveManager & save_manager = get_save_manager();
+```
+
+SaveManager may be used *explicitly*, using the \ref SaveManager::set "set()",
+\ref SaveManager::get "get()" and  \ref SaveManager::has "has()" methods:
+```cpp
+// Check if the key "foo" exists, and initialize it to 3 if it doesn't
+if (!save_manager.has("foo"))
+	save_manager.set<int>("foo", 3);
+// Get value of key "foo"
+int foo = save_manager.get<int>("foo");
+
+// ~~~ arbitrary game code ~~~
+foo += 10;
+// ~~~ arbitrary game code ~~~
+
+// Save "foo" back to database
+save_manager.set<int>("foo", foo);
+```
+
+Alternatively, SaveManager::get may be called with a default value as second
+parameter. This changes its return type to ValueBroker, which acts as a
+read/write handle to the specific key requested, and remembers the key and its
+value type for you:
+```cpp
+// Get a read/write handle to the value stored in key "foo", and initialize it
+// to 3 if it doesn't exist yet
+ValueBroker foo_handle = save_manager.get<int>("foo", 3);
+int foo = foo_handle.get();
+
+// ~~~ arbitrary game code ~~~
+foo += 10;
+// ~~~ arbitrary game code ~~~
+
+// Save back to database
+foo_handle.set(foo);
+```
+
+To further simplify game code, the return value of SaveManager::get may be
+implicitly cast to Proxy instead of ValueBroker. This allows the database value
+to be used as if it were a regular variable. This usage is detailed separately
+in \"\ref feature_proxy\".
+
+*/
+}
diff --git a/src/test/DBTest.cpp b/src/test/DBTest.cpp
index 99dedff..0c98e10 100644
--- a/src/test/DBTest.cpp
+++ b/src/test/DBTest.cpp
@@ -27,3 +27,12 @@ TEST_F(DBTest, Has) {
 	db.set("foo", "bar");
 	EXPECT_EQ(db.has("foo"), true);
 }
+
+TEST_F(DBTest, MultipleKeys) {
+	db.set("foo", "foo");
+	db.set("bar", "bar");
+
+	EXPECT_EQ(db.get("foo"), "foo");
+	EXPECT_EQ(db.get("bar"), "bar");
+}
+
diff --git a/src/test/SaveManagerTest.cpp b/src/test/SaveManagerTest.cpp
index e9b0c29..7609e69 100644
--- a/src/test/SaveManagerTest.cpp
+++ b/src/test/SaveManagerTest.cpp
@@ -27,8 +27,8 @@ TEST_F(SaveManagerTest, ReadWrite) {
 	mgr.set<string>("foo", "bar");
 	ASSERT_TRUE(mgr.has("foo"));
 
-	ValueBroker value = mgr.get<string>("foo");
-	EXPECT_EQ(value.get(), "bar");
+	string value = mgr.get<string>("foo");
+	EXPECT_EQ(value, "bar");
 }
 
 TEST_F(SaveManagerTest, DefaultValue) {
@@ -36,5 +36,16 @@ TEST_F(SaveManagerTest, DefaultValue) {
 
 	ASSERT_EQ(value.get(), 3);
 	value.set(5);
-	ASSERT_EQ(value.get(), 5);
+	EXPECT_EQ(value.get(), 5);
+}
+
+TEST_F(SaveManagerTest, MultipleKeys) {
+	ValueBroker foo = mgr.get<int>("foo", 1);
+	ValueBroker bar = mgr.get<int>("bar", 2);
+
+	EXPECT_EQ(foo.get(), 1);
+	EXPECT_EQ(bar.get(), 2);
+
+	EXPECT_EQ(mgr.get<int>("foo"), 1);
+	EXPECT_EQ(mgr.get<int>("bar"), 2);
 }
diff --git a/src/test/main.cpp b/src/test/main.cpp
index ed2aed5..0e1bc75 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -1,6 +1,7 @@
-#include <crepe/api/Config.h>
 #include <gtest/gtest.h>
 
+#include <crepe/api/Config.h>
+
 using namespace crepe;
 using namespace testing;
 
-- 
cgit v1.2.3


From 154ed5353ef18eb46cc31744e8bf1bc54afd5acc Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 14 Dec 2024 16:24:25 +0100
Subject: `make format`

---
 src/crepe/facade/DB.cpp | 1 -
 src/test/DBTest.cpp     | 1 -
 2 files changed, 2 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/DB.cpp b/src/crepe/facade/DB.cpp
index 2232a21..ae2d4bc 100644
--- a/src/crepe/facade/DB.cpp
+++ b/src/crepe/facade/DB.cpp
@@ -59,4 +59,3 @@ bool DB::has(const std::string & key) {
 	}
 	return true;
 }
-
diff --git a/src/test/DBTest.cpp b/src/test/DBTest.cpp
index 0c98e10..7f2c339 100644
--- a/src/test/DBTest.cpp
+++ b/src/test/DBTest.cpp
@@ -35,4 +35,3 @@ TEST_F(DBTest, MultipleKeys) {
 	EXPECT_EQ(db.get("foo"), "foo");
 	EXPECT_EQ(db.get("bar"), "bar");
 }
-
-- 
cgit v1.2.3


From 7f7f1237532b4318361e69349cc38f34fe981803 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 16 Dec 2024 18:28:56 +0100
Subject: headers to c file change

---
 src/crepe/facade/SDLFontContext.cpp | 2 ++
 src/crepe/facade/SDLFontContext.h   | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
index e0b9a89..45d70cb 100644
--- a/src/crepe/facade/SDLFontContext.cpp
+++ b/src/crepe/facade/SDLFontContext.cpp
@@ -1,4 +1,6 @@
 #include <stdexcept>
+#include <SDL2/SDL_ttf.h>
+#include <fontconfig/fontconfig.h>
 
 #include "SDLFontContext.h"
 
diff --git a/src/crepe/facade/SDLFontContext.h b/src/crepe/facade/SDLFontContext.h
index cb3ca9d..d15e1a3 100644
--- a/src/crepe/facade/SDLFontContext.h
+++ b/src/crepe/facade/SDLFontContext.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <SDL2/SDL_ttf.h>
-#include <fontconfig/fontconfig.h>
+
 #include <memory>
 
 #include "../api/Asset.h"
@@ -25,7 +24,6 @@ public:
 		 */
 	Asset get_font_asset(const std::string font_family);
 
-private:
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From 55f4aaf179cf723c5b703b0c4d848bf059ae190a Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 16 Dec 2024 19:08:22 +0100
Subject: font family implemented in the text component

---
 src/crepe/api/Text.cpp              |  8 ++++--
 src/crepe/api/Text.h                | 17 +++++++++---
 src/crepe/facade/CMakeLists.txt     |  4 +--
 src/crepe/facade/FontFacade.cpp     | 50 +++++++++++++++++++++++++++++++++
 src/crepe/facade/FontFacade.h       | 28 +++++++++++++++++++
 src/crepe/facade/SDLFontContext.cpp | 55 -------------------------------------
 src/crepe/facade/SDLFontContext.h   | 29 -------------------
 src/example/loadfont.cpp            | 21 ++++----------
 8 files changed, 105 insertions(+), 107 deletions(-)
 create mode 100644 src/crepe/facade/FontFacade.cpp
 create mode 100644 src/crepe/facade/FontFacade.h
 delete mode 100644 src/crepe/facade/SDLFontContext.cpp
 delete mode 100644 src/crepe/facade/SDLFontContext.h

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 568af7f..e6db140 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -1,10 +1,14 @@
+#include "../facade/FontFacade.h"
+
 #include "Text.h"
 
+
 using namespace crepe;
 
 Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
 		   const std::string & text, const std::string & font_family, const Data & data)
 	: UIObject(id, dimensions, offset),
 	  text(text),
-	  data(data),
-	  font_family(font_family) {}
+	  data(data), 
+	  font(FontFacade::get_font_asset(font_family)) {
+}
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index 64b2008..13b4375 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -5,6 +5,7 @@
 #include "../Component.h"
 
 #include "Color.h"
+#include "Asset.h"
 #include "UIObject.h"
 
 namespace crepe {
@@ -39,13 +40,21 @@ public:
 	};
 
 public:
+	/**
+	 * 
+	 * \param dimensions Width and height of the UIObject.
+	 * \param offset Offset of the UIObject relative to its transform
+	 * \param text The text to be displayed.
+	 * \param font_family The font style name to be displayed.
+	 * \param data Data struct containing extra text parameters.
+	 */
 	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
-		 const std::string &, const std::string & font_family, const Data & data);
-	//! font family name such as (Arial,Helvetica,Inter)
-	std::string font_family = "";
+		 const std::string & text, const std::string & font_family, const Data & data);
 	//! Label text.
 	std::string text = "";
-	// Data instance for data not gotten from constructor
+	//! Font asset variable
+	Asset font;
+	//! Data instance
 	Data data;
 };
 
diff --git a/src/crepe/facade/CMakeLists.txt b/src/crepe/facade/CMakeLists.txt
index e61b680..243ae46 100644
--- a/src/crepe/facade/CMakeLists.txt
+++ b/src/crepe/facade/CMakeLists.txt
@@ -4,7 +4,7 @@ target_sources(crepe PUBLIC
 	SoundContext.cpp
 	SDLContext.cpp
 	DB.cpp
-	SDLFontContext.cpp
+	FontFacade.cpp
 	Font.cpp
 )
 
@@ -14,7 +14,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	SoundContext.h
 	SDLContext.h
 	DB.h
-	SDLFontContext.h
+	FontFacade.h
 	Font.h
 )
 
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
new file mode 100644
index 0000000..12e10ed
--- /dev/null
+++ b/src/crepe/facade/FontFacade.cpp
@@ -0,0 +1,50 @@
+#include <stdexcept>
+#include <SDL2/SDL_ttf.h>
+#include <fontconfig/fontconfig.h>
+
+#include "FontFacade.h"
+
+using namespace crepe;
+using namespace std;
+
+Asset FontFacade::get_font_asset(const string font_family) {
+	if (!FcInit()) {
+		throw runtime_error("Failed to initialize Fontconfig.");
+	}
+	// Create a pattern to search for the font family
+	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
+	if (pattern == NULL) {
+		throw runtime_error("Failed to create font pattern.");
+	}
+
+	// Default configuration
+	FcConfig * config = FcConfigGetCurrent();
+	if (config == NULL) {
+		FcPatternDestroy(pattern);
+		throw runtime_error("Failed to get current Fontconfig configuration.");
+	}
+
+	// Match the font pattern
+	FcResult result;
+	FcPattern * matched_pattern = FcFontMatch(config, pattern, &result);
+	FcPatternDestroy(pattern);
+
+	if (matched_pattern == NULL) {
+		FcPatternDestroy(matched_pattern);
+		throw runtime_error("No matching font found.");
+	}
+
+	// Extract the file path
+	FcChar8 * file_path = nullptr;
+	if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch
+		|| file_path == NULL) {
+		FcPatternDestroy(matched_pattern);
+		throw runtime_error("Failed to get font file path.");
+	}
+
+	// Convert the file path to a string
+	string font_file_path(reinterpret_cast<const char *>(file_path));
+	FcPatternDestroy(matched_pattern);
+	FcFini();
+	return Asset(font_file_path);
+}
diff --git a/src/crepe/facade/FontFacade.h b/src/crepe/facade/FontFacade.h
new file mode 100644
index 0000000..1b835d4
--- /dev/null
+++ b/src/crepe/facade/FontFacade.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <memory>
+
+#include "../api/Asset.h"
+
+namespace crepe {
+
+/**
+ * 
+ * \brief Font facade class for converting font family names to absolute file paths
+ * 
+ */
+class FontFacade {
+public:
+	/**
+	 * 
+	 * \brief Facade function to convert a font_family into an asset.
+	 * 
+	 * This function uses the FontConfig library to convert a font family name (Arial, Inter, Helvetica) and converts it to the font source path.
+	 * This function is static so the member function can be used without create a FontFacade object. This way it can be used in a constructor as FontFacade::get_font_asset().
+	 * \param font_family Name of the font family name.
+	 * \return Asset with filepath to the font.
+	 */
+	 static Asset get_font_asset(const std::string font_family);
+};
+
+} // namespace crepe
diff --git a/src/crepe/facade/SDLFontContext.cpp b/src/crepe/facade/SDLFontContext.cpp
deleted file mode 100644
index 45d70cb..0000000
--- a/src/crepe/facade/SDLFontContext.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <stdexcept>
-#include <SDL2/SDL_ttf.h>
-#include <fontconfig/fontconfig.h>
-
-#include "SDLFontContext.h"
-
-using namespace crepe;
-using namespace std;
-
-SDLFontContext::SDLFontContext() {
-	if (!FcInit()) {
-		throw runtime_error("Failed to initialize Fontconfig.");
-	}
-}
-
-SDLFontContext::~SDLFontContext() { FcFini(); }
-
-Asset SDLFontContext::get_font_asset(const string font_family) {
-
-	// Create a pattern to search for the font family
-	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
-	if (pattern == NULL) {
-		throw runtime_error("Failed to create font pattern.");
-	}
-
-	// Default configuration
-	FcConfig * config = FcConfigGetCurrent();
-	if (config == NULL) {
-		FcPatternDestroy(pattern);
-		throw runtime_error("Failed to get current Fontconfig configuration.");
-	}
-
-	// Match the font pattern
-	FcResult result;
-	FcPattern * matched_pattern = FcFontMatch(config, pattern, &result);
-	FcPatternDestroy(pattern);
-
-	if (matched_pattern == NULL) {
-		FcPatternDestroy(matched_pattern);
-		throw runtime_error("No matching font found.");
-	}
-
-	// Extract the file path
-	FcChar8 * file_path = nullptr;
-	if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch
-		|| file_path == NULL) {
-		FcPatternDestroy(matched_pattern);
-		throw runtime_error("Failed to get font file path.");
-	}
-
-	// Convert the file path to a string
-	string font_file_path(reinterpret_cast<const char *>(file_path));
-	FcPatternDestroy(matched_pattern);
-	return Asset(font_file_path);
-}
diff --git a/src/crepe/facade/SDLFontContext.h b/src/crepe/facade/SDLFontContext.h
deleted file mode 100644
index d15e1a3..0000000
--- a/src/crepe/facade/SDLFontContext.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-
-#include <memory>
-
-#include "../api/Asset.h"
-
-namespace crepe {
-class SDLFontContext {
-public:
-	SDLFontContext();
-	~SDLFontContext();
-	SDLFontContext(const SDLFontContext &) = delete;
-	SDLFontContext(SDLFontContext &&) = delete;
-	SDLFontContext & operator=(const SDLFontContext &) = delete;
-	SDLFontContext & operator=(SDLFontContext &&) = delete;
-	/**
-		 * 
-		 * \brief Facade function to convert a font_family into an asset.
-		 * 
-		 * This function uses the FontConfig library to convert a font family name (Arial, Inter, Helvetica) and converts it to the font source path.
-		 * 
-		 * \param font_family Name of the font family name.
-		 */
-	Asset get_font_asset(const std::string font_family);
-
-};
-
-} // namespace crepe
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index dae64bc..0ea6d86 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -1,7 +1,6 @@
 #include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
 #include <crepe/facade/SDLContext.h>
-#include <crepe/facade/SDLFontContext.h>
 #include <crepe/manager/Mediator.h>
 #include <exception>
 #include <iostream>
@@ -9,26 +8,18 @@
 using namespace crepe;
 int main() {
 
-	SDLFontContext font_facade;
+	// SDLFontContext font_facade;
 	Mediator mediator;
 	SDLContext sdl_context{mediator};
 	try {
 		// Correct way to create a unique pointer for Text
 		std::unique_ptr<Text> label = std::make_unique<Text>(
 			1, vec2(100, 100), vec2(0, 0), "test test", "OpenSymbol", Text::Data{});
-		Asset asset = font_facade.get_font_asset(label->font_family);
-		std::cout << "path: " << asset.get_path() << std::endl;
-		std::unique_ptr<Font> font = std::make_unique<Font>(asset, mediator);
-		// Get the TTF_Font from the Font object
-		TTF_Font * ttf_font = font->get_font();
-		//example if the asset is not correct for font
-		//std::unique_ptr<Font> fontThrow = std::make_unique<Font>(Asset("../help.txt"), mediator);
-		// Check if the font is loaded properly
-		if (ttf_font != nullptr) {
-			std::cout << "Font successfully loaded!" << std::endl;
-		} else {
-			std::cout << "Failed to load font." << std::endl;
-		}
+		std::cout << "Path: " << label->font.get_path() << std::endl;
+
+		std::unique_ptr<Text> label2 = std::make_unique<Text>(
+			1, vec2(100, 100), vec2(0, 0), "test test", "fsaafdafsdafsdafsdasfdds", Text::Data{});
+		std::cout << "Path: " << label2->font.get_path() << std::endl;
 	} catch (const std::exception & e) {
 		std::cout << "Standard exception thrown: " << e.what() << std::endl;
 	}
-- 
cgit v1.2.3


From 56342ffab9daade7802b015ac83b9c47a8b9b18b Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 16 Dec 2024 19:36:40 +0100
Subject: make format

---
 src/crepe/api/Text.cpp          | 6 ++----
 src/crepe/api/Text.h            | 2 +-
 src/crepe/facade/FontFacade.cpp | 2 +-
 src/crepe/facade/FontFacade.h   | 2 +-
 src/example/loadfont.cpp        | 5 +++--
 5 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index e6db140..5b2befe 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -2,13 +2,11 @@
 
 #include "Text.h"
 
-
 using namespace crepe;
 
 Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
 		   const std::string & text, const std::string & font_family, const Data & data)
 	: UIObject(id, dimensions, offset),
 	  text(text),
-	  data(data), 
-	  font(FontFacade::get_font_asset(font_family)) {
-}
+	  data(data),
+	  font(FontFacade::get_font_asset(font_family)) {}
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index 13b4375..fbb1ad6 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -4,8 +4,8 @@
 
 #include "../Component.h"
 
-#include "Color.h"
 #include "Asset.h"
+#include "Color.h"
 #include "UIObject.h"
 
 namespace crepe {
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index 12e10ed..708b2ff 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -1,6 +1,6 @@
-#include <stdexcept>
 #include <SDL2/SDL_ttf.h>
 #include <fontconfig/fontconfig.h>
+#include <stdexcept>
 
 #include "FontFacade.h"
 
diff --git a/src/crepe/facade/FontFacade.h b/src/crepe/facade/FontFacade.h
index 1b835d4..0e6b7da 100644
--- a/src/crepe/facade/FontFacade.h
+++ b/src/crepe/facade/FontFacade.h
@@ -22,7 +22,7 @@ public:
 	 * \param font_family Name of the font family name.
 	 * \return Asset with filepath to the font.
 	 */
-	 static Asset get_font_asset(const std::string font_family);
+	static Asset get_font_asset(const std::string font_family);
 };
 
 } // namespace crepe
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 0ea6d86..508197a 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -17,8 +17,9 @@ int main() {
 			1, vec2(100, 100), vec2(0, 0), "test test", "OpenSymbol", Text::Data{});
 		std::cout << "Path: " << label->font.get_path() << std::endl;
 
-		std::unique_ptr<Text> label2 = std::make_unique<Text>(
-			1, vec2(100, 100), vec2(0, 0), "test test", "fsaafdafsdafsdafsdasfdds", Text::Data{});
+		std::unique_ptr<Text> label2
+			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test",
+									 "fsaafdafsdafsdafsdasfdds", Text::Data{});
 		std::cout << "Path: " << label2->font.get_path() << std::endl;
 	} catch (const std::exception & e) {
 		std::cout << "Standard exception thrown: " << e.what() << std::endl;
-- 
cgit v1.2.3


From 8abc6008880dd9ed0c16a68a126b49f0eb03caa2 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Mon, 16 Dec 2024 20:52:43 +0100
Subject: fonting

---
 src/crepe/api/Config.h             |  2 +-
 src/crepe/api/Text.cpp             |  5 ++++-
 src/crepe/facade/Font.cpp          | 10 ++++++++--
 src/crepe/facade/Font.h            |  1 +
 src/crepe/facade/SDLContext.cpp    | 24 ++++++++++++++++++++++++
 src/crepe/facade/SDLContext.h      |  4 ++++
 src/crepe/system/RenderSystem.cpp  | 19 +++++++++++++++++++
 src/crepe/system/RenderSystem.h    |  2 ++
 src/example/rendering_particle.cpp | 25 +++++--------------------
 9 files changed, 68 insertions(+), 24 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 47a81b7..c20287d 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -26,7 +26,7 @@ struct Config final {
 		 *
 		 * Only messages with equal or higher priority than this value will be logged.
 		 */
-		Log::Level level = Log::Level::INFO;
+		Log::Level level = Log::Level::DEBUG;
 		/**
 		 * \brief Colored log output
 		 *
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 5b2befe..07d1705 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -1,4 +1,5 @@
 #include "../facade/FontFacade.h"
+#include "util/Log.h"
 
 #include "Text.h"
 
@@ -9,4 +10,6 @@ Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
 	: UIObject(id, dimensions, offset),
 	  text(text),
 	  data(data),
-	  font(FontFacade::get_font_asset(font_family)) {}
+	  font(FontFacade::get_font_asset(font_family)) {
+	dbg_trace();
+}
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 1ee3de1..83e8519 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -1,4 +1,5 @@
 #include "../api/Config.h"
+#include "util/Log.h"
 
 #include "Font.h"
 
@@ -6,8 +7,8 @@ using namespace std;
 using namespace crepe;
 
 Font::Font(const Asset & src, Mediator & mediator)
-	: Resource(src, mediator),
-	  font(nullptr, TTF_CloseFont) {
+	: Resource(src, mediator) {
+	dbg_trace();
 	Config & config = Config::get_instance();
 	const std::string FONT_PATH = src.get_path();
 	TTF_Font * font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
@@ -16,4 +17,9 @@ Font::Font(const Asset & src, Mediator & mediator)
 	this->font = {font, [](TTF_Font * font) { TTF_CloseFont(font); }};
 }
 
+Font::~Font(){
+	dbg_trace();
+	this->font.reset();
+}
+
 TTF_Font * Font::get_font() const { return this->font.get(); }
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index e93bfe9..e9f5fa1 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -22,6 +22,7 @@ public:
      * \param mediator The Mediator object used for managing the SDL context or related systems.
      */
 	Font(const Asset & src, Mediator & mediator);
+	~Font();
 
 	/**
      * \brief Gets the underlying TTF_Font resource.
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index d1d109c..4e969b9 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -21,6 +21,8 @@
 #include "../api/Config.h"
 #include "../api/Sprite.h"
 #include "../util/Log.h"
+#include "api/Text.h"
+#include "facade/Font.h"
 #include "manager/Mediator.h"
 
 #include "SDLContext.h"
@@ -283,6 +285,28 @@ void SDLContext::draw(const RenderContext & ctx) {
 					  angle, NULL, render_flip);
 }
 
+
+void SDLContext::draw_text(const Text & text, const Font & font){
+	SDL_Color color {
+		.r = text.data.text_color.r,
+		.g = text.data.text_color.g,
+		.b = text.data.text_color.b,
+		.a = text.data.text_color.a,
+	};
+	SDL_Surface * font_surface = TTF_RenderText_Solid(font.get_font(), text.text.c_str(), color);
+	SDL_Texture * font_texture = SDL_CreateTextureFromSurface(this->game_renderer.get(), font_surface);
+	SDL_FreeSurface(font_surface);
+
+	SDL_FRect dstrect {
+		.x = text.offset.x,
+		.y = text.offset.y,
+		.w = text.dimensions.x,
+		.h = text.dimensions.y,
+	};
+	SDL_RenderCopyExF(this->game_renderer.get(), font_texture, NULL, &dstrect , 0 , NULL, SDL_FLIP_NONE);
+	SDL_DestroyTexture(font_texture);
+}
+
 void SDLContext::update_camera_view(const Camera & cam, const vec2 & new_pos) {
 
 	const Camera::Data & cam_data = cam.data;
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index efdd6fe..3f9f9ee 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -20,6 +20,8 @@
 namespace crepe {
 
 class Texture;
+class Text;
+class Font;
 class Mediator;
 
 /**
@@ -183,6 +185,8 @@ public:
 	 */
 	void draw(const RenderContext & ctx);
 
+	void draw_text(const Text & text, const Font & font);
+
 	//! Clears the screen, preparing for a new frame.
 	void clear_screen();
 
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index afd9548..7f00891 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -15,6 +15,8 @@
 #include "../manager/ResourceManager.h"
 
 #include "RenderSystem.h"
+#include "api/Text.h"
+#include "facade/Font.h"
 #include "types.h"
 
 using namespace crepe;
@@ -67,9 +69,26 @@ RefVector<Sprite> RenderSystem::sort(RefVector<Sprite> & objs) const {
 void RenderSystem::update() {
 	this->clear_screen();
 	this->render();
+	this->render_text();
 	this->present_screen();
 }
 
+
+void RenderSystem::render_text(){
+	SDLContext & ctx = this->mediator.sdl_context;
+	ComponentManager & mgr = this->mediator.component_manager;
+	ResourceManager & resource_manager = this->mediator.resource_manager;
+
+	RefVector<Text> texts = mgr.get_components_by_type<Text>();
+
+	for (Text & text  : texts) {
+		if (!text.active) continue;
+		resource_manager.get<Font>(text.font);
+		//ctx.draw_text(text, font);
+	}
+
+}
+
 bool RenderSystem::render_particle(const Sprite & sprite, const double & scale) {
 
 	ComponentManager & mgr = this->mediator.component_manager;
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index fc7b46e..ae55404 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -27,6 +27,8 @@ public:
 	void update() override;
 
 private:
+
+	void render_text();
 	//! Clears the screen in preparation for rendering.
 	void clear_screen();
 
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 13e625f..3857acc 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -1,4 +1,5 @@
 #include "api/Asset.h"
+#include "api/Text.h"
 #include <crepe/Component.h>
 #include <crepe/api/Animator.h>
 #include <crepe/api/Button.h>
@@ -43,11 +44,7 @@ using namespace std;
 class TestScene : public Scene {
 public:
 	void load_scene() {
-
-		cout << "TestScene" << endl;
-		Mediator & mediator = this->mediator;
-		ComponentManager & mgr = mediator.component_manager;
-		GameObject game_object = mgr.new_object("", "", vec2{0, 0}, 0, 1);
+		GameObject game_object = new_object("", "", vec2{0, 0}, 0, 1);
 
 		Color color(255, 255, 255, 255);
 
@@ -59,29 +56,17 @@ public:
 					 .flip = Sprite::FlipSettings{false, false},
 					 .sorting_in_layer = 2,
 					 .order_in_layer = 2,
-					 .size = {0, 100},
+					 .size = {0, 0},
 					 .angle_offset = 0,
 					 .position_offset = {0, 0},
 				 });
 
-		//auto & anim = game_object.add_component<Animator>(test_sprite,ivec2{32, 64}, uvec2{4,1}, Animator::Data{});
-		//anim.set_anim(0);
-
-		auto & cam = game_object.add_component<Camera>(ivec2{720, 1280}, vec2{400, 400},
+		auto & cam = game_object.add_component<Camera>(ivec2{400, 400}, vec2{400, 400},
 													   Camera::Data{
 														   .bg_color = Color::WHITE,
 													   });
 
-		function<void()> on_click = [&]() { cout << "button clicked" << std::endl; };
-		function<void()> on_enter = [&]() { cout << "enter" << std::endl; };
-		function<void()> on_exit = [&]() { cout << "exit" << std::endl; };
-
-		auto & button
-			= game_object.add_component<Button>(vec2{200, 200}, vec2{0, 0}, on_click, false);
-		button.on_mouse_enter = on_enter;
-		button.on_mouse_exit = on_exit;
-		button.is_toggle = true;
-		button.active = true;
+		game_object.add_component<Text>(vec2{200,200}, vec2{0,0}, "test test", "OpenSymbol", Text::Data{});
 	}
 
 	string get_name() const { return "TestScene"; };
-- 
cgit v1.2.3


From 58c57578cae755422c35acfbbdf9ad399b4fd826 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 16 Dec 2024 21:49:15 +0100
Subject: very illegal commit do not push

---
 src/crepe/api/Script.h          |  3 ++-
 src/crepe/facade/FontFacade.cpp |  4 ++--
 src/example/CMakeLists.txt      |  1 +
 src/example/FontExample.cpp     | 51 +++++++++++++++++++++++++++++++++++++++++
 src/example/loadfont.cpp        |  2 +-
 5 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 src/example/FontExample.cpp

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 668e5d1..ee45b8d 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -156,6 +156,7 @@ private:
 	void subscribe_internal(const EventHandler<EventType> & callback, event_channel_t channel);
 
 protected:
+	OptionalRef<Mediator> mediator;
 	// NOTE: This must be the only constructor on Script, see "Late references" below
 	Script() = default;
 	//! Only \c BehaviorScript instantiates Script
@@ -190,7 +191,7 @@ private:
 	//! Reference to parent component
 	OptionalRef<bool> active;
 	//! Mediator reference
-	OptionalRef<Mediator> mediator;
+	
 	//! \}
 
 private:
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index 708b2ff..a63b022 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -16,7 +16,7 @@ Asset FontFacade::get_font_asset(const string font_family) {
 	if (pattern == NULL) {
 		throw runtime_error("Failed to create font pattern.");
 	}
-
+	
 	// Default configuration
 	FcConfig * config = FcConfigGetCurrent();
 	if (config == NULL) {
@@ -43,7 +43,7 @@ Asset FontFacade::get_font_asset(const string font_family) {
 	}
 
 	// Convert the file path to a string
-	string font_file_path(reinterpret_cast<const char *>(file_path));
+	string font_file_path = reinterpret_cast<const char *>(file_path);
 	FcPatternDestroy(matched_pattern);
 	FcFini();
 	return Asset(font_file_path);
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 0e2d5e2..f62414e 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -20,4 +20,5 @@ add_example(rendering_particle)
 add_example(game)
 add_example(button)
 add_example(loadfont)
+add_example(FontExample)
 add_example(AITest)
diff --git a/src/example/FontExample.cpp b/src/example/FontExample.cpp
new file mode 100644
index 0000000..620cf8e
--- /dev/null
+++ b/src/example/FontExample.cpp
@@ -0,0 +1,51 @@
+#include <crepe/api/Text.h>
+#include <SDL2/SDL_ttf.h>
+#include <crepe/facade/Font.h>
+#include <crepe/facade/SDLContext.h>
+#include <crepe/manager/Mediator.h>
+#include <crepe/manager/ResourceManager.h>
+#include <crepe/manager/EventManager.h>
+#include <crepe/api/Scene.h>
+#include <crepe/api/Script.h>
+#include <crepe/api/GameObject.h>
+#include <exception>
+#include <iostream>
+#include <memory>
+#include <chrono>
+using namespace crepe;
+using namespace std;
+using namespace std::chrono;
+class TestScript : public Script{
+	public:
+	steady_clock::time_point start_time;
+	virtual void init() override{
+		start_time = steady_clock::now();
+	}
+	virtual void update() override{
+		auto now = steady_clock::now();
+        auto elapsed = duration_cast<seconds>(now - start_time).count();
+
+        if (elapsed >= 1) {
+			Mediator& med = mediator;
+            EventManager& event_mgr = med.event_manager;
+			event_mgr.trigger_event<ShutDownEvent>();
+        }
+	}
+};
+class TestScene : public Scene{
+	public:
+	void load_scene() override{
+		GameObject text_object = this->new_object("test","test",vec2{0,0},0,1);
+		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "test test",
+									 "OpenSymbol", Text::Data{});
+		text_object.add_component<BehaviorScript>();
+
+	}
+	std::string get_name(){ return "hey";}
+};
+int main() {
+
+
+
+	return 0;
+}
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index a77e457..f863053 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -13,7 +13,7 @@ int main() {
 	// SDLFontContext font_facade;
 	Mediator mediator;
 	SDLContext sdl_context{mediator};
-	ComponentManager component_manager{mediator};
+	// ComponentManager component_manager{mediator};
 	ResourceManager resource_manager{mediator};
 	try {
 		// Correct way to create a unique pointer for Text
-- 
cgit v1.2.3


From d33dbdff59693377d06d83225b0fe78c3168c464 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 16 Dec 2024 22:56:42 +0100
Subject: segmentation fault fixed

---
 src/crepe/facade/Font.cpp   |  7 ++++---
 src/example/FontExample.cpp | 17 +++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 1ee3de1..333e500 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -10,10 +10,11 @@ Font::Font(const Asset & src, Mediator & mediator)
 	  font(nullptr, TTF_CloseFont) {
 	Config & config = Config::get_instance();
 	const std::string FONT_PATH = src.get_path();
-	TTF_Font * font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
-	if (font == NULL)
+	TTF_Font * loaded_font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
+	if (loaded_font == NULL) {
 		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
-	this->font = {font, [](TTF_Font * font) { TTF_CloseFont(font); }};
+	}
+	this->font = {loaded_font, [](TTF_Font * font) { TTF_CloseFont(font); }};
 }
 
 TTF_Font * Font::get_font() const { return this->font.get(); }
diff --git a/src/example/FontExample.cpp b/src/example/FontExample.cpp
index 620cf8e..c2f21c4 100644
--- a/src/example/FontExample.cpp
+++ b/src/example/FontExample.cpp
@@ -7,7 +7,9 @@
 #include <crepe/manager/EventManager.h>
 #include <crepe/api/Scene.h>
 #include <crepe/api/Script.h>
+#include <crepe/api/LoopManager.h>
 #include <crepe/api/GameObject.h>
+#include <crepe/api/Camera.h>
 #include <exception>
 #include <iostream>
 #include <memory>
@@ -25,7 +27,7 @@ class TestScript : public Script{
 		auto now = steady_clock::now();
         auto elapsed = duration_cast<seconds>(now - start_time).count();
 
-        if (elapsed >= 1) {
+        if (elapsed >= 5) {
 			Mediator& med = mediator;
             EventManager& event_mgr = med.event_manager;
 			event_mgr.trigger_event<ShutDownEvent>();
@@ -37,15 +39,18 @@ class TestScene : public Scene{
 	void load_scene() override{
 		GameObject text_object = this->new_object("test","test",vec2{0,0},0,1);
 		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "test test",
-									 "OpenSymbol", Text::Data{});
-		text_object.add_component<BehaviorScript>();
+									 "Noto Sans", Text::Data{});
+		text_object.add_component<BehaviorScript>().set_script<TestScript>();
+		text_object.add_component<Camera>(ivec2{300,300},vec2{100,100},Camera::Data{
+		});
 
 	}
-	std::string get_name(){ return "hey";}
+	std::string get_name() const override { return "hey"; }
 };
 int main() {
-
-
+	LoopManager engine;
+	engine.add_scene<TestScene>();
+	engine.start();
 
 	return 0;
 }
-- 
cgit v1.2.3


From fce10251d772af129531896965a908dc6d881c4b Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 16 Dec 2024 23:00:13 +0100
Subject: small changes

---
 src/crepe/facade/Font.cpp       | 1 +
 src/crepe/facade/Font.h         | 4 +++-
 src/crepe/facade/FontFacade.cpp | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 333e500..74dfe18 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -1,4 +1,5 @@
 #include "../api/Config.h"
+#include "../api/Asset.h"
 
 #include "Font.h"
 
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index e93bfe9..3ff156f 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -1,13 +1,14 @@
 #pragma once
+
 #include <SDL2/SDL_ttf.h>
 #include <memory>
 
 #include "../Resource.h"
-#include "../api/Asset.h"
 #include "../api/Config.h"
 
 namespace crepe {
 
+class Asset;
 /**
  * \brief Resource for managing font creation and destruction
  *
@@ -16,6 +17,7 @@ namespace crepe {
  * when this object is destroyed.
  */
 class Font : public Resource {
+
 public:
 	/**
      * \param src The Asset containing the font file path and metadata to load the font.
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index a63b022..4a991c6 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -1,4 +1,3 @@
-#include <SDL2/SDL_ttf.h>
 #include <fontconfig/fontconfig.h>
 #include <stdexcept>
 
-- 
cgit v1.2.3


From d63eb7302d05fbe9b4c044ece3444e8ac4e56e02 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 16 Dec 2024 23:00:33 +0100
Subject: make format

---
 src/crepe/api/Script.h          |  2 +-
 src/crepe/facade/Font.cpp       |  2 +-
 src/crepe/facade/FontFacade.cpp |  2 +-
 src/example/FontExample.cpp     | 52 +++++++++++++++++++----------------------
 src/example/loadfont.cpp        | 18 +++++++-------
 5 files changed, 36 insertions(+), 40 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index ee45b8d..a24e32e 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -191,7 +191,7 @@ private:
 	//! Reference to parent component
 	OptionalRef<bool> active;
 	//! Mediator reference
-	
+
 	//! \}
 
 private:
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 74dfe18..d419974 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -1,5 +1,5 @@
-#include "../api/Config.h"
 #include "../api/Asset.h"
+#include "../api/Config.h"
 
 #include "Font.h"
 
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index 4a991c6..aa9d00c 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -15,7 +15,7 @@ Asset FontFacade::get_font_asset(const string font_family) {
 	if (pattern == NULL) {
 		throw runtime_error("Failed to create font pattern.");
 	}
-	
+
 	// Default configuration
 	FcConfig * config = FcConfigGetCurrent();
 	if (config == NULL) {
diff --git a/src/example/FontExample.cpp b/src/example/FontExample.cpp
index c2f21c4..3f5af48 100644
--- a/src/example/FontExample.cpp
+++ b/src/example/FontExample.cpp
@@ -1,49 +1,45 @@
-#include <crepe/api/Text.h>
 #include <SDL2/SDL_ttf.h>
+#include <chrono>
+#include <crepe/api/Camera.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/LoopManager.h>
+#include <crepe/api/Scene.h>
+#include <crepe/api/Script.h>
+#include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
 #include <crepe/facade/SDLContext.h>
+#include <crepe/manager/EventManager.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/manager/ResourceManager.h>
-#include <crepe/manager/EventManager.h>
-#include <crepe/api/Scene.h>
-#include <crepe/api/Script.h>
-#include <crepe/api/LoopManager.h>
-#include <crepe/api/GameObject.h>
-#include <crepe/api/Camera.h>
 #include <exception>
 #include <iostream>
 #include <memory>
-#include <chrono>
 using namespace crepe;
 using namespace std;
 using namespace std::chrono;
-class TestScript : public Script{
-	public:
+class TestScript : public Script {
+public:
 	steady_clock::time_point start_time;
-	virtual void init() override{
-		start_time = steady_clock::now();
-	}
-	virtual void update() override{
+	virtual void init() override { start_time = steady_clock::now(); }
+	virtual void update() override {
 		auto now = steady_clock::now();
-        auto elapsed = duration_cast<seconds>(now - start_time).count();
+		auto elapsed = duration_cast<seconds>(now - start_time).count();
 
-        if (elapsed >= 5) {
-			Mediator& med = mediator;
-            EventManager& event_mgr = med.event_manager;
+		if (elapsed >= 5) {
+			Mediator & med = mediator;
+			EventManager & event_mgr = med.event_manager;
 			event_mgr.trigger_event<ShutDownEvent>();
-        }
+		}
 	}
 };
-class TestScene : public Scene{
-	public:
-	void load_scene() override{
-		GameObject text_object = this->new_object("test","test",vec2{0,0},0,1);
-		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "test test",
-									 "Noto Sans", Text::Data{});
+class TestScene : public Scene {
+public:
+	void load_scene() override {
+		GameObject text_object = this->new_object("test", "test", vec2{0, 0}, 0, 1);
+		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "test test", "Noto Sans",
+										Text::Data{});
 		text_object.add_component<BehaviorScript>().set_script<TestScript>();
-		text_object.add_component<Camera>(ivec2{300,300},vec2{100,100},Camera::Data{
-		});
-
+		text_object.add_component<Camera>(ivec2{300, 300}, vec2{100, 100}, Camera::Data{});
 	}
 	std::string get_name() const override { return "hey"; }
 };
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index f863053..ce287b4 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -1,5 +1,5 @@
-#include <crepe/api/Text.h>
 #include <SDL2/SDL_ttf.h>
+#include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
 #include <crepe/facade/SDLContext.h>
 #include <crepe/manager/Mediator.h>
@@ -25,14 +25,14 @@ int main() {
 			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test",
 									 "fsaafdafsdafsdafsdasfdds", Text::Data{});
 		std::cout << "Path: " << label2->font.get_path() << std::endl;
-	ResourceManager & resource_mgr = mediator.resource_manager;
-	const Font & res = resource_manager.get<Font>(label->font);
-	TTF_Font * test_font = res.get_font();
-	if(test_font == NULL){
-		std::cout << "error with font" << std::endl;
-	}else{
-		std::cout << "correct font retrieved" << std::endl;
-	}
+		ResourceManager & resource_mgr = mediator.resource_manager;
+		const Font & res = resource_manager.get<Font>(label->font);
+		TTF_Font * test_font = res.get_font();
+		if (test_font == NULL) {
+			std::cout << "error with font" << std::endl;
+		} else {
+			std::cout << "correct font retrieved" << std::endl;
+		}
 	} catch (const std::exception & e) {
 		std::cout << "Standard exception thrown: " << e.what() << std::endl;
 	}
-- 
cgit v1.2.3


From 2f8d36a33854715828d412792663f355b9e393ae Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Tue, 17 Dec 2024 09:08:06 +0100
Subject: idk

---
 src/crepe/api/Config.h             |  2 +-
 src/crepe/facade/Font.cpp          |  4 +++-
 src/crepe/facade/SDLContext.cpp    | 23 +++++++++++++----------
 src/crepe/system/RenderSystem.cpp  |  2 +-
 src/example/rendering_particle.cpp |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index c20287d..b86faff 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -85,7 +85,7 @@ struct Config final {
 		 * This config option is the font size at which all fonts will be loaded initially.
 		 * 
 		 */
-		unsigned int size = 16;
+		unsigned int size = 32;
 	} font;
 
 	//! Audio system settings
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 83e8519..a9f1633 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -1,5 +1,6 @@
 #include "../api/Config.h"
 #include "util/Log.h"
+#include <iostream>
 
 #include "Font.h"
 
@@ -10,7 +11,8 @@ Font::Font(const Asset & src, Mediator & mediator)
 	: Resource(src, mediator) {
 	dbg_trace();
 	Config & config = Config::get_instance();
-	const std::string FONT_PATH = src.get_path();
+	const std::string & FONT_PATH = src.get_path();
+	cout << FONT_PATH.c_str() << endl;
 	TTF_Font * font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
 	if (font == NULL)
 		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 4e969b9..a06940d 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -34,9 +34,6 @@ using namespace std;
 
 SDLContext::SDLContext(Mediator & mediator) {
 	dbg_trace();
-	if (TTF_Init() == -1) {
-		throw runtime_error(format("SDL_ttf initialization failed: {}", TTF_GetError()));
-	}
 	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
 		throw runtime_error(format("SDLContext: SDL_Init error: {}", SDL_GetError()));
 	}
@@ -65,6 +62,10 @@ SDLContext::SDLContext(Mediator & mediator) {
 		throw runtime_error("SDLContext: SDL_image could not initialize!");
 	}
 
+	if (TTF_Init() == -1) {
+		throw runtime_error(format("SDL_ttf initialization failed: {}", TTF_GetError()));
+	}
+
 	mediator.sdl_context = *this;
 }
 
@@ -77,8 +78,8 @@ SDLContext::~SDLContext() {
 	// 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();
 	TTF_Quit();
+	IMG_Quit();
 	SDL_Quit();
 }
 
@@ -297,13 +298,15 @@ void SDLContext::draw_text(const Text & text, const Font & font){
 	SDL_Texture * font_texture = SDL_CreateTextureFromSurface(this->game_renderer.get(), font_surface);
 	SDL_FreeSurface(font_surface);
 
-	SDL_FRect dstrect {
-		.x = text.offset.x,
-		.y = text.offset.y,
-		.w = text.dimensions.x,
-		.h = text.dimensions.y,
+	SDL_Rect dstrect {
+		.x = (int)text.offset.x,
+		.y = (int)text.offset.y,
+		.w = (int)text.dimensions.x,
+		.h = (int)text.dimensions.y,
 	};
-	SDL_RenderCopyExF(this->game_renderer.get(), font_texture, NULL, &dstrect , 0 , NULL, SDL_FLIP_NONE);
+
+	SDL_RenderCopy(this->game_renderer.get(), font_texture, NULL, NULL);
+	SDL_RenderCopyExF(this->game_renderer.get(), font_texture, NULL, NULL, 0 , NULL, SDL_FLIP_NONE);
 	SDL_DestroyTexture(font_texture);
 }
 
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index f2ed97d..9611a9e 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -84,7 +84,7 @@ void RenderSystem::render_text(){
 	for (const Text & text  : texts) {
 		if (!text.active) continue;
 		const Font & res = resource_manager.get<Font>(text.font);
-		//ctx.draw_text(text, font);
+		ctx.draw_text(text, res);
 	}
 
 }
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 3857acc..21ed7fc 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -66,7 +66,7 @@ public:
 														   .bg_color = Color::WHITE,
 													   });
 
-		game_object.add_component<Text>(vec2{200,200}, vec2{0,0}, "test test", "OpenSymbol", Text::Data{});
+		game_object.add_component<Text>(vec2{200,200}, vec2{0,0}, "test test", "", Text::Data{});
 	}
 
 	string get_name() const { return "TestScene"; };
-- 
cgit v1.2.3


From 3b5b5258b0f46a3492a7fd777908dfb01e15417b Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 17 Dec 2024 10:48:43 +0100
Subject: code not working

---
 src/crepe/facade/Font.cpp         |  4 +++-
 src/crepe/facade/Font.h           |  7 +++++++
 src/crepe/facade/FontFacade.cpp   |  6 +++---
 src/crepe/facade/FontFacade.h     |  2 +-
 src/crepe/system/RenderSystem.cpp | 10 ++++++++++
 5 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index d419974..5af943d 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -1,3 +1,5 @@
+#include <SDL2/SDL_ttf.h>
+
 #include "../api/Asset.h"
 #include "../api/Config.h"
 
@@ -15,7 +17,7 @@ Font::Font(const Asset & src, Mediator & mediator)
 	if (loaded_font == NULL) {
 		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
 	}
-	this->font = {loaded_font, [](TTF_Font * font) { TTF_CloseFont(font); }};
+	this->font = {loaded_font, [](TTF_Font * close_font) { TTF_CloseFont(close_font); }};
 }
 
 TTF_Font * Font::get_font() const { return this->font.get(); }
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index 3ff156f..16f8cb6 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -24,7 +24,14 @@ public:
      * \param mediator The Mediator object used for managing the SDL context or related systems.
      */
 	Font(const Asset & src, Mediator & mediator);
+    	Font(const Font &) = delete;
+    	Font &operator=(const Font &) = delete;
 
+   	// Default move constructor and move assignment operator
+    	Font(Font &&) noexcept = delete;
+    	Font &operator=(Font &&) noexcept = delete;
+
+    ~Font() = default;
 	/**
      * \brief Gets the underlying TTF_Font resource.
      * 
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index aa9d00c..d447b6d 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -6,7 +6,7 @@
 using namespace crepe;
 using namespace std;
 
-Asset FontFacade::get_font_asset(const string font_family) {
+Asset FontFacade::get_font_asset(const string& font_family) {
 	if (!FcInit()) {
 		throw runtime_error("Failed to initialize Fontconfig.");
 	}
@@ -19,7 +19,7 @@ Asset FontFacade::get_font_asset(const string font_family) {
 	// Default configuration
 	FcConfig * config = FcConfigGetCurrent();
 	if (config == NULL) {
-		FcPatternDestroy(pattern);
+		// FcPatternDestroy(pattern);
 		throw runtime_error("Failed to get current Fontconfig configuration.");
 	}
 
@@ -37,7 +37,7 @@ Asset FontFacade::get_font_asset(const string font_family) {
 	FcChar8 * file_path = nullptr;
 	if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch
 		|| file_path == NULL) {
-		FcPatternDestroy(matched_pattern);
+		// FcPatternDestroy(matched_pattern);
 		throw runtime_error("Failed to get font file path.");
 	}
 
diff --git a/src/crepe/facade/FontFacade.h b/src/crepe/facade/FontFacade.h
index 0e6b7da..fc200d6 100644
--- a/src/crepe/facade/FontFacade.h
+++ b/src/crepe/facade/FontFacade.h
@@ -22,7 +22,7 @@ public:
 	 * \param font_family Name of the font family name.
 	 * \return Asset with filepath to the font.
 	 */
-	static Asset get_font_asset(const std::string font_family);
+	static Asset get_font_asset(const std::string& font_family);
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index afd9548..5aa00b5 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -8,6 +8,8 @@
 #include "../api/Camera.h"
 #include "../api/ParticleEmitter.h"
 #include "../api/Sprite.h"
+#include "../api/Text.h"
+#include "../facade/Font.h"
 #include "../api/Transform.h"
 #include "../facade/SDLContext.h"
 #include "../facade/Texture.h"
@@ -120,8 +122,13 @@ void RenderSystem::render() {
 	this->update_camera();
 
 	RefVector<Sprite> sprites = mgr.get_components_by_type<Sprite>();
+	ResourceManager & resource_manager = this->mediator.resource_manager;
 	RefVector<Sprite> sorted_sprites = this->sort(sprites);
+	RefVector<Text> texts =  mgr.get_components_by_type<Text>();
+	for(const Text& text : texts){
+		const Font & res = resource_manager.get<Font>(text.font);
 
+	}
 	for (const Sprite & sprite : sorted_sprites) {
 		if (!sprite.active) continue;
 		const Transform & transform
@@ -132,5 +139,8 @@ void RenderSystem::render() {
 		if (rendered_particles) continue;
 
 		this->render_normal(sprite, transform);
+		
+	
+		
 	}
 }
-- 
cgit v1.2.3


From b99f5fc0f52fdd4ec96be844e643060503a8860b Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 17 Dec 2024 13:22:34 +0100
Subject: text now working with optional

---
 src/crepe/api/Asset.h             |  2 +-
 src/crepe/api/LoopManager.h       |  7 ++++---
 src/crepe/api/Script.h            |  5 +++--
 src/crepe/api/Text.cpp            |  8 +++++---
 src/crepe/api/Text.h              | 15 +++++++++++----
 src/crepe/facade/Font.cpp         |  3 +--
 src/crepe/facade/Font.h           | 10 +---------
 src/crepe/facade/FontFacade.cpp   | 11 ++++++++---
 src/crepe/facade/FontFacade.h     | 12 +++++++++---
 src/crepe/facade/SDLContext.cpp   |  5 +++++
 src/crepe/facade/SDLContext.h     | 15 +++++++++++++++
 src/crepe/system/RenderSystem.cpp | 28 +++++++++++++++++++++++++---
 src/crepe/system/RenderSystem.h   | 10 ++++++++--
 src/example/FontExample.cpp       |  6 ++++--
 src/example/loadfont.cpp          | 31 ++++++++++++++++++-------------
 15 files changed, 118 insertions(+), 50 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Asset.h b/src/crepe/api/Asset.h
index bfd0ac7..b367a92 100644
--- a/src/crepe/api/Asset.h
+++ b/src/crepe/api/Asset.h
@@ -37,7 +37,7 @@ public:
 
 private:
 	//! path to asset
-	const std::string src;
+	std::string src;
 
 private:
 	/**
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 40e6b38..1725810 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -71,7 +71,9 @@ private:
 private:
 	//! Global context
 	Mediator mediator;
-
+	
+	//! SDLContext instance
+	SDLContext sdl_context{mediator};
 	//! Component manager instance
 	ComponentManager component_manager{mediator};
 	//! Scene manager instance
@@ -84,8 +86,7 @@ private:
 	ResourceManager resource_manager{mediator};
 	//! Save manager instance
 	SaveManager save_manager{mediator};
-	//! SDLContext instance
-	SDLContext sdl_context{mediator};
+	
 
 private:
 	/**
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index a24e32e..4503525 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -156,7 +156,7 @@ private:
 	void subscribe_internal(const EventHandler<EventType> & callback, event_channel_t channel);
 
 protected:
-	OptionalRef<Mediator> mediator;
+	
 	// NOTE: This must be the only constructor on Script, see "Late references" below
 	Script() = default;
 	//! Only \c BehaviorScript instantiates Script
@@ -186,12 +186,13 @@ private:
 	 *
 	 * \{
 	 */
+
 	//! Game object ID of game object parent BehaviorScript is attached to
 	game_object_id_t game_object_id;
 	//! Reference to parent component
 	OptionalRef<bool> active;
 	//! Mediator reference
-
+	OptionalRef<Mediator> mediator;
 	//! \}
 
 private:
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 5b2befe..0624c98 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -4,9 +4,11 @@
 
 using namespace crepe;
 
-Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
-		   const std::string & text, const std::string & font_family, const Data & data)
+Text::Text(game_object_id_t id, const vec2 & dimensions,const vec2 & offset, const std::string & font_family,
+	const Data & data, const std::string & text, std::optional<Asset> font)
 	: UIObject(id, dimensions, offset),
 	  text(text),
 	  data(data),
-	  font(FontFacade::get_font_asset(font_family)) {}
+	  font_family(font_family),
+	  font(font) {
+}
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index ec0bf74..ab72bc0 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <optional> 
 
 #include "../Component.h"
 
@@ -47,15 +48,21 @@ public:
 	 * \param text The text to be displayed.
 	 * \param font_family The font style name to be displayed.
 	 * \param data Data struct containing extra text parameters.
+	 * \param font Optional font asset that can be passed or left empty.
 	 */
-	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
-		 const std::string & text, const std::string & font_family, const Data & data);
+	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, 
+     const std::string & font_family, const Data & data, 
+     const std::string & text = "", std::optional<Asset> font = std::nullopt);
+	
 	//! Label text.
 	std::string text = "";
-	//! Font asset variable
-	const Asset font;
+	//! font family name
+	std::string font_family = "";
+	//! Font asset variable if this is not set, it will use the font_family to create an asset.
+	std::optional<Asset> font;
 	//! Data instance
 	Data data;
+	
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 5af943d..558641f 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -9,8 +9,7 @@ using namespace std;
 using namespace crepe;
 
 Font::Font(const Asset & src, Mediator & mediator)
-	: Resource(src, mediator),
-	  font(nullptr, TTF_CloseFont) {
+	: Resource(src, mediator){
 	Config & config = Config::get_instance();
 	const std::string FONT_PATH = src.get_path();
 	TTF_Font * loaded_font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index 16f8cb6..b208d96 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -24,14 +24,6 @@ public:
      * \param mediator The Mediator object used for managing the SDL context or related systems.
      */
 	Font(const Asset & src, Mediator & mediator);
-    	Font(const Font &) = delete;
-    	Font &operator=(const Font &) = delete;
-
-   	// Default move constructor and move assignment operator
-    	Font(Font &&) noexcept = delete;
-    	Font &operator=(Font &&) noexcept = delete;
-
-    ~Font() = default;
 	/**
      * \brief Gets the underlying TTF_Font resource.
      * 
@@ -44,7 +36,7 @@ public:
 
 private:
 	//! The SDL_ttf font object with custom deleter.
-	std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>> font;
+	std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>> font = nullptr;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index d447b6d..0a8ba5f 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -1,4 +1,5 @@
 #include <fontconfig/fontconfig.h>
+#include <iostream>
 #include <stdexcept>
 
 #include "FontFacade.h"
@@ -6,10 +7,16 @@
 using namespace crepe;
 using namespace std;
 
-Asset FontFacade::get_font_asset(const string& font_family) {
+FontFacade::FontFacade(){
 	if (!FcInit()) {
 		throw runtime_error("Failed to initialize Fontconfig.");
 	}
+}
+FontFacade::~FontFacade(){
+	FcFini();
+}
+Asset FontFacade::get_font_asset(const string& font_family) {
+	
 	// Create a pattern to search for the font family
 	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
 	if (pattern == NULL) {
@@ -32,7 +39,6 @@ Asset FontFacade::get_font_asset(const string& font_family) {
 		FcPatternDestroy(matched_pattern);
 		throw runtime_error("No matching font found.");
 	}
-
 	// Extract the file path
 	FcChar8 * file_path = nullptr;
 	if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch
@@ -44,6 +50,5 @@ Asset FontFacade::get_font_asset(const string& font_family) {
 	// Convert the file path to a string
 	string font_file_path = reinterpret_cast<const char *>(file_path);
 	FcPatternDestroy(matched_pattern);
-	FcFini();
 	return Asset(font_file_path);
 }
diff --git a/src/crepe/facade/FontFacade.h b/src/crepe/facade/FontFacade.h
index fc200d6..2e08f3f 100644
--- a/src/crepe/facade/FontFacade.h
+++ b/src/crepe/facade/FontFacade.h
@@ -13,16 +13,22 @@ namespace crepe {
  */
 class FontFacade {
 public:
+	FontFacade();
+	~FontFacade();
+    FontFacade(const FontFacade & other) = delete;
+    FontFacade & operator=(const FontFacade & other) = delete;
+    FontFacade(FontFacade && other) noexcept = delete;
+    FontFacade & operator=(FontFacade && other) noexcept = delete;
 	/**
 	 * 
 	 * \brief Facade function to convert a font_family into an asset.
 	 * 
 	 * This function uses the FontConfig library to convert a font family name (Arial, Inter, Helvetica) and converts it to the font source path.
-	 * This function is static so the member function can be used without create a FontFacade object. This way it can be used in a constructor as FontFacade::get_font_asset().
+	 * This function returns a default font path if the font_family name doesnt exist or cant be found
 	 * \param font_family Name of the font family name.
-	 * \return Asset with filepath to the font.
+	 * \return Asset with filepath to the corresponding font.
 	 */
-	static Asset get_font_asset(const std::string& font_family);
+	Asset get_font_asset(const std::string& font_family);
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index d1d109c..8ffaad9 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -434,7 +434,12 @@ std::vector<SDLContext::EventData> SDLContext::get_events() {
 	}
 	return event_list;
 }
+
 void SDLContext::set_color_texture(const Texture & texture, const Color & color) {
 	SDL_SetTextureColorMod(texture.get_img(), color.r, color.g, color.b);
 	SDL_SetTextureAlphaMod(texture.get_img(), color.a);
 }
+
+Asset SDLContext::get_font_from_name(const std::string& font_family){
+	return this->font_facade.get_font_asset(font_family);
+}
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index efdd6fe..ffa3cc0 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -17,6 +17,7 @@
 #include "api/Transform.h"
 #include "types.h"
 
+#include "FontFacade.h"
 namespace crepe {
 
 class Texture;
@@ -239,6 +240,20 @@ private:
 	 * - this is defined in this class because get_events() needs this information aswell
 	 */
 	CameraAuxiliaryData cam_aux_data;
+private: 
+	//! instance of the font_facade
+	FontFacade font_facade{};
+public:
+	/**
+	 * \brief Function to Get asset from font_family
+	 * 
+	 * This function uses the FontFacade function to convert a font_family to an asset.
+	 * 
+	 * \param font_family name of the font style that needs to be used (will return an asset with default font path of the font_family doesnt exist)
+	 * 
+	 * \return asset with the font style absolute path
+	 */
+	Asset get_font_from_name(const std::string& font_family);
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 5aa00b5..18f6393 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -2,6 +2,7 @@
 #include <cassert>
 #include <cmath>
 #include <functional>
+#include <optional>
 #include <stdexcept>
 #include <vector>
 
@@ -22,6 +23,7 @@
 using namespace crepe;
 using namespace std;
 
+
 void RenderSystem::clear_screen() {
 	SDLContext & ctx = this->mediator.sdl_context;
 	ctx.clear_screen();
@@ -124,9 +126,11 @@ void RenderSystem::render() {
 	RefVector<Sprite> sprites = mgr.get_components_by_type<Sprite>();
 	ResourceManager & resource_manager = this->mediator.resource_manager;
 	RefVector<Sprite> sorted_sprites = this->sort(sprites);
-	RefVector<Text> texts =  mgr.get_components_by_type<Text>();
-	for(const Text& text : texts){
-		const Font & res = resource_manager.get<Font>(text.font);
+	RefVector<Text> text_components =  mgr.get_components_by_type<Text>();
+	for(Text& text : text_components){
+		const Transform & transform
+			= mgr.get_components_by_id<Transform>(text.game_object_id).front().get();
+		this->render_text(text,transform);
 
 	}
 	for (const Sprite & sprite : sorted_sprites) {
@@ -143,4 +147,22 @@ void RenderSystem::render() {
 	
 		
 	}
+	
 }
+void RenderSystem::render_text(Text & text, const Transform & tm) {
+    SDLContext & ctx = this->mediator.sdl_context;
+
+    // Check if font is available in text
+    if (!text.font.has_value()) {
+    }
+
+    ResourceManager & resource_manager = this->mediator.resource_manager;
+
+    if (text.font.has_value()) {
+        const Asset& font_asset = text.font.value();
+        const Font & res = resource_manager.get<Font>(font_asset); 
+	}
+}
+
+
+
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index fc7b46e..56a0553 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -10,7 +10,7 @@ namespace crepe {
 class Camera;
 class Sprite;
 class Transform;
-
+class Text;
 /**
  * \brief Manages rendering operations for all game objects.
  *
@@ -50,7 +50,13 @@ private:
 	 * \return true if particles have been rendered
 	 */
 	bool render_particle(const Sprite & sprite, const double & scale);
-
+	/**
+	 * \brief Renders all Text components
+	 *
+	 * \param text The text component to be rendered.
+	 * \param tm the Transform component that holds the position,rotation and scale
+	 */
+	void render_text(Text & text, const Transform & tm);
 	/**
 	 * \brief renders a sprite with a Transform component on the screen
 	 *
diff --git a/src/example/FontExample.cpp b/src/example/FontExample.cpp
index 3f5af48..7b2dadb 100644
--- a/src/example/FontExample.cpp
+++ b/src/example/FontExample.cpp
@@ -11,6 +11,7 @@
 #include <crepe/manager/EventManager.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/manager/ResourceManager.h>
+#include <crepe/api/Config.h>
 #include <exception>
 #include <iostream>
 #include <memory>
@@ -36,14 +37,15 @@ class TestScene : public Scene {
 public:
 	void load_scene() override {
 		GameObject text_object = this->new_object("test", "test", vec2{0, 0}, 0, 1);
-		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "test test", "Noto Sans",
-										Text::Data{});
+		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{});
 		text_object.add_component<BehaviorScript>().set_script<TestScript>();
 		text_object.add_component<Camera>(ivec2{300, 300}, vec2{100, 100}, Camera::Data{});
 	}
 	std::string get_name() const override { return "hey"; }
 };
 int main() {
+	// Config& config = Config::get_instance();
+	// config.log.level = Log::Level::TRACE;
 	LoopManager engine;
 	engine.add_scene<TestScene>();
 	engine.start();
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index ce287b4..9d59afc 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -2,10 +2,12 @@
 #include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
 #include <crepe/facade/SDLContext.h>
+#include <crepe/api/Asset.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/manager/ResourceManager.h>
 #include <exception>
 #include <iostream>
+#include <optional>
 #include <memory>
 using namespace crepe;
 int main() {
@@ -18,21 +20,24 @@ int main() {
 	try {
 		// Correct way to create a unique pointer for Text
 		std::unique_ptr<Text> label = std::make_unique<Text>(
-			1, vec2(100, 100), vec2(0, 0), "test test", "OpenSymbol", Text::Data{});
-		std::cout << "Path: " << label->font.get_path() << std::endl;
+			1, vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{},"test text", Asset(""));
+		// std::cout << "Path: " << label->font.get_path() << std::endl;
 
 		std::unique_ptr<Text> label2
-			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test",
-									 "fsaafdafsdafsdafsdasfdds", Text::Data{});
-		std::cout << "Path: " << label2->font.get_path() << std::endl;
-		ResourceManager & resource_mgr = mediator.resource_manager;
-		const Font & res = resource_manager.get<Font>(label->font);
-		TTF_Font * test_font = res.get_font();
-		if (test_font == NULL) {
-			std::cout << "error with font" << std::endl;
-		} else {
-			std::cout << "correct font retrieved" << std::endl;
-		}
+			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0),"fsaafdafsdafsdafsdasfdds", Text::Data{});
+		Asset asset = Asset("test test");
+		label->font = std::make_optional(asset);
+		std::cout << label->font.value().get_path() << std::endl;
+		// label2->font = std::make_optional(asset);
+		// std::cout << "Path: " << label2->font.get_path() << std::endl;
+		// ResourceManager & resource_mgr = mediator.resource_manager;
+		// const Font & res = resource_manager.get<Font>(label->font);
+		// TTF_Font * test_font = res.get_font();
+		// if (test_font == NULL) {
+		// 	std::cout << "error with font" << std::endl;
+		// } else {
+		// 	std::cout << "correct font retrieved" << std::endl;
+		// }
 	} catch (const std::exception & e) {
 		std::cout << "Standard exception thrown: " << e.what() << std::endl;
 	}
-- 
cgit v1.2.3


From 707db8c94b6bb3921105f40658aab13511d8df07 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 17 Dec 2024 13:29:02 +0100
Subject: removed iostream

---
 src/crepe/facade/FontFacade.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index 0a8ba5f..08ff31c 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -1,5 +1,4 @@
 #include <fontconfig/fontconfig.h>
-#include <iostream>
 #include <stdexcept>
 
 #include "FontFacade.h"
-- 
cgit v1.2.3


From bcaee968761c1d2e85c20925b237480c87da9747 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Tue, 17 Dec 2024 13:29:58 +0100
Subject: tmp fix

---
 src/crepe/facade/Font.cpp          | 11 +++++++++++
 src/crepe/facade/Font.h            |  8 ++++++--
 src/crepe/facade/FontFacade.cpp    | 12 ++++++------
 src/crepe/facade/SDLContext.cpp    |  2 ++
 src/crepe/system/RenderSystem.cpp  |  5 +++--
 src/example/rendering_particle.cpp |  7 ++++---
 6 files changed, 32 insertions(+), 13 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 8c16563..47d0e39 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -2,6 +2,7 @@
 #include "../api/Config.h"
 #include "util/Log.h"
 #include <iostream>
+#include <string>
 
 #include "Font.h"
 
@@ -13,11 +14,21 @@ Font::Font(const Asset & src, Mediator & mediator)
 	dbg_trace();
 	Config & config = Config::get_instance();
 	const std::string FONT_PATH = src.get_path();
+
+	this->path = FONT_PATH;
+
+	cout << this->path << endl;
+	/*
 	TTF_Font * loaded_font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
 	if (loaded_font == NULL) {
 		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
 	}
 	this->font = {loaded_font, [](TTF_Font * font) { TTF_CloseFont(font); }};
+	*/
 }
 
 TTF_Font * Font::get_font() const { return this->font.get(); }
+
+const string & Font::get_path() const noexcept{
+	return this->path;
+}
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index 91c59c0..0b1768b 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <SDL2/SDL_ttf.h>
+#include <functional>
 #include <memory>
+#include <string>
 
 #include "../Resource.h"
-#include "../api/Config.h"
 
 namespace crepe {
 
@@ -24,7 +25,6 @@ public:
      * \param mediator The Mediator object used for managing the SDL context or related systems.
      */
 	Font(const Asset & src, Mediator & mediator);
-	~Font();
 
 	/**
      * \brief Gets the underlying TTF_Font resource.
@@ -36,9 +36,13 @@ public:
      */
 	TTF_Font * get_font() const;
 
+	const std::string & get_path() const noexcept;
+
 private:
 	//! The SDL_ttf font object with custom deleter.
 	std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>> font;
+
+	std::string path;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index aa9d00c..a0464e0 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -1,4 +1,5 @@
 #include <fontconfig/fontconfig.h>
+#include <iostream>
 #include <stdexcept>
 
 #include "FontFacade.h"
@@ -12,13 +13,13 @@ Asset FontFacade::get_font_asset(const string font_family) {
 	}
 	// Create a pattern to search for the font family
 	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
-	if (pattern == NULL) {
+	if (!pattern) {
 		throw runtime_error("Failed to create font pattern.");
 	}
 
 	// Default configuration
 	FcConfig * config = FcConfigGetCurrent();
-	if (config == NULL) {
+	if (!config) {
 		FcPatternDestroy(pattern);
 		throw runtime_error("Failed to get current Fontconfig configuration.");
 	}
@@ -28,15 +29,14 @@ Asset FontFacade::get_font_asset(const string font_family) {
 	FcPattern * matched_pattern = FcFontMatch(config, pattern, &result);
 	FcPatternDestroy(pattern);
 
-	if (matched_pattern == NULL) {
-		FcPatternDestroy(matched_pattern);
+	if (!matched_pattern) {
 		throw runtime_error("No matching font found.");
 	}
 
 	// Extract the file path
 	FcChar8 * file_path = nullptr;
 	if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch
-		|| file_path == NULL) {
+		|| !file_path) {
 		FcPatternDestroy(matched_pattern);
 		throw runtime_error("Failed to get font file path.");
 	}
@@ -44,6 +44,6 @@ Asset FontFacade::get_font_asset(const string font_family) {
 	// Convert the file path to a string
 	string font_file_path = reinterpret_cast<const char *>(file_path);
 	FcPatternDestroy(matched_pattern);
-	FcFini();
+	cout << font_file_path << endl;
 	return Asset(font_file_path);
 }
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index a06940d..1befbe5 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -294,7 +294,9 @@ void SDLContext::draw_text(const Text & text, const Font & font){
 		.b = text.data.text_color.b,
 		.a = text.data.text_color.a,
 	};
+	TTF_Font * ttf_font = TTF_OpenFont(font.get_path().c_str(), Config::get_instance().font.size);
 	SDL_Surface * font_surface = TTF_RenderText_Solid(font.get_font(), text.text.c_str(), color);
+	TTF_CloseFont(ttf_font);
 	SDL_Texture * font_texture = SDL_CreateTextureFromSurface(this->game_renderer.get(), font_surface);
 	SDL_FreeSurface(font_surface);
 
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 9611a9e..4a70843 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -13,15 +13,16 @@
 #include "../facade/Texture.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/ResourceManager.h"
-
-#include "RenderSystem.h"
 #include "api/Text.h"
 #include "facade/Font.h"
+
+#include "RenderSystem.h"
 #include "types.h"
 
 using namespace crepe;
 using namespace std;
 
+
 void RenderSystem::clear_screen() {
 	SDLContext & ctx = this->mediator.sdl_context;
 	ctx.clear_screen();
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 21ed7fc..b261f52 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -1,3 +1,5 @@
+
+
 #include "api/Asset.h"
 #include "api/Text.h"
 #include <crepe/Component.h>
@@ -14,7 +16,6 @@
 #include <crepe/manager/ComponentManager.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/types.h>
-#include <iostream>
 
 using namespace crepe;
 using namespace std;
@@ -65,8 +66,8 @@ public:
 													   Camera::Data{
 														   .bg_color = Color::WHITE,
 													   });
-
-		game_object.add_component<Text>(vec2{200,200}, vec2{0,0}, "test test", "", Text::Data{});
+		game_object.add_component<Text>(vec2{200, 200}, vec2{0, 0}, "test test", "Ariel.ttf",
+										Text::Data{});
 	}
 
 	string get_name() const { return "TestScene"; };
-- 
cgit v1.2.3


From 34a773eb0f01379419900a3fe26527702146b890 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 17 Dec 2024 13:33:53 +0100
Subject: last changes

---
 src/crepe/facade/SDLContext.h     | 1 +
 src/crepe/system/RenderSystem.cpp | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index ffa3cc0..e348ff6 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -18,6 +18,7 @@
 #include "types.h"
 
 #include "FontFacade.h"
+
 namespace crepe {
 
 class Texture;
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 18f6393..5fc98a9 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -152,16 +152,15 @@ void RenderSystem::render() {
 void RenderSystem::render_text(Text & text, const Transform & tm) {
     SDLContext & ctx = this->mediator.sdl_context;
 
-    // Check if font is available in text
     if (!text.font.has_value()) {
+        text.font = ctx.get_font_from_name(text.font_family);
     }
 
     ResourceManager & resource_manager = this->mediator.resource_manager;
 
-    if (text.font.has_value()) {
+    if (!text.font.has_value()) {return;}
         const Asset& font_asset = text.font.value();
         const Font & res = resource_manager.get<Font>(font_asset); 
-	}
 }
 
 
-- 
cgit v1.2.3


From 69ca7fdd738fd4ed98aefc07bab5a43486a55619 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 17 Dec 2024 13:34:19 +0100
Subject: final changes

---
 src/crepe/api/LoopManager.h       |  3 +--
 src/crepe/api/Script.h            |  1 -
 src/crepe/api/Text.cpp            |  8 ++++----
 src/crepe/api/Text.h              | 11 +++++------
 src/crepe/facade/Font.cpp         |  3 +--
 src/crepe/facade/FontFacade.cpp   | 10 ++++------
 src/crepe/facade/FontFacade.h     | 10 +++++-----
 src/crepe/facade/SDLContext.cpp   |  2 +-
 src/crepe/facade/SDLContext.h     |  6 ++++--
 src/crepe/system/RenderSystem.cpp | 35 ++++++++++++++---------------------
 src/example/FontExample.cpp       |  5 +++--
 src/example/loadfont.cpp          | 10 +++++-----
 12 files changed, 47 insertions(+), 57 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 1725810..1d23cbf 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -71,7 +71,7 @@ private:
 private:
 	//! Global context
 	Mediator mediator;
-	
+
 	//! SDLContext instance
 	SDLContext sdl_context{mediator};
 	//! Component manager instance
@@ -86,7 +86,6 @@ private:
 	ResourceManager resource_manager{mediator};
 	//! Save manager instance
 	SaveManager save_manager{mediator};
-	
 
 private:
 	/**
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 4503525..8bca38a 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -156,7 +156,6 @@ private:
 	void subscribe_internal(const EventHandler<EventType> & callback, event_channel_t channel);
 
 protected:
-	
 	// NOTE: This must be the only constructor on Script, see "Late references" below
 	Script() = default;
 	//! Only \c BehaviorScript instantiates Script
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 0624c98..58dc6c6 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -4,11 +4,11 @@
 
 using namespace crepe;
 
-Text::Text(game_object_id_t id, const vec2 & dimensions,const vec2 & offset, const std::string & font_family,
-	const Data & data, const std::string & text, std::optional<Asset> font)
+Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
+		   const std::string & font_family, const Data & data, const std::string & text,
+		   std::optional<Asset> font)
 	: UIObject(id, dimensions, offset),
 	  text(text),
 	  data(data),
 	  font_family(font_family),
-	  font(font) {
-}
+	  font(font) {}
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index ab72bc0..92cca18 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -1,7 +1,7 @@
 #pragma once
 
+#include <optional>
 #include <string>
-#include <optional> 
 
 #include "../Component.h"
 
@@ -50,10 +50,10 @@ public:
 	 * \param data Data struct containing extra text parameters.
 	 * \param font Optional font asset that can be passed or left empty.
 	 */
-	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, 
-     const std::string & font_family, const Data & data, 
-     const std::string & text = "", std::optional<Asset> font = std::nullopt);
-	
+	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
+		 const std::string & font_family, const Data & data, const std::string & text = "",
+		 std::optional<Asset> font = std::nullopt);
+
 	//! Label text.
 	std::string text = "";
 	//! font family name
@@ -62,7 +62,6 @@ public:
 	std::optional<Asset> font;
 	//! Data instance
 	Data data;
-	
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 558641f..f202c05 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -8,8 +8,7 @@
 using namespace std;
 using namespace crepe;
 
-Font::Font(const Asset & src, Mediator & mediator)
-	: Resource(src, mediator){
+Font::Font(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
 	Config & config = Config::get_instance();
 	const std::string FONT_PATH = src.get_path();
 	TTF_Font * loaded_font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index 08ff31c..7edfeb8 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -6,16 +6,14 @@
 using namespace crepe;
 using namespace std;
 
-FontFacade::FontFacade(){
+FontFacade::FontFacade() {
 	if (!FcInit()) {
 		throw runtime_error("Failed to initialize Fontconfig.");
 	}
 }
-FontFacade::~FontFacade(){
-	FcFini();
-}
-Asset FontFacade::get_font_asset(const string& font_family) {
-	
+FontFacade::~FontFacade() { FcFini(); }
+Asset FontFacade::get_font_asset(const string & font_family) {
+
 	// Create a pattern to search for the font family
 	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
 	if (pattern == NULL) {
diff --git a/src/crepe/facade/FontFacade.h b/src/crepe/facade/FontFacade.h
index 2e08f3f..9761070 100644
--- a/src/crepe/facade/FontFacade.h
+++ b/src/crepe/facade/FontFacade.h
@@ -15,10 +15,10 @@ class FontFacade {
 public:
 	FontFacade();
 	~FontFacade();
-    FontFacade(const FontFacade & other) = delete;
-    FontFacade & operator=(const FontFacade & other) = delete;
-    FontFacade(FontFacade && other) noexcept = delete;
-    FontFacade & operator=(FontFacade && other) noexcept = delete;
+	FontFacade(const FontFacade & other) = delete;
+	FontFacade & operator=(const FontFacade & other) = delete;
+	FontFacade(FontFacade && other) noexcept = delete;
+	FontFacade & operator=(FontFacade && other) noexcept = delete;
 	/**
 	 * 
 	 * \brief Facade function to convert a font_family into an asset.
@@ -28,7 +28,7 @@ public:
 	 * \param font_family Name of the font family name.
 	 * \return Asset with filepath to the corresponding font.
 	 */
-	Asset get_font_asset(const std::string& font_family);
+	Asset get_font_asset(const std::string & font_family);
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 8ffaad9..c88687e 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -440,6 +440,6 @@ void SDLContext::set_color_texture(const Texture & texture, const Color & color)
 	SDL_SetTextureAlphaMod(texture.get_img(), color.a);
 }
 
-Asset SDLContext::get_font_from_name(const std::string& font_family){
+Asset SDLContext::get_font_from_name(const std::string & font_family) {
 	return this->font_facade.get_font_asset(font_family);
 }
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index e348ff6..6f6eddb 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -241,9 +241,11 @@ private:
 	 * - this is defined in this class because get_events() needs this information aswell
 	 */
 	CameraAuxiliaryData cam_aux_data;
-private: 
+
+private:
 	//! instance of the font_facade
 	FontFacade font_facade{};
+
 public:
 	/**
 	 * \brief Function to Get asset from font_family
@@ -254,7 +256,7 @@ public:
 	 * 
 	 * \return asset with the font style absolute path
 	 */
-	Asset get_font_from_name(const std::string& font_family);
+	Asset get_font_from_name(const std::string & font_family);
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 5fc98a9..a03c636 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -10,8 +10,8 @@
 #include "../api/ParticleEmitter.h"
 #include "../api/Sprite.h"
 #include "../api/Text.h"
-#include "../facade/Font.h"
 #include "../api/Transform.h"
+#include "../facade/Font.h"
 #include "../facade/SDLContext.h"
 #include "../facade/Texture.h"
 #include "../manager/ComponentManager.h"
@@ -23,7 +23,6 @@
 using namespace crepe;
 using namespace std;
 
-
 void RenderSystem::clear_screen() {
 	SDLContext & ctx = this->mediator.sdl_context;
 	ctx.clear_screen();
@@ -126,12 +125,11 @@ void RenderSystem::render() {
 	RefVector<Sprite> sprites = mgr.get_components_by_type<Sprite>();
 	ResourceManager & resource_manager = this->mediator.resource_manager;
 	RefVector<Sprite> sorted_sprites = this->sort(sprites);
-	RefVector<Text> text_components =  mgr.get_components_by_type<Text>();
-	for(Text& text : text_components){
+	RefVector<Text> text_components = mgr.get_components_by_type<Text>();
+	for (Text & text : text_components) {
 		const Transform & transform
 			= mgr.get_components_by_id<Transform>(text.game_object_id).front().get();
-		this->render_text(text,transform);
-
+		this->render_text(text, transform);
 	}
 	for (const Sprite & sprite : sorted_sprites) {
 		if (!sprite.active) continue;
@@ -143,25 +141,20 @@ void RenderSystem::render() {
 		if (rendered_particles) continue;
 
 		this->render_normal(sprite, transform);
-		
-	
-		
 	}
-	
 }
 void RenderSystem::render_text(Text & text, const Transform & tm) {
-    SDLContext & ctx = this->mediator.sdl_context;
+	SDLContext & ctx = this->mediator.sdl_context;
 
-    if (!text.font.has_value()) {
-        text.font = ctx.get_font_from_name(text.font_family);
-    }
+	if (!text.font.has_value()) {
+		text.font = ctx.get_font_from_name(text.font_family);
+	}
 
-    ResourceManager & resource_manager = this->mediator.resource_manager;
+	ResourceManager & resource_manager = this->mediator.resource_manager;
 
-    if (!text.font.has_value()) {return;}
-        const Asset& font_asset = text.font.value();
-        const Font & res = resource_manager.get<Font>(font_asset); 
+	if (!text.font.has_value()) {
+		return;
+	}
+	const Asset & font_asset = text.font.value();
+	const Font & res = resource_manager.get<Font>(font_asset);
 }
-
-
-
diff --git a/src/example/FontExample.cpp b/src/example/FontExample.cpp
index 7b2dadb..6a334b1 100644
--- a/src/example/FontExample.cpp
+++ b/src/example/FontExample.cpp
@@ -1,6 +1,7 @@
 #include <SDL2/SDL_ttf.h>
 #include <chrono>
 #include <crepe/api/Camera.h>
+#include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/LoopManager.h>
 #include <crepe/api/Scene.h>
@@ -11,7 +12,6 @@
 #include <crepe/manager/EventManager.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/manager/ResourceManager.h>
-#include <crepe/api/Config.h>
 #include <exception>
 #include <iostream>
 #include <memory>
@@ -37,7 +37,8 @@ class TestScene : public Scene {
 public:
 	void load_scene() override {
 		GameObject text_object = this->new_object("test", "test", vec2{0, 0}, 0, 1);
-		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{});
+		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "OpenSymbol",
+										Text::Data{});
 		text_object.add_component<BehaviorScript>().set_script<TestScript>();
 		text_object.add_component<Camera>(ivec2{300, 300}, vec2{100, 100}, Camera::Data{});
 	}
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 36d00dd..ed67ffa 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -1,14 +1,14 @@
 #include <SDL2/SDL_ttf.h>
+#include <crepe/api/Asset.h>
 #include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
 #include <crepe/facade/SDLContext.h>
-#include <crepe/api/Asset.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/manager/ResourceManager.h>
 #include <exception>
 #include <iostream>
-#include <optional>
 #include <memory>
+#include <optional>
 using namespace crepe;
 int main() {
 
@@ -20,11 +20,11 @@ int main() {
 	try {
 		// Correct way to create a unique pointer for Text
 		std::unique_ptr<Text> label = std::make_unique<Text>(
-			1, vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{},"test text", Asset(""));
+			1, vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{}, "test text", Asset(""));
 		// std::cout << "Path: " << label->font.get_path() << std::endl;
 
-		std::unique_ptr<Text> label2
-			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0),"fsaafdafsdafsdafsdasfdds", Text::Data{});
+		std::unique_ptr<Text> label2 = std::make_unique<Text>(
+			1, vec2(100, 100), vec2(0, 0), "fsaafdafsdafsdafsdasfdds", Text::Data{});
 		Asset asset = Asset("test test");
 		label->font = asset;
 		std::cout << label->font.value().get_path() << std::endl;
-- 
cgit v1.2.3


From 0c02511f6a64766174cb0db3beb4cc159d3efdf7 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Tue, 17 Dec 2024 13:36:17 +0100
Subject: merging wouter

---
 src/crepe/facade/Font.cpp         | 9 ---------
 src/crepe/facade/Font.h           | 3 ---
 src/crepe/facade/SDLContext.cpp   | 2 --
 src/crepe/system/RenderSystem.cpp | 2 +-
 4 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 51e9690..9c1a800 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -2,8 +2,6 @@
 
 #include "../api/Asset.h"
 #include "../api/Config.h"
-#include "util/Log.h"
-#include <iostream>
 #include <string>
 
 #include "Font.h"
@@ -16,10 +14,6 @@ Font::Font(const Asset & src, Mediator & mediator)
 	Config & config = Config::get_instance();
 	const std::string FONT_PATH = src.get_path();
 
-	this->path = FONT_PATH;
-
-	cout << this->path << endl;
-	/*
 	TTF_Font * loaded_font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
 	if (loaded_font == NULL) {
 		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
@@ -29,6 +23,3 @@ Font::Font(const Asset & src, Mediator & mediator)
 
 TTF_Font * Font::get_font() const { return this->font.get(); }
 
-const string & Font::get_path() const noexcept{
-	return this->path;
-}
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index 3eff3c6..b08366d 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -3,7 +3,6 @@
 #include <SDL2/SDL_ttf.h>
 #include <functional>
 #include <memory>
-#include <string>
 
 #include "../Resource.h"
 
@@ -35,8 +34,6 @@ public:
      */
 	TTF_Font * get_font() const;
 
-	const std::string & get_path() const noexcept;
-
 private:
 	//! The SDL_ttf font object with custom deleter.
 	std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>> font = nullptr;
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 7bd9dbc..c19f0aa 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -294,9 +294,7 @@ void SDLContext::draw_text(const Text & text, const Font & font){
 		.b = text.data.text_color.b,
 		.a = text.data.text_color.a,
 	};
-	TTF_Font * ttf_font = TTF_OpenFont(font.get_path().c_str(), Config::get_instance().font.size);
 	SDL_Surface * font_surface = TTF_RenderText_Solid(font.get_font(), text.text.c_str(), color);
-	TTF_CloseFont(ttf_font);
 	SDL_Texture * font_texture = SDL_CreateTextureFromSurface(this->game_renderer.get(), font_surface);
 	SDL_FreeSurface(font_surface);
 
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 7d6a31b..578a4c0 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -87,7 +87,7 @@ void RenderSystem::render_text(){
 
 	for (const Text & text  : texts) {
 		if (!text.active) continue;
-		const Font & res = resource_manager.get<Font>(text.font);
+		const Font & res = resource_manager.get<Font>(text.font.value());
 		ctx.draw_text(text, res);
 	}
 
-- 
cgit v1.2.3


From 8d3fd95ad8564740bb169f4e08bc085a232a4d83 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Tue, 17 Dec 2024 13:58:52 +0100
Subject: workig rending text

---
 src/crepe/facade/SDLContext.cpp    | 36 +++++++++++++++++++++++++-----------
 src/crepe/facade/SDLContext.h      |  8 +++++++-
 src/crepe/system/RenderSystem.cpp  | 16 ++++++++++------
 src/example/rendering_particle.cpp |  6 +++---
 4 files changed, 45 insertions(+), 21 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index a5ccdae..27f2cb3 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -22,6 +22,7 @@
 #include "../api/Sprite.h"
 #include "../util/Log.h"
 #include "api/Text.h"
+#include "api/Transform.h"
 #include "facade/Font.h"
 #include "manager/Mediator.h"
 
@@ -286,27 +287,40 @@ void SDLContext::draw(const RenderContext & ctx) {
 					  angle, NULL, render_flip);
 }
 
+void SDLContext::draw_text(const RenderText & data) {
 
-void SDLContext::draw_text(const Text & text, const Font & font){
-	SDL_Color color {
+	const Text & text = data.text;
+	const Font & font = data.font;
+	const Transform & transform = data.transform;
+
+	SDL_Color color{
 		.r = text.data.text_color.r,
 		.g = text.data.text_color.g,
 		.b = text.data.text_color.b,
 		.a = text.data.text_color.a,
 	};
-	SDL_Surface * font_surface = TTF_RenderText_Solid(font.get_font(), text.text.c_str(), color);
-	SDL_Texture * font_texture = SDL_CreateTextureFromSurface(this->game_renderer.get(), font_surface);
+	SDL_Surface * font_surface
+		= TTF_RenderText_Solid(font.get_font(), text.text.c_str(), color);
+	SDL_Texture * font_texture
+		= SDL_CreateTextureFromSurface(this->game_renderer.get(), font_surface);
 	SDL_FreeSurface(font_surface);
 
-	SDL_Rect dstrect {
-		.x = (int)text.offset.x,
-		.y = (int)text.offset.y,
-		.w = (int)text.dimensions.x,
-		.h = (int)text.dimensions.y,
+	vec2 size = text.dimensions * cam_aux_data.render_scale;
+	vec2 screen_pos = (transform.position + text.offset - cam_aux_data.cam_pos
+					   + (cam_aux_data.zoomed_viewport) / 2)
+						  * cam_aux_data.render_scale
+					  - size / 2 + cam_aux_data.bar_size;
+
+
+	SDL_FRect dstrect{
+		.x = screen_pos.x,
+		.y = screen_pos.y,
+		.w = size.x,
+		.h = size.y,
 	};
 
-	SDL_RenderCopy(this->game_renderer.get(), font_texture, NULL, NULL);
-	SDL_RenderCopyExF(this->game_renderer.get(), font_texture, NULL, NULL, 0 , NULL, SDL_FLIP_NONE);
+	SDL_RenderCopyExF(this->game_renderer.get(), font_texture, NULL, &dstrect, 0, NULL,
+					  SDL_FLIP_NONE);
 	SDL_DestroyTexture(font_texture);
 }
 
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 33a4ff9..066a881 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -71,6 +71,12 @@ public:
 		const double & scale;
 	};
 
+	struct RenderText {
+		const Text & text;
+		const Font & font;
+		const Transform & transform;
+	};
+
 public:
 	//! EventType enum for passing eventType
 	enum EventType {
@@ -187,7 +193,7 @@ public:
 	 */
 	void draw(const RenderContext & ctx);
 
-	void draw_text(const Text & text, const Font & font);
+	void draw_text(const RenderText & data);
 
 	//! Clears the screen, preparing for a new frame.
 	void clear_screen();
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 872ba29..2641435 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -76,20 +76,24 @@ void RenderSystem::update() {
 	this->present_screen();
 }
 
-
-void RenderSystem::render_text(){
+void RenderSystem::render_text() {
 	SDLContext & ctx = this->mediator.sdl_context;
 	ComponentManager & mgr = this->mediator.component_manager;
 	ResourceManager & resource_manager = this->mediator.resource_manager;
 
 	RefVector<Text> texts = mgr.get_components_by_type<Text>();
 
-	for (const Text & text  : texts) {
+	for (const Text & text : texts) {
 		if (!text.active) continue;
-		const Font & res = resource_manager.get<Font>(text.font.value());
-		ctx.draw_text(text, res);
+		const Font & font = resource_manager.get<Font>(text.font.value());
+		const auto & transform
+			= mgr.get_components_by_id<Transform>(text.game_object_id).front().get();
+		ctx.draw_text(SDLContext::RenderText{
+			.text = text,
+			.font = font,
+			.transform = transform,
+		});
 	}
-
 }
 
 bool RenderSystem::render_particle(const Sprite & sprite, const double & scale) {
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index b261f52..aa71dd0 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -62,12 +62,12 @@ public:
 					 .position_offset = {0, 0},
 				 });
 
-		auto & cam = game_object.add_component<Camera>(ivec2{400, 400}, vec2{400, 400},
+		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{400, 400},
 													   Camera::Data{
 														   .bg_color = Color::WHITE,
 													   });
-		game_object.add_component<Text>(vec2{200, 200}, vec2{0, 0}, "test test", "Ariel.ttf",
-										Text::Data{});
+		game_object.add_component<Text>(vec2{400, 400}, vec2{0, 0}, "ComicSansMS",
+										Text::Data{.text_color = Color::RED}, "TEST test");
 	}
 
 	string get_name() const { return "TestScene"; };
-- 
cgit v1.2.3


From dff8c63a5af46fd3b0115e10efe9f0b67e9111b8 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Tue, 17 Dec 2024 13:59:19 +0100
Subject: make format

---
 src/crepe/facade/Font.cpp       | 1 -
 src/crepe/facade/SDLContext.cpp | 1 -
 src/crepe/system/RenderSystem.h | 1 -
 3 files changed, 3 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 81a9e7a..4694f7c 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -21,4 +21,3 @@ Font::Font(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
 }
 
 TTF_Font * Font::get_font() const { return this->font.get(); }
-
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 27f2cb3..41c6d21 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -311,7 +311,6 @@ void SDLContext::draw_text(const RenderText & data) {
 						  * cam_aux_data.render_scale
 					  - size / 2 + cam_aux_data.bar_size;
 
-
 	SDL_FRect dstrect{
 		.x = screen_pos.x,
 		.y = screen_pos.y,
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index 3476765..3aa846e 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -27,7 +27,6 @@ public:
 	void update() override;
 
 private:
-
 	void render_text();
 	//! Clears the screen in preparation for rendering.
 	void clear_screen();
-- 
cgit v1.2.3


From 68be6b67f79413cb4af0ca15262ca1547a7d0d41 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Tue, 17 Dec 2024 14:16:47 +0100
Subject: finalized text rendering

---
 src/crepe/facade/SDLContext.cpp   | 22 ++++++++++++++++------
 src/crepe/facade/SDLContext.h     |  5 +++++
 src/crepe/system/RenderSystem.cpp | 26 +++++---------------------
 src/crepe/system/RenderSystem.h   |  8 ++------
 4 files changed, 28 insertions(+), 33 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 41c6d21..c3c1b59 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -292,6 +292,8 @@ void SDLContext::draw_text(const RenderText & data) {
 	const Text & text = data.text;
 	const Font & font = data.font;
 	const Transform & transform = data.transform;
+	std::unique_ptr<SDL_Surface, std::function<void(SDL_Surface *)>> font_surface;
+	std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> font_texture;
 
 	SDL_Color color{
 		.r = text.data.text_color.r,
@@ -299,11 +301,20 @@ void SDLContext::draw_text(const RenderText & data) {
 		.b = text.data.text_color.b,
 		.a = text.data.text_color.a,
 	};
-	SDL_Surface * font_surface
+	SDL_Surface * tmp_font_surface
 		= TTF_RenderText_Solid(font.get_font(), text.text.c_str(), color);
-	SDL_Texture * font_texture
-		= SDL_CreateTextureFromSurface(this->game_renderer.get(), font_surface);
-	SDL_FreeSurface(font_surface);
+	if (!tmp_font_surface) {
+		throw runtime_error(format("draw_text: font surface error: {}", SDL_GetError()));
+	}
+	font_surface = {tmp_font_surface, [](SDL_Surface * surface) { SDL_FreeSurface(surface); }};
+
+	SDL_Texture * tmp_font_texture
+		= SDL_CreateTextureFromSurface(this->game_renderer.get(), font_surface.get());
+	if (!tmp_font_texture) {
+		throw runtime_error(format("draw_text: font texture error: {}", SDL_GetError()));
+	}
+	font_texture
+		= {tmp_font_texture, [](SDL_Texture * texture) { SDL_DestroyTexture(texture); }};
 
 	vec2 size = text.dimensions * cam_aux_data.render_scale;
 	vec2 screen_pos = (transform.position + text.offset - cam_aux_data.cam_pos
@@ -318,9 +329,8 @@ void SDLContext::draw_text(const RenderText & data) {
 		.h = size.y,
 	};
 
-	SDL_RenderCopyExF(this->game_renderer.get(), font_texture, NULL, &dstrect, 0, NULL,
+	SDL_RenderCopyExF(this->game_renderer.get(), font_texture.get(), NULL, &dstrect, 0, NULL,
 					  SDL_FLIP_NONE);
-	SDL_DestroyTexture(font_texture);
 }
 
 void SDLContext::update_camera_view(const Camera & cam, const vec2 & new_pos) {
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 066a881..aeace07 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -193,6 +193,11 @@ public:
 	 */
 	void draw(const RenderContext & ctx);
 
+	/**
+	 * \brief draws a text to the screen 
+	 *
+	 * \param data Reference to the rendering data needed to draw
+	 */
 	void draw_text(const RenderText & data);
 
 	//! Clears the screen, preparing for a new frame.
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 2641435..42e4236 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -83,8 +83,11 @@ void RenderSystem::render_text() {
 
 	RefVector<Text> texts = mgr.get_components_by_type<Text>();
 
-	for (const Text & text : texts) {
+	for (Text & text : texts) {
 		if (!text.active) continue;
+		if (!text.font.has_value()) text.font = ctx.get_font_from_name(text.font_family);
+		if (!text.font.has_value()) continue;
+
 		const Font & font = resource_manager.get<Font>(text.font.value());
 		const auto & transform
 			= mgr.get_components_by_id<Transform>(text.game_object_id).front().get();
@@ -149,11 +152,7 @@ void RenderSystem::render() {
 	ResourceManager & resource_manager = this->mediator.resource_manager;
 	RefVector<Sprite> sorted_sprites = this->sort(sprites);
 	RefVector<Text> text_components = mgr.get_components_by_type<Text>();
-	for (Text & text : text_components) {
-		const Transform & transform
-			= mgr.get_components_by_id<Transform>(text.game_object_id).front().get();
-		this->render_text(text, transform);
-	}
+
 	for (const Sprite & sprite : sorted_sprites) {
 		if (!sprite.active) continue;
 		const Transform & transform
@@ -166,18 +165,3 @@ void RenderSystem::render() {
 		this->render_normal(sprite, transform);
 	}
 }
-void RenderSystem::render_text(Text & text, const Transform & tm) {
-	SDLContext & ctx = this->mediator.sdl_context;
-
-	if (!text.font.has_value()) {
-		text.font = ctx.get_font_from_name(text.font_family);
-	}
-
-	ResourceManager & resource_manager = this->mediator.resource_manager;
-
-	if (!text.font.has_value()) {
-		return;
-	}
-	const Asset & font_asset = text.font.value();
-	const Font & res = resource_manager.get<Font>(font_asset);
-}
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index 3aa846e..5fe24d7 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -27,7 +27,6 @@ public:
 	void update() override;
 
 private:
-	void render_text();
 	//! Clears the screen in preparation for rendering.
 	void clear_screen();
 
@@ -39,7 +38,7 @@ private:
 
 	//! Renders the whole screen
 	void render();
-
+	
 	/**
 	 * \brief Renders all the particles on the screen from a given sprite.
 	 *
@@ -53,11 +52,8 @@ private:
 	bool render_particle(const Sprite & sprite, const double & scale);
 	/**
 	 * \brief Renders all Text components
-	 *
-	 * \param text The text component to be rendered.
-	 * \param tm the Transform component that holds the position,rotation and scale
 	 */
-	void render_text(Text & text, const Transform & tm);
+	void render_text();
 	/**
 	 * \brief renders a sprite with a Transform component on the screen
 	 *
-- 
cgit v1.2.3


From 9232a98b72eee7af4f7f2153c1b2ccedbfa4cc65 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 17 Dec 2024 14:42:29 +0100
Subject: fix code standard

---
 src/crepe/facade/SDLContext.cpp | 5 ++---
 src/crepe/facade/SDLContext.h   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 7ccc243..f331517 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -75,9 +75,8 @@ SDLContext::~SDLContext() {
 }
 
 Keycode SDLContext::sdl_to_keycode(SDL_Scancode sdl_key) {
-	if (!LOOKUP_TABLE.contains(sdl_key)) return Keycode::NONE;
-
-	return LOOKUP_TABLE.at(sdl_key);
+	if (!lookup_table.contains(sdl_key)) return Keycode::NONE;
+	return lookup_table.at(sdl_key);
 }
 
 const keyboard_state_t & SDLContext::get_keyboard_state() {
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 8f4760e..b9c7fbd 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -245,7 +245,7 @@ private:
 	//! variable to store the state of each key (true = pressed, false = not pressed)
 	keyboard_state_t keyboard_state;
 	//! lookup table for converting SDL_SCANCODES to Keycodes
-	const std::unordered_map<SDL_Scancode, Keycode> LOOKUP_TABLE
+	const std::unordered_map<SDL_Scancode, Keycode> lookup_table
 		= {{SDL_SCANCODE_SPACE, Keycode::SPACE},
 		   {SDL_SCANCODE_APOSTROPHE, Keycode::APOSTROPHE},
 		   {SDL_SCANCODE_COMMA, Keycode::COMMA},
-- 
cgit v1.2.3


From 6ba8f83d482b5b7ade4cf63293cb9625a7e91f55 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Tue, 17 Dec 2024 14:44:40 +0100
Subject: config will be checout with master once PR#77 is merged, and
 sdlcontext adjustemetns for merging

---
 src/crepe/api/Config.h        | 4 ++++
 src/crepe/facade/SDLContext.h | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index ed1cf38..e91ecd1 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -46,6 +46,10 @@ struct Config final {
 		std::string location = "save.crepe.db";
 	} savemgr;
 
+	struct {
+		unsigned int size = 16;
+	} font;
+
 	//! physics-related settings
 	struct {
 		/**
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 7c791f2..e9c334e 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -78,13 +78,6 @@ public:
 		const Transform & transform;
 	};
 
-public:
-	/**
-	 * \brief Gets the singleton instance of SDLContext.
-	 * \return Reference to the SDLContext instance.
-	 */
-	static SDLContext & get_instance();
-
 public:
 	SDLContext(const SDLContext &) = delete;
 	SDLContext(SDLContext &&) = delete;
-- 
cgit v1.2.3


From 4080a2eec207b35b36f7d0ceae7c2afcfcdfd977 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 17 Dec 2024 14:44:48 +0100
Subject: small changes

---
 src/crepe/api/Script.h    | 1 -
 src/crepe/facade/Font.cpp | 2 +-
 src/example/loadfont.cpp  | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 8bca38a..668e5d1 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -185,7 +185,6 @@ private:
 	 *
 	 * \{
 	 */
-
 	//! Game object ID of game object parent BehaviorScript is attached to
 	game_object_id_t game_object_id;
 	//! Reference to parent component
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index f202c05..771002f 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -9,7 +9,7 @@ using namespace std;
 using namespace crepe;
 
 Font::Font(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
-	Config & config = Config::get_instance();
+	const Config & config = Config::get_instance();
 	const std::string FONT_PATH = src.get_path();
 	TTF_Font * loaded_font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
 	if (loaded_font == NULL) {
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 6fb9760..78b3adb 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -30,8 +30,8 @@ int main() {
 		std::cout << label->font.value().get_path() << std::endl;
 		// label2->font = std::make_optional(asset);
 		// std::cout << "Path: " << label2->font.get_path() << std::endl;
-		// ResourceManager & resource_mgr = mediator.resource_manager;
-		// const Font & res = resource_manager.get<Font>(label->font);
+		ResourceManager & resource_mgr = mediator.resource_manager;
+		const Font & res = resource_manager.get<Font>(label->font.value());
 		// TTF_Font * test_font = res.get_font();
 		// if (test_font == NULL) {
 		// 	std::cout << "error with font" << std::endl;
-- 
cgit v1.2.3


From 27bf7f7a6e2493b742f502b5da394a5a2d74cdd2 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Tue, 17 Dec 2024 14:45:06 +0100
Subject: make format

---
 src/crepe/facade/SDLContext.cpp | 1 -
 src/crepe/facade/SDLContext.h   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 271b746..f368828 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -459,7 +459,6 @@ void SDLContext::handle_window_event(const SDL_WindowEvent & window_event,
 	}
 }
 
-
 void SDLContext::set_color_texture(const Texture & texture, const Color & color) {
 	SDL_SetTextureColorMod(texture.get_img(), color.r, color.g, color.b);
 	SDL_SetTextureAlphaMod(texture.get_img(), color.a);
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index e9c334e..fc44f82 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -12,12 +12,12 @@
 #include <unordered_map>
 
 #include "../types.h"
+#include "EventData.h"
 #include "api/Camera.h"
 #include "api/Color.h"
 #include "api/KeyCodes.h"
 #include "api/Sprite.h"
 #include "api/Transform.h"
-#include "EventData.h"
 
 #include "FontFacade.h"
 
@@ -72,7 +72,7 @@ public:
 		const double & scale;
 	};
 
-		struct RenderText {
+	struct RenderText {
 		const Text & text;
 		const Font & font;
 		const Transform & transform;
-- 
cgit v1.2.3


From e1e7ead5df44383c78c8da65fc5916be13d111b6 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 17 Dec 2024 15:14:32 +0100
Subject: feedback changes

---
 src/crepe/api/Text.cpp          |  6 ++----
 src/crepe/api/Text.h            |  3 +--
 src/crepe/facade/FontFacade.cpp | 48 ++++++++++++++++++++++-------------------
 src/example/loadfont.cpp        |  7 ++++--
 4 files changed, 34 insertions(+), 30 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 58dc6c6..6c632f3 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -5,10 +5,8 @@
 using namespace crepe;
 
 Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
-		   const std::string & font_family, const Data & data, const std::string & text,
-		   std::optional<Asset> font)
+		   const std::string & font_family, const Data & data, const std::string & text)
 	: UIObject(id, dimensions, offset),
 	  text(text),
 	  data(data),
-	  font_family(font_family),
-	  font(font) {}
+	  font_family(font_family){}
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index 92cca18..c30dc80 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -51,8 +51,7 @@ public:
 	 * \param font Optional font asset that can be passed or left empty.
 	 */
 	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
-		 const std::string & font_family, const Data & data, const std::string & text = "",
-		 std::optional<Asset> font = std::nullopt);
+		 const std::string & font_family, const Data & data, const std::string & text = "");
 
 	//! Label text.
 	std::string text = "";
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index 7edfeb8..5382f1a 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -1,51 +1,55 @@
 #include <fontconfig/fontconfig.h>
 #include <stdexcept>
+#include <memory>
+#include <functional>
+#include <string>
 
 #include "FontFacade.h"
 
-using namespace crepe;
 using namespace std;
+using namespace crepe;
 
 FontFacade::FontFacade() {
 	if (!FcInit()) {
 		throw runtime_error("Failed to initialize Fontconfig.");
 	}
 }
+
 FontFacade::~FontFacade() { FcFini(); }
-Asset FontFacade::get_font_asset(const string & font_family) {
 
+Asset FontFacade::get_font_asset(const string& font_family) {
 	// Create a pattern to search for the font family
-	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
-	if (pattern == NULL) {
+	FcPattern* raw_pattern = FcNameParse(reinterpret_cast<const FcChar8*>(font_family.c_str()));
+	if (!raw_pattern) {
 		throw runtime_error("Failed to create font pattern.");
 	}
 
-	// Default configuration
-	FcConfig * config = FcConfigGetCurrent();
-	if (config == NULL) {
-		// FcPatternDestroy(pattern);
+	std::unique_ptr<FcPattern, std::function<void(FcPattern*)>> pattern(
+		raw_pattern,
+		[](FcPattern* p) { FcPatternDestroy(p); }
+	);
+
+	FcConfig* config = FcConfigGetCurrent();
+	if (!config) {
 		throw runtime_error("Failed to get current Fontconfig configuration.");
 	}
 
-	// Match the font pattern
 	FcResult result;
-	FcPattern * matched_pattern = FcFontMatch(config, pattern, &result);
-	FcPatternDestroy(pattern);
-
-	if (matched_pattern == NULL) {
-		FcPatternDestroy(matched_pattern);
+	FcPattern* raw_matched_pattern = FcFontMatch(config, pattern.get(), &result);
+	if (!raw_matched_pattern) {
 		throw runtime_error("No matching font found.");
 	}
-	// Extract the file path
-	FcChar8 * file_path = nullptr;
-	if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch
-		|| file_path == NULL) {
-		// FcPatternDestroy(matched_pattern);
+
+	std::unique_ptr<FcPattern, std::function<void(FcPattern*)>> matched_pattern(
+		raw_matched_pattern,
+		[](FcPattern* p) { FcPatternDestroy(p); }
+	);
+
+	FcChar8* file_path = nullptr;
+	if (FcPatternGetString(matched_pattern.get(), FC_FILE, 0, &file_path) != FcResultMatch || !file_path) {
 		throw runtime_error("Failed to get font file path.");
 	}
 
-	// Convert the file path to a string
-	string font_file_path = reinterpret_cast<const char *>(file_path);
-	FcPatternDestroy(matched_pattern);
+	string font_file_path = reinterpret_cast<const char*>(file_path);
 	return Asset(font_file_path);
 }
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 78b3adb..788fac4 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -3,6 +3,7 @@
 #include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
 #include <crepe/facade/SDLContext.h>
+#include <crepe/facade/FontFacade.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/manager/ResourceManager.h>
 #include <exception>
@@ -14,15 +15,17 @@ int main() {
 
 	// SDLFontContext font_facade;
 	Mediator mediator;
+	FontFacade font_facade{};
 	SDLContext sdl_context{mediator};
 	// ComponentManager component_manager{mediator};
 	ResourceManager resource_manager{mediator};
 	try {
 		// Correct way to create a unique pointer for Text
 		std::unique_ptr<Text> label = std::make_unique<Text>(
-			1, vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{}, "test text", Asset(""));
+			1, vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{}, "test text");
 		// std::cout << "Path: " << label->font.get_path() << std::endl;
-
+		Asset asset1 = font_facade.get_font_asset("OpenSymbol");
+		std::cout << asset1.get_path() << std::endl;
 		std::unique_ptr<Text> label2 = std::make_unique<Text>(
 			1, vec2(100, 100), vec2(0, 0), "fsaafdafsdafsdafsdasfdds", Text::Data{});
 		Asset asset = Asset("test test");
-- 
cgit v1.2.3


From 2772bb158f10fc051d35006041303f2e5418e817 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 17 Dec 2024 15:15:12 +0100
Subject: make format

---
 src/crepe/api/Text.cpp          |  2 +-
 src/crepe/facade/FontFacade.cpp | 34 ++++++++++++++++------------------
 src/example/loadfont.cpp        |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 6c632f3..54a4370 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -9,4 +9,4 @@ Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
 	: UIObject(id, dimensions, offset),
 	  text(text),
 	  data(data),
-	  font_family(font_family){}
+	  font_family(font_family) {}
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index 5382f1a..5db06d2 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -1,7 +1,7 @@
 #include <fontconfig/fontconfig.h>
-#include <stdexcept>
-#include <memory>
 #include <functional>
+#include <memory>
+#include <stdexcept>
 #include <string>
 
 #include "FontFacade.h"
@@ -17,39 +17,37 @@ FontFacade::FontFacade() {
 
 FontFacade::~FontFacade() { FcFini(); }
 
-Asset FontFacade::get_font_asset(const string& font_family) {
-	// Create a pattern to search for the font family
-	FcPattern* raw_pattern = FcNameParse(reinterpret_cast<const FcChar8*>(font_family.c_str()));
+Asset FontFacade::get_font_asset(const string & font_family) {
+
+	FcPattern * raw_pattern
+		= FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
 	if (!raw_pattern) {
 		throw runtime_error("Failed to create font pattern.");
 	}
 
-	std::unique_ptr<FcPattern, std::function<void(FcPattern*)>> pattern(
-		raw_pattern,
-		[](FcPattern* p) { FcPatternDestroy(p); }
-	);
+	std::unique_ptr<FcPattern, std::function<void(FcPattern *)>> pattern(
+		raw_pattern, [](FcPattern * p) { FcPatternDestroy(p); });
 
-	FcConfig* config = FcConfigGetCurrent();
+	FcConfig * config = FcConfigGetCurrent();
 	if (!config) {
 		throw runtime_error("Failed to get current Fontconfig configuration.");
 	}
 
 	FcResult result;
-	FcPattern* raw_matched_pattern = FcFontMatch(config, pattern.get(), &result);
+	FcPattern * raw_matched_pattern = FcFontMatch(config, pattern.get(), &result);
 	if (!raw_matched_pattern) {
 		throw runtime_error("No matching font found.");
 	}
 
-	std::unique_ptr<FcPattern, std::function<void(FcPattern*)>> matched_pattern(
-		raw_matched_pattern,
-		[](FcPattern* p) { FcPatternDestroy(p); }
-	);
+	std::unique_ptr<FcPattern, std::function<void(FcPattern *)>> matched_pattern(
+		raw_matched_pattern, [](FcPattern * p) { FcPatternDestroy(p); });
 
-	FcChar8* file_path = nullptr;
-	if (FcPatternGetString(matched_pattern.get(), FC_FILE, 0, &file_path) != FcResultMatch || !file_path) {
+	FcChar8 * file_path = nullptr;
+	if (FcPatternGetString(matched_pattern.get(), FC_FILE, 0, &file_path) != FcResultMatch
+		|| !file_path) {
 		throw runtime_error("Failed to get font file path.");
 	}
 
-	string font_file_path = reinterpret_cast<const char*>(file_path);
+	string font_file_path = reinterpret_cast<const char *>(file_path);
 	return Asset(font_file_path);
 }
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 788fac4..e459332 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -2,8 +2,8 @@
 #include <crepe/api/Asset.h>
 #include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
-#include <crepe/facade/SDLContext.h>
 #include <crepe/facade/FontFacade.h>
+#include <crepe/facade/SDLContext.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/manager/ResourceManager.h>
 #include <exception>
-- 
cgit v1.2.3


From b4335bd670cb7f3f622e6ab701123cfbabd15d37 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 17 Dec 2024 15:32:57 +0100
Subject: fix tests + nitpick #77

---
 src/crepe/facade/FontFacade.cpp | 32 +++++++++++++-------------------
 src/test/InputTest.cpp          |  7 ++++++-
 2 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index 5db06d2..d47095f 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -10,44 +10,38 @@ using namespace std;
 using namespace crepe;
 
 FontFacade::FontFacade() {
-	if (!FcInit()) {
+	if (!FcInit())
 		throw runtime_error("Failed to initialize Fontconfig.");
-	}
 }
 
 FontFacade::~FontFacade() { FcFini(); }
 
 Asset FontFacade::get_font_asset(const string & font_family) {
-
 	FcPattern * raw_pattern
 		= FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
-	if (!raw_pattern) {
-		throw runtime_error("Failed to create font pattern.");
-	}
+	if (raw_pattern == NULL) throw runtime_error("Failed to create font pattern.");
 
-	std::unique_ptr<FcPattern, std::function<void(FcPattern *)>> pattern(
-		raw_pattern, [](FcPattern * p) { FcPatternDestroy(p); });
+	unique_ptr<FcPattern, function<void(FcPattern *)>> pattern{
+		raw_pattern, [](FcPattern * p) { FcPatternDestroy(p); }
+	};
 
 	FcConfig * config = FcConfigGetCurrent();
-	if (!config) {
-		throw runtime_error("Failed to get current Fontconfig configuration.");
-	}
+	if (config == NULL) throw runtime_error("Failed to get current Fontconfig configuration.");
 
 	FcResult result;
 	FcPattern * raw_matched_pattern = FcFontMatch(config, pattern.get(), &result);
-	if (!raw_matched_pattern) {
-		throw runtime_error("No matching font found.");
-	}
+	if (raw_matched_pattern == NULL) throw runtime_error("No matching font found.");
 
-	std::unique_ptr<FcPattern, std::function<void(FcPattern *)>> matched_pattern(
-		raw_matched_pattern, [](FcPattern * p) { FcPatternDestroy(p); });
+	unique_ptr<FcPattern, function<void(FcPattern *)>> matched_pattern = {
+		raw_matched_pattern, [](FcPattern * p) { FcPatternDestroy(p); }
+	};
 
 	FcChar8 * file_path = nullptr;
-	if (FcPatternGetString(matched_pattern.get(), FC_FILE, 0, &file_path) != FcResultMatch
-		|| !file_path) {
+	FcResult res = FcPatternGetString(matched_pattern.get(), FC_FILE, 0, &file_path);
+	if (res != FcResultMatch || file_path == NULL)
 		throw runtime_error("Failed to get font file path.");
-	}
 
 	string font_file_path = reinterpret_cast<const char *>(file_path);
 	return Asset(font_file_path);
 }
+
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index d893276..2d844d4 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -1,7 +1,11 @@
-#include "system/RenderSystem.h"
 #include <gtest/gtest.h>
+
+#include <crepe/manager/ResourceManager.h>
+#include <crepe/system/RenderSystem.h>
+
 #define protected public
 #define private public
+
 #include "api/KeyCodes.h"
 #include "manager/ComponentManager.h"
 #include "manager/EventManager.h"
@@ -29,6 +33,7 @@ public:
 	SDLContext sdl_context{mediator};
 
 	InputSystem input_system{mediator};
+	ResourceManager resman{mediator};
 	RenderSystem render{mediator};
 	EventManager event_manager{mediator};
 	//GameObject camera;
-- 
cgit v1.2.3


From a8ccf7fe8662086bb223aa4eafd0f85e717d16cf Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 17 Dec 2024 15:33:31 +0100
Subject: `make format`

---
 mwe/events/include/event.h      |  2 +-
 src/crepe/facade/FontFacade.cpp | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index e1b220b..ee1bf52 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -148,7 +148,7 @@ private:
 };
 class ShutDownEvent : public Event {
 public:
-	ShutDownEvent() : Event("ShutDownEvent"){};
+	ShutDownEvent() : Event("ShutDownEvent") {};
 
 	REGISTER_EVENT_TYPE(ShutDownEvent)
 
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index d47095f..87f95ab 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -10,8 +10,7 @@ using namespace std;
 using namespace crepe;
 
 FontFacade::FontFacade() {
-	if (!FcInit())
-		throw runtime_error("Failed to initialize Fontconfig.");
+	if (!FcInit()) throw runtime_error("Failed to initialize Fontconfig.");
 }
 
 FontFacade::~FontFacade() { FcFini(); }
@@ -22,8 +21,7 @@ Asset FontFacade::get_font_asset(const string & font_family) {
 	if (raw_pattern == NULL) throw runtime_error("Failed to create font pattern.");
 
 	unique_ptr<FcPattern, function<void(FcPattern *)>> pattern{
-		raw_pattern, [](FcPattern * p) { FcPatternDestroy(p); }
-	};
+		raw_pattern, [](FcPattern * p) { FcPatternDestroy(p); }};
 
 	FcConfig * config = FcConfigGetCurrent();
 	if (config == NULL) throw runtime_error("Failed to get current Fontconfig configuration.");
@@ -32,9 +30,8 @@ Asset FontFacade::get_font_asset(const string & font_family) {
 	FcPattern * raw_matched_pattern = FcFontMatch(config, pattern.get(), &result);
 	if (raw_matched_pattern == NULL) throw runtime_error("No matching font found.");
 
-	unique_ptr<FcPattern, function<void(FcPattern *)>> matched_pattern = {
-		raw_matched_pattern, [](FcPattern * p) { FcPatternDestroy(p); }
-	};
+	unique_ptr<FcPattern, function<void(FcPattern *)>> matched_pattern
+		= {raw_matched_pattern, [](FcPattern * p) { FcPatternDestroy(p); }};
 
 	FcChar8 * file_path = nullptr;
 	FcResult res = FcPatternGetString(matched_pattern.get(), FC_FILE, 0, &file_path);
@@ -44,4 +41,3 @@ Asset FontFacade::get_font_asset(const string & font_family) {
 	string font_file_path = reinterpret_cast<const char *>(file_path);
 	return Asset(font_file_path);
 }
-
-- 
cgit v1.2.3


From 36f941aa1cdea5faeec20a0dc793e0538ccd6d15 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Tue, 17 Dec 2024 20:47:14 +0100
Subject: implemented feedback

---
 src/crepe/api/Text.cpp            | 3 ---
 src/crepe/api/Text.h              | 2 --
 src/crepe/facade/Font.cpp         | 2 --
 src/crepe/facade/Font.h           | 2 +-
 src/crepe/facade/SDLContext.cpp   | 4 ++--
 src/crepe/system/RenderSystem.cpp | 1 -
 6 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 9d57abd..4a94180 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -1,6 +1,3 @@
-#include "../facade/FontFacade.h"
-#include "util/Log.h"
-
 #include "Text.h"
 
 using namespace crepe;
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index c30dc80..da40141 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -3,8 +3,6 @@
 #include <optional>
 #include <string>
 
-#include "../Component.h"
-
 #include "Asset.h"
 #include "Color.h"
 #include "UIObject.h"
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 0c670c1..771002f 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -2,7 +2,6 @@
 
 #include "../api/Asset.h"
 #include "../api/Config.h"
-#include <string>
 
 #include "Font.h"
 
@@ -12,7 +11,6 @@ using namespace crepe;
 Font::Font(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
 	const Config & config = Config::get_instance();
 	const std::string FONT_PATH = src.get_path();
-
 	TTF_Font * loaded_font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
 	if (loaded_font == NULL) {
 		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index b08366d..b208d96 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <SDL2/SDL_ttf.h>
-#include <functional>
 #include <memory>
 
 #include "../Resource.h"
+#include "../api/Config.h"
 
 namespace crepe {
 
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index ea3b71c..9a122f5 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -208,14 +208,14 @@ void SDLContext::draw_text(const RenderText & data) {
 	};
 	SDL_Surface * tmp_font_surface
 		= TTF_RenderText_Solid(font.get_font(), text.text.c_str(), color);
-	if (!tmp_font_surface) {
+	if (tmp_font_surface == NULL) {
 		throw runtime_error(format("draw_text: font surface error: {}", SDL_GetError()));
 	}
 	font_surface = {tmp_font_surface, [](SDL_Surface * surface) { SDL_FreeSurface(surface); }};
 
 	SDL_Texture * tmp_font_texture
 		= SDL_CreateTextureFromSurface(this->game_renderer.get(), font_surface.get());
-	if (!tmp_font_texture) {
+	if (tmp_font_texture == NULL) {
 		throw runtime_error(format("draw_text: font texture error: {}", SDL_GetError()));
 	}
 	font_texture
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 4082591..bf2bfd3 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -87,7 +87,6 @@ void RenderSystem::render_text() {
 		if (!text.active) continue;
 		if (!text.font.has_value())
 			text.font.emplace(ctx.get_font_from_name(text.font_family));
-		if (!text.font.has_value()) continue;
 
 		const Font & font = resource_manager.get<Font>(text.font.value());
 		const auto & transform
-- 
cgit v1.2.3


From ea5e62b4ca8fbe214605abdab486bf6dcc1cc540 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 18 Dec 2024 11:31:54 +0100
Subject: added particle begin lifespan rendering, added world_space to sprite
 so that coordinates are in camera_space or world_sapce

---
 src/crepe/api/Sprite.h             | 10 ++++++++++
 src/crepe/facade/SDLContext.cpp    | 17 +++++++++++++----
 src/crepe/system/RenderSystem.cpp  |  9 ++++++---
 src/crepe/system/RenderSystem.h    |  3 ++-
 src/example/rendering_particle.cpp | 25 ++++---------------------
 5 files changed, 35 insertions(+), 29 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index a2409c2..a3fc319 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -66,6 +66,16 @@ public:
 
 		//! independent sprite offset position
 		vec2 position_offset;
+
+		/**
+		 * \brief gives the user the option to render this in world space or in camera space
+		 *
+		 * - if true will this be rendered in world space this means that the sprite can be
+		 *   rendered off the screen 
+		 * - if false --> will the sprite be rendered in camera space. this means that the
+		 *   coordinates given on the \c Sprite and \c Transform will be inside the camera 
+		 */
+		bool world_space = true;
 	};
 
 public:
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index fffbe34..35f82d8 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -13,6 +13,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
+#include <iostream>
 #include <memory>
 #include <stdexcept>
 
@@ -137,6 +138,9 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 		= (ctx.sprite.aspect_ratio == 0) ? ctx.texture.get_ratio() : ctx.sprite.aspect_ratio;
 
 	vec2 size = data.size;
+	vec2 screen_pos = ctx.pos + data.position_offset;
+
+
 	if (data.size.x == 0 && data.size.y != 0) {
 		size.x = data.size.y * aspect_ratio;
 	}
@@ -145,10 +149,15 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 	}
 	size *= cam_aux_data.render_scale * ctx.img_scale * data.scale_offset;
 
-	vec2 screen_pos = (ctx.pos + data.position_offset - cam_aux_data.cam_pos
-					   + (cam_aux_data.zoomed_viewport) / 2)
-						  * cam_aux_data.render_scale
-					  - size / 2 + cam_aux_data.bar_size;
+	if (ctx.sprite.data.world_space) {
+		cout << "world_space" << endl;
+		vec2 multiplier = cam_aux_data.cam_pos + (cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale - size / 2 + cam_aux_data.bar_size;
+		screen_pos += multiplier;
+	} else {
+		cout << "camera space" << endl;
+		vec2 multiplier = (cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale - size / 2 + cam_aux_data.bar_size;
+		screen_pos += multiplier;
+	}
 
 	return SDL_FRect{
 		.x = screen_pos.x,
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 62d42ec..57d180f 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -73,7 +73,8 @@ void RenderSystem::update() {
 	this->present_screen();
 }
 
-bool RenderSystem::render_particle(const Sprite & sprite, const double & scale) {
+bool RenderSystem::render_particle(const Sprite & sprite, const float & transform_angle,
+								   const float & scale) {
 
 	ComponentManager & mgr = this->mediator.component_manager;
 	SDLContext & ctx = this->mediator.sdl_context;
@@ -92,12 +93,13 @@ bool RenderSystem::render_particle(const Sprite & sprite, const double & scale)
 
 		for (const Particle & p : em.particles) {
 			if (!p.active) continue;
+			if (p.time_in_life < em.data.begin_lifespan) continue;
 
 			ctx.draw(SDLContext::RenderContext{
 				.sprite = sprite,
 				.texture = res,
 				.pos = p.position,
-				.angle = p.angle,
+				.angle = p.angle + transform_angle,
 				.scale = scale,
 			});
 		}
@@ -136,7 +138,8 @@ void RenderSystem::render() {
 		const Transform & transform
 			= mgr.get_components_by_id<Transform>(sprite.game_object_id).front().get();
 
-		bool rendered_particles = this->render_particle(sprite, transform.scale);
+		bool rendered_particles
+			= this->render_particle(sprite, transform.rotation, transform.scale);
 
 		if (rendered_particles) continue;
 
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index 56a0553..76df0e0 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -49,7 +49,8 @@ private:
 	 *  constructor is now protected i cannot make tmp inside
 	 * \return true if particles have been rendered
 	 */
-	bool render_particle(const Sprite & sprite, const double & scale);
+	bool render_particle(const Sprite & sprite, const float & transform_angle,
+						 const float & scale);
 	/**
 	 * \brief Renders all Text components
 	 *
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index add43f4..1c8072e 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -13,7 +13,6 @@
 #include <crepe/manager/ComponentManager.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/types.h>
-#include <iostream>
 
 using namespace crepe;
 using namespace std;
@@ -21,11 +20,7 @@ using namespace std;
 class TestScene : public Scene {
 public:
 	void load_scene() {
-
-		cout << "TestScene" << endl;
-		Mediator & mediator = this->mediator;
-		ComponentManager & mgr = mediator.component_manager;
-		GameObject game_object = mgr.new_object("", "", vec2{0, 0}, 0, 1);
+		GameObject game_object = new_object("", "", vec2{0, 0}, 0, 1);
 
 		Color color(255, 255, 255, 255);
 
@@ -41,25 +36,13 @@ public:
 					 .angle_offset = 0,
 					 .position_offset = {0, 0},
 				 });
+		auto & emitter = game_object.add_component<ParticleEmitter>(test_sprite, ParticleEmitter::Data{});
 
-		//auto & anim = game_object.add_component<Animator>(test_sprite,ivec2{32, 64}, uvec2{4,1}, Animator::Data{});
-		//anim.set_anim(0);
-
-		auto & cam = game_object.add_component<Camera>(ivec2{720, 1280}, vec2{400, 400},
+		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{400, 400},
 													   Camera::Data{
 														   .bg_color = Color::WHITE,
 													   });
-
-		function<void()> on_click = [&]() { cout << "button clicked" << std::endl; };
-		function<void()> on_enter = [&]() { cout << "enter" << std::endl; };
-		function<void()> on_exit = [&]() { cout << "exit" << std::endl; };
-
-		auto & button
-			= game_object.add_component<Button>(vec2{200, 200}, vec2{0, 0}, on_click, false);
-		button.on_mouse_enter = on_enter;
-		button.on_mouse_exit = on_exit;
-		button.is_toggle = true;
-		button.active = true;
+		cam.data.postion_offset = {1000,1000};
 	}
 
 	string get_name() const { return "TestScene"; };
-- 
cgit v1.2.3


From 3f176dace320b9bb72675cf9b6fd77fe6d35c539 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 18 Dec 2024 11:32:41 +0100
Subject: make format

---
 src/crepe/facade/SDLContext.cpp    | 8 +++++---
 src/example/rendering_particle.cpp | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 35f82d8..ed702b0 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -140,7 +140,6 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 	vec2 size = data.size;
 	vec2 screen_pos = ctx.pos + data.position_offset;
 
-
 	if (data.size.x == 0 && data.size.y != 0) {
 		size.x = data.size.y * aspect_ratio;
 	}
@@ -151,11 +150,14 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 
 	if (ctx.sprite.data.world_space) {
 		cout << "world_space" << endl;
-		vec2 multiplier = cam_aux_data.cam_pos + (cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale - size / 2 + cam_aux_data.bar_size;
+		vec2 multiplier = cam_aux_data.cam_pos
+						  + (cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale
+						  - size / 2 + cam_aux_data.bar_size;
 		screen_pos += multiplier;
 	} else {
 		cout << "camera space" << endl;
-		vec2 multiplier = (cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale - size / 2 + cam_aux_data.bar_size;
+		vec2 multiplier = (cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale
+						  - size / 2 + cam_aux_data.bar_size;
 		screen_pos += multiplier;
 	}
 
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 1c8072e..0fe24df 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -36,13 +36,14 @@ public:
 					 .angle_offset = 0,
 					 .position_offset = {0, 0},
 				 });
-		auto & emitter = game_object.add_component<ParticleEmitter>(test_sprite, ParticleEmitter::Data{});
+		auto & emitter
+			= game_object.add_component<ParticleEmitter>(test_sprite, ParticleEmitter::Data{});
 
 		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{400, 400},
 													   Camera::Data{
 														   .bg_color = Color::WHITE,
 													   });
-		cam.data.postion_offset = {1000,1000};
+		cam.data.postion_offset = {1000, 1000};
 	}
 
 	string get_name() const { return "TestScene"; };
-- 
cgit v1.2.3


From f71769f7d2e9530a49295d0c0c86c2f6add069d8 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 18 Dec 2024 13:22:18 +0100
Subject: process feedback

---
 src/crepe/api/Engine.cpp          |  2 +-
 src/crepe/facade/Texture.cpp      | 10 ++++++----
 src/crepe/manager/ReplayManager.h |  4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Engine.cpp b/src/crepe/api/Engine.cpp
index bbb4494..2e9d35a 100644
--- a/src/crepe/api/Engine.cpp
+++ b/src/crepe/api/Engine.cpp
@@ -39,7 +39,7 @@ void Engine::loop() {
 	LoopTimerManager & timer = this->loop_timer;
 	SystemManager & systems = this->system_manager;
 
-	while (game_running) {
+	while (this->game_running) {
 		timer.update();
 
 		while (timer.get_lag() >= timer.get_fixed_delta_time()) {
diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp
index 23a9c8e..cd06439 100644
--- a/src/crepe/facade/Texture.cpp
+++ b/src/crepe/facade/Texture.cpp
@@ -1,10 +1,10 @@
 #include "../util/dbg.h"
-#include "facade/SDLContext.h"
-#include "manager/Mediator.h"
+#include "../facade/SDLContext.h"
+#include "../manager/Mediator.h"
+#include "../types.h"
+#include "../Resource.h"
 
-#include "Resource.h"
 #include "Texture.h"
-#include "types.h"
 
 using namespace crepe;
 using namespace std;
@@ -23,6 +23,8 @@ Texture::~Texture() {
 }
 
 const ivec2 & Texture::get_size() const noexcept { return this->size; }
+
 const float & Texture::get_ratio() const noexcept { return this->aspect_ratio; }
 
 SDL_Texture * Texture::get_img() const noexcept { return this->texture.get(); }
+
diff --git a/src/crepe/manager/ReplayManager.h b/src/crepe/manager/ReplayManager.h
index ab15b27..f06a58b 100644
--- a/src/crepe/manager/ReplayManager.h
+++ b/src/crepe/manager/ReplayManager.h
@@ -2,12 +2,14 @@
 
 #include <unordered_map>
 
+#include "../util/OptionalRef.h"
+
 #include "ComponentManager.h"
 #include "Manager.h"
-#include "util/OptionalRef.h"
 
 namespace crepe {
 
+//! Handle to recording held by ReplayManager
 typedef size_t recording_t;
 
 /**
-- 
cgit v1.2.3


From aaca31b3495060b46f178d476636563279fc1c23 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 18 Dec 2024 13:27:54 +0100
Subject: implemented wouter feedback

---
 src/crepe/facade/SDLContext.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index ed702b0..0d5eb01 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -11,9 +11,7 @@
 #include <array>
 #include <cmath>
 #include <cstddef>
-#include <cstdint>
 #include <functional>
-#include <iostream>
 #include <memory>
 #include <stdexcept>
 
@@ -149,13 +147,11 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 	size *= cam_aux_data.render_scale * ctx.img_scale * data.scale_offset;
 
 	if (ctx.sprite.data.world_space) {
-		cout << "world_space" << endl;
 		vec2 multiplier = cam_aux_data.cam_pos
 						  + (cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale
 						  - size / 2 + cam_aux_data.bar_size;
 		screen_pos += multiplier;
 	} else {
-		cout << "camera space" << endl;
 		vec2 multiplier = (cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale
 						  - size / 2 + cam_aux_data.bar_size;
 		screen_pos += multiplier;
-- 
cgit v1.2.3


From d8e6773be7206994716c29e1ee8195b10f094bdf Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 18 Dec 2024 13:38:54 +0100
Subject: added transform scale and rotation in the drawing text component

---
 src/crepe/facade/SDLContext.cpp    | 5 ++---
 src/example/rendering_particle.cpp | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 9a122f5..f350250 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -11,7 +11,6 @@
 #include <array>
 #include <cmath>
 #include <cstddef>
-#include <cstdint>
 #include <functional>
 #include <memory>
 #include <stdexcept>
@@ -221,7 +220,7 @@ void SDLContext::draw_text(const RenderText & data) {
 	font_texture
 		= {tmp_font_texture, [](SDL_Texture * texture) { SDL_DestroyTexture(texture); }};
 
-	vec2 size = text.dimensions * cam_aux_data.render_scale;
+	vec2 size = text.dimensions * cam_aux_data.render_scale * transform.scale;
 	vec2 screen_pos = (transform.position + text.offset - cam_aux_data.cam_pos
 					   + (cam_aux_data.zoomed_viewport) / 2)
 						  * cam_aux_data.render_scale
@@ -234,7 +233,7 @@ void SDLContext::draw_text(const RenderText & data) {
 		.h = size.y,
 	};
 
-	SDL_RenderCopyExF(this->game_renderer.get(), font_texture.get(), NULL, &dstrect, 0, NULL,
+	SDL_RenderCopyExF(this->game_renderer.get(), font_texture.get(), NULL, &dstrect, transform.rotation, NULL,
 					  SDL_FLIP_NONE);
 }
 
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index e8b3775..4430d75 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -40,11 +40,11 @@ public:
 					 .position_offset = {0, 0},
 				 });
 
-		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{400, 400},
+		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{4000, 4000},
 													   Camera::Data{
 														   .bg_color = Color::WHITE,
 													   });
-		game_object.add_component<Text>(vec2{400, 400}, vec2{0, 0}, "ComicSansMS",
+		game_object.add_component<Text>(vec2{4000, 400}, vec2{0, 0}, "ComicSansMS",
 										Text::Data{.text_color = Color::RED}, "TEST test");
 	}
 
-- 
cgit v1.2.3


From 5605d438a242a6252f7a27ce772eb092b62d78ae Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 18 Dec 2024 14:21:09 +0100
Subject: `make format`

---
 src/crepe/api/Script.cpp          | 1 -
 src/crepe/facade/Texture.cpp      | 5 ++---
 src/crepe/system/ScriptSystem.cpp | 4 ++--
 src/crepe/system/ScriptSystem.h   | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 6de6830..b147252 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -61,4 +61,3 @@ bool Script::get_key_state(Keycode key) const noexcept {
 		return false;
 	}
 }
-
diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp
index cd06439..6fb22e1 100644
--- a/src/crepe/facade/Texture.cpp
+++ b/src/crepe/facade/Texture.cpp
@@ -1,8 +1,8 @@
-#include "../util/dbg.h"
+#include "../Resource.h"
 #include "../facade/SDLContext.h"
 #include "../manager/Mediator.h"
 #include "../types.h"
-#include "../Resource.h"
+#include "../util/dbg.h"
 
 #include "Texture.h"
 
@@ -27,4 +27,3 @@ const ivec2 & Texture::get_size() const noexcept { return this->size; }
 const float & Texture::get_ratio() const noexcept { return this->aspect_ratio; }
 
 SDL_Texture * Texture::get_img() const noexcept { return this->texture.get(); }
-
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 9977396..93b4853 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -19,7 +19,8 @@ void ScriptSystem::frame_update() {
 	this->update(&Script::frame_update, delta_time);
 }
 
-void ScriptSystem::update(void (Script::* update_function)(duration_t), const duration_t & delta_time) {
+void ScriptSystem::update(void (Script::*update_function)(duration_t),
+						  const duration_t & delta_time) {
 	ComponentManager & mgr = this->mediator.component_manager;
 	RefVector<BehaviorScript> behavior_scripts = mgr.get_components_by_type<BehaviorScript>();
 
@@ -37,4 +38,3 @@ void ScriptSystem::update(void (Script::* update_function)(duration_t), const du
 		(*script.*update_function)(delta_time);
 	}
 }
-
diff --git a/src/crepe/system/ScriptSystem.h b/src/crepe/system/ScriptSystem.h
index ca4534a..095515f 100644
--- a/src/crepe/system/ScriptSystem.h
+++ b/src/crepe/system/ScriptSystem.h
@@ -36,7 +36,7 @@ public:
 	void frame_update() override;
 
 private:
-	void update(void (Script::* update_function)(duration_t), const duration_t & delta_time);
+	void update(void (Script::*update_function)(duration_t), const duration_t & delta_time);
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From d0286486b5fddcfb32dcd1f3010aef5368ee678e Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 18 Dec 2024 19:17:38 +0100
Subject: rendering met absoluut position util functie, particle ben ik nog
 jaro aan het overleggen dus er die werkt niet goed

---
 src/crepe/facade/SDLContext.cpp     | 14 +++++++-------
 src/crepe/system/RenderSystem.cpp   | 12 ++++++------
 src/crepe/system/RenderSystem.h     |  2 +-
 src/crepe/util/AbsoluutPosition.cpp | 20 ++++++++++++++++++++
 src/crepe/util/AbsoluutPosition.h   | 14 ++++++++++++++
 src/crepe/util/CMakeLists.txt       |  2 ++
 src/example/rendering_particle.cpp  | 27 ++++++++++++++++++++-------
 7 files changed, 70 insertions(+), 21 deletions(-)
 create mode 100644 src/crepe/util/AbsoluutPosition.cpp
 create mode 100644 src/crepe/util/AbsoluutPosition.h

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index f350250..d352adc 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -28,6 +28,7 @@
 #include "SDLContext.h"
 #include "Texture.h"
 #include "types.h"
+#include "util/AbsoluutPosition.h"
 
 using namespace crepe;
 using namespace std;
@@ -148,8 +149,7 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 	}
 	size *= cam_aux_data.render_scale * ctx.img_scale * data.scale_offset;
 
-	vec2 screen_pos = (ctx.pos + data.position_offset - cam_aux_data.cam_pos
-					   + (cam_aux_data.zoomed_viewport) / 2)
+	vec2 screen_pos = (ctx.pos - cam_aux_data.cam_pos + (cam_aux_data.zoomed_viewport) / 2)
 						  * cam_aux_data.render_scale
 					  - size / 2 + cam_aux_data.bar_size;
 
@@ -195,7 +195,7 @@ void SDLContext::draw_text(const RenderText & data) {
 
 	const Text & text = data.text;
 	const Font & font = data.font;
-	const Transform & transform = data.transform;
+	vec2 absoluut_pos = AbsoluutPosition::get_position(data.transform, data.text.offset);
 	std::unique_ptr<SDL_Surface, std::function<void(SDL_Surface *)>> font_surface;
 	std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> font_texture;
 
@@ -220,8 +220,8 @@ void SDLContext::draw_text(const RenderText & data) {
 	font_texture
 		= {tmp_font_texture, [](SDL_Texture * texture) { SDL_DestroyTexture(texture); }};
 
-	vec2 size = text.dimensions * cam_aux_data.render_scale * transform.scale;
-	vec2 screen_pos = (transform.position + text.offset - cam_aux_data.cam_pos
+	vec2 size = text.dimensions * cam_aux_data.render_scale * data.transform.scale;
+	vec2 screen_pos = (absoluut_pos + text.offset - cam_aux_data.cam_pos
 					   + (cam_aux_data.zoomed_viewport) / 2)
 						  * cam_aux_data.render_scale
 					  - size / 2 + cam_aux_data.bar_size;
@@ -233,8 +233,8 @@ void SDLContext::draw_text(const RenderText & data) {
 		.h = size.y,
 	};
 
-	SDL_RenderCopyExF(this->game_renderer.get(), font_texture.get(), NULL, &dstrect, transform.rotation, NULL,
-					  SDL_FLIP_NONE);
+	SDL_RenderCopyExF(this->game_renderer.get(), font_texture.get(), NULL, &dstrect,
+					  data.transform.rotation, NULL, SDL_FLIP_NONE);
 }
 
 void SDLContext::update_camera_view(const Camera & cam, const vec2 & new_pos) {
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index bf2bfd3..ba09530 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -21,6 +21,7 @@
 
 #include "RenderSystem.h"
 #include "types.h"
+#include "util/AbsoluutPosition.h"
 
 using namespace crepe;
 using namespace std;
@@ -99,8 +100,7 @@ void RenderSystem::render_text() {
 	}
 }
 
-bool RenderSystem::render_particle(const Sprite & sprite, const double & scale) {
-
+bool RenderSystem::render_particle(const Sprite & sprite, const Transform & tm){
 	ComponentManager & mgr = this->mediator.component_manager;
 	SDLContext & ctx = this->mediator.sdl_context;
 	ResourceManager & resource_manager = this->mediator.resource_manager;
@@ -122,9 +122,9 @@ bool RenderSystem::render_particle(const Sprite & sprite, const double & scale)
 			ctx.draw(SDLContext::RenderContext{
 				.sprite = sprite,
 				.texture = res,
-				.pos = p.position,
+				.pos = AbsoluutPosition::get_position(tm, em.data.offset + sprite.data.position_offset),
 				.angle = p.angle,
-				.scale = scale,
+				.scale = tm.scale,
 			});
 		}
 	}
@@ -138,7 +138,7 @@ void RenderSystem::render_normal(const Sprite & sprite, const Transform & tm) {
 	ctx.draw(SDLContext::RenderContext{
 		.sprite = sprite,
 		.texture = res,
-		.pos = tm.position,
+		.pos = AbsoluutPosition::get_position(tm, sprite.data.position_offset),
 		.angle = tm.rotation,
 		.scale = tm.scale,
 	});
@@ -158,7 +158,7 @@ void RenderSystem::render() {
 		const Transform & transform
 			= mgr.get_components_by_id<Transform>(sprite.game_object_id).front().get();
 
-		bool rendered_particles = this->render_particle(sprite, transform.scale);
+		bool rendered_particles = this->render_particle(sprite, transform);
 
 		if (rendered_particles) continue;
 
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index d5385eb..762b11f 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -53,7 +53,7 @@ private:
 	 *  constructor is now protected i cannot make tmp inside
 	 * \return true if particles have been rendered
 	 */
-	bool render_particle(const Sprite & sprite, const double & scale);
+	bool render_particle(const Sprite & sprite, const Transform & tm);
 	/**
 	 * \brief renders a sprite with a Transform component on the screen
 	 *
diff --git a/src/crepe/util/AbsoluutPosition.cpp b/src/crepe/util/AbsoluutPosition.cpp
new file mode 100644
index 0000000..296cc09
--- /dev/null
+++ b/src/crepe/util/AbsoluutPosition.cpp
@@ -0,0 +1,20 @@
+#include "AbsoluutPosition.h"
+
+using namespace crepe;
+
+vec2 AbsoluutPosition::get_position(const Transform & transform, const vec2 & offset) {
+	// Get the rotation in radians
+	float radians1 = transform.rotation * (M_PI / 180.0);
+
+	// Calculate total offset with scale
+	vec2 total_offset = offset * transform.scale;
+
+	// Rotate
+	float rotated_total_offset_x1
+		= total_offset.x * cos(radians1) - total_offset.y * sin(radians1);
+	float rotated_total_offset_y1
+		= total_offset.x * sin(radians1) + total_offset.y * cos(radians1);
+
+	// Final positions considering scaling and rotation
+	return (transform.position + vec2(rotated_total_offset_x1, rotated_total_offset_y1));
+}
diff --git a/src/crepe/util/AbsoluutPosition.h b/src/crepe/util/AbsoluutPosition.h
new file mode 100644
index 0000000..30a7f93
--- /dev/null
+++ b/src/crepe/util/AbsoluutPosition.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "api/Transform.h"
+
+#include "types.h"
+
+namespace crepe {
+
+class AbsoluutPosition {
+public:
+	static vec2 get_position(const Transform & transform, const vec2 & offset);
+};
+
+} // namespace crepe
diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
index 94ed906..b4b9221 100644
--- a/src/crepe/util/CMakeLists.txt
+++ b/src/crepe/util/CMakeLists.txt
@@ -1,6 +1,7 @@
 target_sources(crepe PUBLIC
 	LogColor.cpp
 	Log.cpp
+	AbsoluutPosition.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -11,5 +12,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Proxy.hpp
 	OptionalRef.h
 	OptionalRef.hpp
+	AbsoluutPosition.h
 )
 
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 4430d75..9cf25d7 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -23,11 +23,11 @@ using namespace std;
 class TestScene : public Scene {
 public:
 	void load_scene() {
-		GameObject game_object = new_object("", "", vec2{0, 0}, 0, 1);
+		GameObject game_object = new_object("", "", vec2{0, 0}, 45, 1);
 
 		Color color(255, 255, 255, 255);
 
-		Asset img{"asset/spritesheet/spritesheet_test.png"};
+		Asset img{"asset/texture/square.png"};
 
 		Sprite & test_sprite = game_object.add_component<Sprite>(
 			img, Sprite::Data{
@@ -35,17 +35,30 @@ public:
 					 .flip = Sprite::FlipSettings{false, false},
 					 .sorting_in_layer = 2,
 					 .order_in_layer = 2,
-					 .size = {0, 0},
+					 .size = {1, 1},
 					 .angle_offset = 0,
-					 .position_offset = {0, 0},
+					 .position_offset = {0, 1},
 				 });
 
-		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{4000, 4000},
+		Sprite & test_sprite1
+			= game_object.add_component<Sprite>(img, Sprite::Data{
+														 .color = color,
+														 .size = {1, 1},
+														 .position_offset = {0, -1},
+													 });
+
+		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{5, 5},
 													   Camera::Data{
 														   .bg_color = Color::WHITE,
 													   });
-		game_object.add_component<Text>(vec2{4000, 400}, vec2{0, 0}, "ComicSansMS",
-										Text::Data{.text_color = Color::RED}, "TEST test");
+
+		/*
+		game_object.add_component<Text>(vec2{1, 1}, vec2{0, -0.5}, "ComicSansMS",
+										Text::Data{.text_color = Color::RED}, "test TEST");
+
+		game_object.add_component<Text>(vec2{1, 1}, vec2{0, 0.5}, "ComicSansMS",
+										Text::Data{.text_color = Color::BLACK}, "TEST test");
+		*/
 	}
 
 	string get_name() const { return "TestScene"; };
-- 
cgit v1.2.3


From 88d84763147fbd6bcc087f15a7460566a009cdb2 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 19 Dec 2024 13:41:02 +0100
Subject: fix header ordering

---
 src/crepe/facade/Texture.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp
index cd06439..9a10f9b 100644
--- a/src/crepe/facade/Texture.cpp
+++ b/src/crepe/facade/Texture.cpp
@@ -1,9 +1,9 @@
 #include "../util/dbg.h"
-#include "../facade/SDLContext.h"
 #include "../manager/Mediator.h"
 #include "../types.h"
 #include "../Resource.h"
 
+#include "SDLContext.h"
 #include "Texture.h"
 
 using namespace crepe;
-- 
cgit v1.2.3


From 9633c6a8608175e9832f6995efc46023deebcf94 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 19 Dec 2024 15:05:56 +0100
Subject: removed absoluut position because file name, renamed functions in
 sdlcontext

---
 src/crepe/facade/SDLContext.cpp     |  4 ++--
 src/crepe/facade/SDLContext.h       |  2 +-
 src/crepe/util/AbsoluutPosition.cpp | 20 --------------------
 src/crepe/util/AbsoluutPosition.h   | 14 --------------
 4 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 src/crepe/util/AbsoluutPosition.cpp
 delete mode 100644 src/crepe/util/AbsoluutPosition.h

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 642aef8..31b0a0b 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -24,11 +24,11 @@
 #include "api/Transform.h"
 #include "facade/Font.h"
 #include "manager/Mediator.h"
+#include "util/AbsolutePosition.h"
 
 #include "SDLContext.h"
 #include "Texture.h"
 #include "types.h"
-#include "util/AbsoluutPosition.h"
 
 using namespace crepe;
 using namespace std;
@@ -204,7 +204,7 @@ void SDLContext::draw_text(const RenderText & data) {
 
 	const Text & text = data.text;
 	const Font & font = data.font;
-	vec2 absoluut_pos = AbsoluutPosition::get_position(data.transform, data.text.offset);
+	vec2 absoluut_pos = AbsolutePosition::get_position(data.transform, data.text.offset);
 	std::unique_ptr<SDL_Surface, std::function<void(SDL_Surface *)>> font_surface;
 	std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> font_texture;
 
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 1dada74..7f07d34 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -18,8 +18,8 @@
 #include "api/KeyCodes.h"
 #include "api/Sprite.h"
 #include "api/Transform.h"
-#include "types.h"
 
+#include "types.h"
 #include "EventData.h"
 #include "FontFacade.h"
 
diff --git a/src/crepe/util/AbsoluutPosition.cpp b/src/crepe/util/AbsoluutPosition.cpp
deleted file mode 100644
index 296cc09..0000000
--- a/src/crepe/util/AbsoluutPosition.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "AbsoluutPosition.h"
-
-using namespace crepe;
-
-vec2 AbsoluutPosition::get_position(const Transform & transform, const vec2 & offset) {
-	// Get the rotation in radians
-	float radians1 = transform.rotation * (M_PI / 180.0);
-
-	// Calculate total offset with scale
-	vec2 total_offset = offset * transform.scale;
-
-	// Rotate
-	float rotated_total_offset_x1
-		= total_offset.x * cos(radians1) - total_offset.y * sin(radians1);
-	float rotated_total_offset_y1
-		= total_offset.x * sin(radians1) + total_offset.y * cos(radians1);
-
-	// Final positions considering scaling and rotation
-	return (transform.position + vec2(rotated_total_offset_x1, rotated_total_offset_y1));
-}
diff --git a/src/crepe/util/AbsoluutPosition.h b/src/crepe/util/AbsoluutPosition.h
deleted file mode 100644
index 30a7f93..0000000
--- a/src/crepe/util/AbsoluutPosition.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "api/Transform.h"
-
-#include "types.h"
-
-namespace crepe {
-
-class AbsoluutPosition {
-public:
-	static vec2 get_position(const Transform & transform, const vec2 & offset);
-};
-
-} // namespace crepe
-- 
cgit v1.2.3


From a35b8998ec828877991c6da92879e37f28f64dc5 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 19 Dec 2024 15:50:55 +0100
Subject: fixed ( placedment

---
 src/crepe/facade/SDLContext.cpp    | 22 ++++++++++++++++------
 src/example/rendering_particle.cpp |  9 ++++++---
 2 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 31b0a0b..dc3f362 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -12,6 +12,7 @@
 #include <cmath>
 #include <cstddef>
 #include <functional>
+#include <iostream>
 #include <memory>
 #include <stdexcept>
 
@@ -152,16 +153,23 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 	size *= cam_aux_data.render_scale * ctx.img_scale * data.scale_offset;
 
 	if (ctx.sprite.data.world_space) {
-		vec2 multiplier = cam_aux_data.cam_pos
-						  + (cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale
-						  - size / 2 + cam_aux_data.bar_size;
-		screen_pos += multiplier;
+		screen_pos = (screen_pos - cam_aux_data.cam_pos
+					  + cam_aux_data.zoomed_viewport / 2)
+						 * cam_aux_data.render_scale
+					 - size / 2 + cam_aux_data.bar_size;
 	} else {
-		vec2 multiplier = (cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale
+		screen_pos = (screen_pos + cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale
 						  - size / 2 + cam_aux_data.bar_size;
-		screen_pos += multiplier;
 	}
 
+	cout << "HALLO" << endl;
+	cout << screen_pos.x << " " << screen_pos.y << endl;
+	cout << data.position_offset.x << " " << data.position_offset.y << endl;
+	cout << ctx.pos.x << " " << ctx.pos.y << endl;
+	cout << size.x << " " << size.y << endl;
+	cout << cam_aux_data.render_scale.x << " " << cam_aux_data.render_scale.y << endl;
+	cout << cam_aux_data.bar_size.x << " " << cam_aux_data.bar_size.y << endl;
+
 	return SDL_FRect{
 		.x = screen_pos.x,
 		.y = screen_pos.y,
@@ -195,6 +203,8 @@ void SDLContext::draw(const RenderContext & ctx) {
 
 	double angle = ctx.angle + data.angle_offset;
 
+	cout << dstrect.x << " " << dstrect.y << " " << dstrect.w << " " << dstrect.h << endl;
+
 	this->set_color_texture(ctx.texture, ctx.sprite.data.color);
 	SDL_RenderCopyExF(this->game_renderer.get(), ctx.texture.get_img(), srcrect_ptr, &dstrect,
 					  angle, NULL, render_flip);
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 07cfae2..b623596 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -23,7 +23,7 @@ using namespace std;
 class TestScene : public Scene {
 public:
 	void load_scene() {
-		GameObject game_object = new_object("", "", vec2{0, 0}, 45, 1);
+		GameObject game_object = new_object("", "", vec2{0, 0}, 0, 1);
 
 		Color color(255, 255, 255, 255);
 
@@ -38,22 +38,25 @@ public:
 					 .size = {1, 1},
 					 .angle_offset = 0,
 					 .position_offset = {0, 1},
+				.world_space = false,
 				 });
-		auto & emitter
-			= game_object.add_component<ParticleEmitter>(test_sprite, ParticleEmitter::Data{});
+		//auto & emitter			= game_object.add_component<ParticleEmitter>(test_sprite, ParticleEmitter::Data{});
 
 		Sprite & test_sprite1
 			= game_object.add_component<Sprite>(img, Sprite::Data{
 														 .color = color,
 														 .size = {1, 1},
 														 .position_offset = {0, -1},
+				.world_space = false,
 													 });
 
 		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{5, 5},
 													   Camera::Data{
 														   .bg_color = Color::WHITE,
+												 .postion_offset = {1000,1000},
 													   });
 
+
 		/*
 		game_object.add_component<Text>(vec2{1, 1}, vec2{0, -0.5}, "ComicSansMS",
 										Text::Data{.text_color = Color::RED}, "test TEST");
-- 
cgit v1.2.3


From 7c8c94663fdedb212e993eec232e6d40290cb67e Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 19 Dec 2024 15:51:59 +0100
Subject: make format

---
 src/crepe/facade/SDLContext.cpp    | 8 ++++----
 src/crepe/facade/SDLContext.h      | 2 +-
 src/crepe/system/RenderSystem.h    | 1 -
 src/example/rendering_particle.cpp | 7 +++----
 4 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index dc3f362..6fb312b 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -153,13 +153,13 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 	size *= cam_aux_data.render_scale * ctx.img_scale * data.scale_offset;
 
 	if (ctx.sprite.data.world_space) {
-		screen_pos = (screen_pos - cam_aux_data.cam_pos
-					  + cam_aux_data.zoomed_viewport / 2)
+		screen_pos = (screen_pos - cam_aux_data.cam_pos + cam_aux_data.zoomed_viewport / 2)
 						 * cam_aux_data.render_scale
 					 - size / 2 + cam_aux_data.bar_size;
 	} else {
-		screen_pos = (screen_pos + cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale
-						  - size / 2 + cam_aux_data.bar_size;
+		screen_pos
+			= (screen_pos + cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale
+			  - size / 2 + cam_aux_data.bar_size;
 	}
 
 	cout << "HALLO" << endl;
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 7f07d34..e570073 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -19,9 +19,9 @@
 #include "api/Sprite.h"
 #include "api/Transform.h"
 
-#include "types.h"
 #include "EventData.h"
 #include "FontFacade.h"
+#include "types.h"
 
 namespace crepe {
 class Texture;
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index ed55dd5..14e5c2d 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -66,7 +66,6 @@ private:
 	 * \return returns a sorted reference vector
 	 */
 	RefVector<Sprite> sort(RefVector<Sprite> & objs) const;
-
 };
 
 } // namespace crepe
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index b623596..5440fdd 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -38,7 +38,7 @@ public:
 					 .size = {1, 1},
 					 .angle_offset = 0,
 					 .position_offset = {0, 1},
-				.world_space = false,
+					 .world_space = false,
 				 });
 		//auto & emitter			= game_object.add_component<ParticleEmitter>(test_sprite, ParticleEmitter::Data{});
 
@@ -47,16 +47,15 @@ public:
 														 .color = color,
 														 .size = {1, 1},
 														 .position_offset = {0, -1},
-				.world_space = false,
+														 .world_space = false,
 													 });
 
 		auto & cam = game_object.add_component<Camera>(ivec2{1280, 720}, vec2{5, 5},
 													   Camera::Data{
 														   .bg_color = Color::WHITE,
-												 .postion_offset = {1000,1000},
+														   .postion_offset = {1000, 1000},
 													   });
 
-
 		/*
 		game_object.add_component<Text>(vec2{1, 1}, vec2{0, -0.5}, "ComicSansMS",
 										Text::Data{.text_color = Color::RED}, "test TEST");
-- 
cgit v1.2.3


From bdb9e02cf345015aa0beaf4f451e28335df21d59 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 19 Dec 2024 15:57:30 +0100
Subject: removed cout

---
 src/crepe/facade/SDLContext.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 6fb312b..35ea57f 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -12,7 +12,6 @@
 #include <cmath>
 #include <cstddef>
 #include <functional>
-#include <iostream>
 #include <memory>
 #include <stdexcept>
 
@@ -162,14 +161,6 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 			  - size / 2 + cam_aux_data.bar_size;
 	}
 
-	cout << "HALLO" << endl;
-	cout << screen_pos.x << " " << screen_pos.y << endl;
-	cout << data.position_offset.x << " " << data.position_offset.y << endl;
-	cout << ctx.pos.x << " " << ctx.pos.y << endl;
-	cout << size.x << " " << size.y << endl;
-	cout << cam_aux_data.render_scale.x << " " << cam_aux_data.render_scale.y << endl;
-	cout << cam_aux_data.bar_size.x << " " << cam_aux_data.bar_size.y << endl;
-
 	return SDL_FRect{
 		.x = screen_pos.x,
 		.y = screen_pos.y,
@@ -203,8 +194,6 @@ void SDLContext::draw(const RenderContext & ctx) {
 
 	double angle = ctx.angle + data.angle_offset;
 
-	cout << dstrect.x << " " << dstrect.y << " " << dstrect.w << " " << dstrect.h << endl;
-
 	this->set_color_texture(ctx.texture, ctx.sprite.data.color);
 	SDL_RenderCopyExF(this->game_renderer.get(), ctx.texture.get_img(), srcrect_ptr, &dstrect,
 					  angle, NULL, render_flip);
-- 
cgit v1.2.3


From 1b98253b58a077618aabcf9dfe073495b8db8d4f Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 19 Dec 2024 16:09:37 +0100
Subject: removed adding extra offset

---
 src/crepe/facade/SDLContext.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 35ea57f..ca45b79 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -229,7 +229,7 @@ void SDLContext::draw_text(const RenderText & data) {
 		= {tmp_font_texture, [](SDL_Texture * texture) { SDL_DestroyTexture(texture); }};
 
 	vec2 size = text.dimensions * cam_aux_data.render_scale * data.transform.scale;
-	vec2 screen_pos = (absoluut_pos + text.offset - cam_aux_data.cam_pos
+	vec2 screen_pos = (absoluut_pos - cam_aux_data.cam_pos
 					   + (cam_aux_data.zoomed_viewport) / 2)
 						  * cam_aux_data.render_scale
 					  - size / 2 + cam_aux_data.bar_size;
-- 
cgit v1.2.3


From 8cd4b07e866d33589a7218367a5639b602c40c67 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 19 Dec 2024 19:45:17 +0100
Subject: make format

---
 src/crepe/api/Rigidbody.h            |   2 -
 src/crepe/facade/SDLContext.cpp      |   8 +-
 src/crepe/system/CollisionSystem.cpp | 335 +++++++++++++++++------------------
 src/crepe/system/CollisionSystem.h   |  42 +++--
 src/crepe/system/ParticleSystem.cpp  |   3 +-
 src/crepe/system/RenderSystem.cpp    |   2 +-
 src/example/game.cpp                 |   4 +-
 src/test/CollisionTest.cpp           |   1 -
 8 files changed, 198 insertions(+), 199 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h
index 28c376b..b63d941 100644
--- a/src/crepe/api/Rigidbody.h
+++ b/src/crepe/api/Rigidbody.h
@@ -164,8 +164,6 @@ public:
 		 * Each element represents a tag from the Metadata of the gameobject.
 		 */
 		std::set<std::string> collision_tags;
-
-
 	};
 
 public:
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index ca45b79..164d35e 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -229,10 +229,10 @@ void SDLContext::draw_text(const RenderText & data) {
 		= {tmp_font_texture, [](SDL_Texture * texture) { SDL_DestroyTexture(texture); }};
 
 	vec2 size = text.dimensions * cam_aux_data.render_scale * data.transform.scale;
-	vec2 screen_pos = (absoluut_pos - cam_aux_data.cam_pos
-					   + (cam_aux_data.zoomed_viewport) / 2)
-						  * cam_aux_data.render_scale
-					  - size / 2 + cam_aux_data.bar_size;
+	vec2 screen_pos
+		= (absoluut_pos - cam_aux_data.cam_pos + (cam_aux_data.zoomed_viewport) / 2)
+			  * cam_aux_data.render_scale
+		  - size / 2 + cam_aux_data.bar_size;
 
 	SDL_FRect dstrect{
 		.x = screen_pos.x,
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp
index 00b56a4..f0f1fa8 100644
--- a/src/crepe/system/CollisionSystem.cpp
+++ b/src/crepe/system/CollisionSystem.cpp
@@ -26,12 +26,12 @@ using namespace crepe;
 using enum Rigidbody::BodyType;
 
 CollisionSystem::CollisionInfo CollisionSystem::CollisionInfo::operator-() const {
-  return {
-    .self = this->other,
+	return {
+		.self = this->other,
 		.other = this->self,
 		.resolution = -this->resolution,
 		.resolution_direction = this->resolution_direction,
-  };
+	};
 }
 
 void CollisionSystem::update() {
@@ -52,8 +52,7 @@ void CollisionSystem::update() {
 			if (!boxcollider.active) continue;
 			all_colliders.push_back({.id = id,
 									 .collider = collider_variant{boxcollider},
-									 .info = {transform,rigidbody, metadata}
-									 });
+									 .info = {transform, rigidbody, metadata}});
 		}
 		// Check if the circlecollider is active and has the same id as the rigidbody.
 		RefVector<CircleCollider> circlecolliders
@@ -63,8 +62,7 @@ void CollisionSystem::update() {
 			if (!circlecollider.active) continue;
 			all_colliders.push_back({.id = id,
 									 .collider = collider_variant{circlecollider},
-									 .info = {transform,rigidbody, metadata}
-									 });
+									 .info = {transform, rigidbody, metadata}});
 		}
 	}
 
@@ -75,13 +73,14 @@ void CollisionSystem::update() {
 	// For the object convert the info and call the collision handler if needed
 	for (auto & collision_pair : collided) {
 		// Convert internal struct to external struct
-		CollisionInfo info = this->get_collision_info(collision_pair.first, collision_pair.second);
+		CollisionInfo info
+			= this->get_collision_info(collision_pair.first, collision_pair.second);
 		// Determine if and/or what collison handler is needed.
 		this->determine_collision_handler(info);
 	}
 }
 
-// Below is for collision detection 
+// Below is for collision detection
 std::vector<std::pair<CollisionSystem::CollisionInternal, CollisionSystem::CollisionInternal>>
 CollisionSystem::gather_collisions(std::vector<CollisionInternal> & colliders) {
 
@@ -101,17 +100,18 @@ CollisionSystem::gather_collisions(std::vector<CollisionInternal> & colliders) {
 		for (size_t j = i + 1; j < colliders.size(); ++j) {
 			if (colliders[i].id == colliders[j].id) continue;
 			if (!should_collide(colliders[i], colliders[j])) continue;
-				CollisionInternalType type = get_collider_type(colliders[i].collider, colliders[j].collider);
-			if (!detect_collision(colliders[i],colliders[j],type)) continue;
-				//fet 
-				collisions_ret.emplace_back(colliders[i], colliders[j]);
+			CollisionInternalType type
+				= get_collider_type(colliders[i].collider, colliders[j].collider);
+			if (!detect_collision(colliders[i], colliders[j], type)) continue;
+			//fet
+			collisions_ret.emplace_back(colliders[i], colliders[j]);
 		}
 	}
 	return collisions_ret;
 }
 
-
-bool CollisionSystem::should_collide(const CollisionInternal & self, const CollisionInternal & other) const{
+bool CollisionSystem::should_collide(const CollisionInternal & self,
+									 const CollisionInternal & other) const {
 
 	const Rigidbody::Data & self_rigidbody = self.info.rigidbody.data;
 	const Rigidbody::Data & other_rigidbody = other.info.rigidbody.data;
@@ -119,21 +119,20 @@ bool CollisionSystem::should_collide(const CollisionInternal & self, const Colli
 	const Metadata & other_metadata = other.info.metadata;
 
 	// Check collision layers
-	if(self_rigidbody.collision_layers.contains(other_rigidbody.collision_layer)) return true;
-	if(other_rigidbody.collision_layers.contains(self_rigidbody.collision_layer)) return true;
+	if (self_rigidbody.collision_layers.contains(other_rigidbody.collision_layer)) return true;
+	if (other_rigidbody.collision_layers.contains(self_rigidbody.collision_layer)) return true;
 
 	// Check names
-	if(self_rigidbody.collision_names.contains(other_metadata.name)) return true;
-	if(other_rigidbody.collision_names.contains(self_metadata.name)) return true;
+	if (self_rigidbody.collision_names.contains(other_metadata.name)) return true;
+	if (other_rigidbody.collision_names.contains(self_metadata.name)) return true;
 
 	// Check tags
-	if(self_rigidbody.collision_tags.contains(other_metadata.tag)) return true;
-	if(other_rigidbody.collision_tags.contains(self_metadata.tag)) return true;
+	if (self_rigidbody.collision_tags.contains(other_metadata.tag)) return true;
+	if (other_rigidbody.collision_tags.contains(self_metadata.tag)) return true;
 
 	return false;
 }
 
-
 CollisionSystem::CollisionInternalType
 CollisionSystem::get_collider_type(const collider_variant & collider1,
 								   const collider_variant & collider2) const {
@@ -152,93 +151,86 @@ CollisionSystem::get_collider_type(const collider_variant & collider1,
 	}
 }
 
-bool CollisionSystem::detect_collision(CollisionInternal & self,CollisionInternal & other,const CollisionInternalType & type) {
+bool CollisionSystem::detect_collision(CollisionInternal & self, CollisionInternal & other,
+									   const CollisionInternalType & type) {
 	vec2 resolution;
 	switch (type) {
-		case CollisionInternalType::BOX_BOX: { 
+		case CollisionInternalType::BOX_BOX: {
 			// Box-Box collision detection
-			const BoxColliderInternal BOX1 = {
-				.collider = std::get<std::reference_wrapper<BoxCollider>>(self.collider),
-				.transform = self.info.transform,
-				.rigidbody = self.info.rigidbody
-			};
-			const BoxColliderInternal BOX2 = {
-				.collider = std::get<std::reference_wrapper<BoxCollider>>(other.collider),
-				.transform = other.info.transform,
-				.rigidbody = other.info.rigidbody
-			};
+			const BoxColliderInternal BOX1
+				= {.collider = std::get<std::reference_wrapper<BoxCollider>>(self.collider),
+				   .transform = self.info.transform,
+				   .rigidbody = self.info.rigidbody};
+			const BoxColliderInternal BOX2
+				= {.collider = std::get<std::reference_wrapper<BoxCollider>>(other.collider),
+				   .transform = other.info.transform,
+				   .rigidbody = other.info.rigidbody};
 			// Get resolution vector from box-box collision detection
 			resolution = this->get_box_box_detection(BOX1, BOX2);
 			// If no collision (NaN values), return false
-			if(std::isnan(resolution.x) && std::isnan(resolution.y)) return false;
+			if (std::isnan(resolution.x) && std::isnan(resolution.y)) return false;
 			break;
-			
 		}
 		case CollisionInternalType::BOX_CIRCLE: {
 			// Box-Circle collision detection
-			const BoxColliderInternal BOX1 = {
-				.collider = std::get<std::reference_wrapper<BoxCollider>>(self.collider),
-				.transform = self.info.transform,
-				.rigidbody = self.info.rigidbody
-			};
+			const BoxColliderInternal BOX1
+				= {.collider = std::get<std::reference_wrapper<BoxCollider>>(self.collider),
+				   .transform = self.info.transform,
+				   .rigidbody = self.info.rigidbody};
 			const CircleColliderInternal CIRCLE2 = {
 				.collider = std::get<std::reference_wrapper<CircleCollider>>(other.collider),
 				.transform = other.info.transform,
-				.rigidbody = other.info.rigidbody
-			};
+				.rigidbody = other.info.rigidbody};
 			// Get resolution vector from box-circle collision detection
 			resolution = this->get_box_circle_detection(BOX1, CIRCLE2);
 			// If no collision (NaN values), return false
-			if(std::isnan(resolution.x) && std::isnan(resolution.y)) return false;
+			if (std::isnan(resolution.x) && std::isnan(resolution.y)) return false;
 			// Invert the resolution vector for proper collision response
 			resolution = -resolution;
 			break;
 		}
-		case CollisionInternalType::CIRCLE_CIRCLE: { 
+		case CollisionInternalType::CIRCLE_CIRCLE: {
 			// Circle-Circle collision detection
-			const CircleColliderInternal CIRCLE1 = {
-				.collider = std::get<std::reference_wrapper<CircleCollider>>(self.collider),
-				.transform = self.info.transform,
-				.rigidbody = self.info.rigidbody
-			};
+			const CircleColliderInternal CIRCLE1
+				= {.collider = std::get<std::reference_wrapper<CircleCollider>>(self.collider),
+				   .transform = self.info.transform,
+				   .rigidbody = self.info.rigidbody};
 			const CircleColliderInternal CIRCLE2 = {
 				.collider = std::get<std::reference_wrapper<CircleCollider>>(other.collider),
 				.transform = other.info.transform,
-				.rigidbody = other.info.rigidbody
-			};
+				.rigidbody = other.info.rigidbody};
 			// Get resolution vector from circle-circle collision detection
-			resolution = this->get_circle_circle_detection(CIRCLE1,CIRCLE2);
+			resolution = this->get_circle_circle_detection(CIRCLE1, CIRCLE2);
 			// If no collision (NaN values), return false
-			if(std::isnan(resolution.x) && std::isnan(resolution.y)) return false;
+			if (std::isnan(resolution.x) && std::isnan(resolution.y)) return false;
 			break;
 		}
-		case CollisionInternalType::CIRCLE_BOX: { 
+		case CollisionInternalType::CIRCLE_BOX: {
 			// Circle-Box collision detection
-			const CircleColliderInternal CIRCLE1 = {
-				.collider = std::get<std::reference_wrapper<CircleCollider>>(self.collider),
-				.transform = self.info.transform,
-				.rigidbody = self.info.rigidbody
-			};
-			const BoxColliderInternal BOX2 = {
-				.collider = std::get<std::reference_wrapper<BoxCollider>>(other.collider),
-				.transform = other.info.transform,
-				.rigidbody = other.info.rigidbody
-			};
+			const CircleColliderInternal CIRCLE1
+				= {.collider = std::get<std::reference_wrapper<CircleCollider>>(self.collider),
+				   .transform = self.info.transform,
+				   .rigidbody = self.info.rigidbody};
+			const BoxColliderInternal BOX2
+				= {.collider = std::get<std::reference_wrapper<BoxCollider>>(other.collider),
+				   .transform = other.info.transform,
+				   .rigidbody = other.info.rigidbody};
 			// Get resolution vector from box-circle collision detection (order swapped)
 			resolution = this->get_box_circle_detection(BOX2, CIRCLE1);
 			// If no collision (NaN values), return false
-			if(std::isnan(resolution.x) && std::isnan(resolution.y)) return false;
+			if (std::isnan(resolution.x) && std::isnan(resolution.y)) return false;
 			break;
 		}
 		case CollisionInternalType::NONE:
-		// No collision detection needed if the type is NONE
-		return false;
-		break;
+			// No collision detection needed if the type is NONE
+			return false;
+			break;
 	}
-	 // Store the calculated resolution vector for the 'self' collider
+	// Store the calculated resolution vector for the 'self' collider
 	self.resolution = resolution;
 	// Calculate the resolution direction based on the rigidbody data
-	self.resolution_direction = this->resolution_correction(self.resolution, self.info.rigidbody.data);
+	self.resolution_direction
+		= this->resolution_correction(self.resolution, self.info.rigidbody.data);
 	// For the 'other' collider, the resolution is the opposite direction of 'self'
 	other.resolution = -self.resolution;
 	other.resolution_direction = self.resolution_direction;
@@ -247,18 +239,18 @@ bool CollisionSystem::detect_collision(CollisionInternal & self,CollisionInterna
 	return true;
 }
 
-vec2 CollisionSystem::get_box_box_detection(const BoxColliderInternal & box1, const BoxColliderInternal & box2) const {
+vec2 CollisionSystem::get_box_box_detection(const BoxColliderInternal & box1,
+											const BoxColliderInternal & box2) const {
 	vec2 resolution{std::nanf(""), std::nanf("")};
 	// Get current positions of colliders
-	vec2 pos1  = AbsolutePosition::get_position(box1.transform, box1.collider.offset);
-	vec2 pos2  = AbsolutePosition::get_position(box2.transform, box2.collider.offset);
+	vec2 pos1 = AbsolutePosition::get_position(box1.transform, box1.collider.offset);
+	vec2 pos2 = AbsolutePosition::get_position(box2.transform, box2.collider.offset);
 
 	// Scale dimensions
 	vec2 scaled_box1 = box1.collider.dimensions * box1.transform.scale;
 	vec2 scaled_box2 = box2.collider.dimensions * box2.transform.scale;
 	vec2 delta = pos2 - pos1;
 
-
 	// Calculate half-extents (half width and half height)
 	float half_width1 = scaled_box1.x / 2.0;
 	float half_height1 = scaled_box1.y / 2.0;
@@ -266,79 +258,85 @@ vec2 CollisionSystem::get_box_box_detection(const BoxColliderInternal & box1, co
 	float half_height2 = scaled_box2.y / 2.0;
 
 	if (pos1.x + half_width1 > pos2.x - half_width2
-			&& pos1.x - half_width1 < pos2.x + half_width2
-			&& pos1.y + half_height1 > pos2.y - half_height2
-			&& pos1.y - half_height1 < pos2.y + half_height2)
-	{
-		resolution = {0,0};
+		&& pos1.x - half_width1 < pos2.x + half_width2
+		&& pos1.y + half_height1 > pos2.y - half_height2
+		&& pos1.y - half_height1 < pos2.y + half_height2) {
+		resolution = {0, 0};
 		float overlap_x = (half_width1 + half_width2) - std::abs(delta.x);
 		float overlap_y = (half_height1 + half_height2) - std::abs(delta.y);
 		if (overlap_x > 0 && overlap_y > 0) {
-		// Determine the direction of resolution
-		if (overlap_x < overlap_y) {
-			// Resolve along the X-axis (smallest overlap)
-			resolution.x = (delta.x > 0) ? -overlap_x : overlap_x;
-		} else if (overlap_y < overlap_x) {
-			// Resolve along the Y-axis (smallest overlap)
-			resolution.y = (delta.y > 0) ? -overlap_y : overlap_y;
-		} else {
-			// Equal overlap, resolve both directions with preference
-			resolution.x = (delta.x > 0) ? -overlap_x : overlap_x;
-			resolution.y = (delta.y > 0) ? -overlap_y : overlap_y;
+			// Determine the direction of resolution
+			if (overlap_x < overlap_y) {
+				// Resolve along the X-axis (smallest overlap)
+				resolution.x = (delta.x > 0) ? -overlap_x : overlap_x;
+			} else if (overlap_y < overlap_x) {
+				// Resolve along the Y-axis (smallest overlap)
+				resolution.y = (delta.y > 0) ? -overlap_y : overlap_y;
+			} else {
+				// Equal overlap, resolve both directions with preference
+				resolution.x = (delta.x > 0) ? -overlap_x : overlap_x;
+				resolution.y = (delta.y > 0) ? -overlap_y : overlap_y;
+			}
 		}
 	}
-	}
 	return resolution;
 }
 
-vec2 CollisionSystem::get_box_circle_detection(const BoxColliderInternal & box, const CircleColliderInternal & circle) const {
+vec2 CollisionSystem::get_box_circle_detection(const BoxColliderInternal & box,
+											   const CircleColliderInternal & circle) const {
 	/// Get current positions of colliders
-    vec2 box_pos = AbsolutePosition::get_position(box.transform, box.collider.offset);
-    vec2 circle_pos = AbsolutePosition::get_position(circle.transform, circle.collider.offset);
-
-    // Scale dimensions
-    vec2 scaled_box = box.collider.dimensions * box.transform.scale;
-    float scaled_circle_radius = circle.collider.radius * circle.transform.scale;
-
-    // Calculate box half-extents
-    float half_width = scaled_box.x / 2.0f;
-    float half_height = scaled_box.y / 2.0f;
-
-    // Find the closest point on the box to the circle's center
-    float closest_x = std::max(box_pos.x - half_width, std::min(circle_pos.x, box_pos.x + half_width));
-		float closest_y = std::max(box_pos.y - half_height, std::min(circle_pos.y, box_pos.y + half_height));
-    
-		float distance_x = circle_pos.x - closest_x;
-		float distance_y = circle_pos.y - closest_y;
-		float distance_squared = distance_x * distance_x + distance_y * distance_y;
-		if(distance_squared < scaled_circle_radius * scaled_circle_radius){
-			vec2 delta = circle_pos - box_pos;
-
-			// Clamp circle center to the nearest point on the box
-			vec2 closest_point;
-			closest_point.x = std::clamp(delta.x, -half_width, half_width);
-			closest_point.y = std::clamp(delta.y, -half_height, half_height);
-
-			// Find the vector from the circle center to the closest point
-			vec2 closest_delta = delta - closest_point;
-
-			float distance = std::sqrt(closest_delta.x * closest_delta.x + closest_delta.y * closest_delta.y);
-			vec2 collision_normal = closest_delta / distance;
-
-			// Compute penetration depth
-			float penetration_depth = scaled_circle_radius - distance;
-
-			// Compute the resolution vector
-			return vec2{collision_normal * penetration_depth};
-		}
-    // No collision
-    return vec2{std::nanf(""), std::nanf("")};
+	vec2 box_pos = AbsolutePosition::get_position(box.transform, box.collider.offset);
+	vec2 circle_pos = AbsolutePosition::get_position(circle.transform, circle.collider.offset);
+
+	// Scale dimensions
+	vec2 scaled_box = box.collider.dimensions * box.transform.scale;
+	float scaled_circle_radius = circle.collider.radius * circle.transform.scale;
+
+	// Calculate box half-extents
+	float half_width = scaled_box.x / 2.0f;
+	float half_height = scaled_box.y / 2.0f;
+
+	// Find the closest point on the box to the circle's center
+	float closest_x
+		= std::max(box_pos.x - half_width, std::min(circle_pos.x, box_pos.x + half_width));
+	float closest_y
+		= std::max(box_pos.y - half_height, std::min(circle_pos.y, box_pos.y + half_height));
+
+	float distance_x = circle_pos.x - closest_x;
+	float distance_y = circle_pos.y - closest_y;
+	float distance_squared = distance_x * distance_x + distance_y * distance_y;
+	if (distance_squared < scaled_circle_radius * scaled_circle_radius) {
+		vec2 delta = circle_pos - box_pos;
+
+		// Clamp circle center to the nearest point on the box
+		vec2 closest_point;
+		closest_point.x = std::clamp(delta.x, -half_width, half_width);
+		closest_point.y = std::clamp(delta.y, -half_height, half_height);
+
+		// Find the vector from the circle center to the closest point
+		vec2 closest_delta = delta - closest_point;
+
+		float distance
+			= std::sqrt(closest_delta.x * closest_delta.x + closest_delta.y * closest_delta.y);
+		vec2 collision_normal = closest_delta / distance;
+
+		// Compute penetration depth
+		float penetration_depth = scaled_circle_radius - distance;
+
+		// Compute the resolution vector
+		return vec2{collision_normal * penetration_depth};
+	}
+	// No collision
+	return vec2{std::nanf(""), std::nanf("")};
 }
 
-vec2 CollisionSystem::get_circle_circle_detection(const CircleColliderInternal & circle1, const CircleColliderInternal & circle2) const {
+vec2 CollisionSystem::get_circle_circle_detection(
+	const CircleColliderInternal & circle1, const CircleColliderInternal & circle2) const {
 	// Get current positions of colliders
-	vec2 final_position1 = AbsolutePosition::get_position(circle1.transform, circle1.collider.offset);
-	vec2 final_position2 = AbsolutePosition::get_position(circle2.transform, circle2.collider.offset);
+	vec2 final_position1
+		= AbsolutePosition::get_position(circle1.transform, circle1.collider.offset);
+	vec2 final_position2
+		= AbsolutePosition::get_position(circle2.transform, circle2.collider.offset);
 
 	// Scale dimensions
 	float scaled_circle1 = circle1.collider.radius * circle1.transform.scale;
@@ -376,7 +374,8 @@ vec2 CollisionSystem::get_circle_circle_detection(const CircleColliderInternal &
 	return vec2{std::nanf(""), std::nanf("")};
 }
 
-CollisionSystem::Direction CollisionSystem::resolution_correction(vec2 & resolution,const Rigidbody::Data & rigidbody) {
+CollisionSystem::Direction
+CollisionSystem::resolution_correction(vec2 & resolution, const Rigidbody::Data & rigidbody) {
 
 	// Calculate the other value to move back correctly
 	// If only X or Y has a value determine what is should be to move back.
@@ -384,63 +383,64 @@ CollisionSystem::Direction CollisionSystem::resolution_correction(vec2 & resolut
 	// If both are not zero a perfect corner has been hit
 	if (resolution.x != 0 && resolution.y != 0) {
 		resolution_direction = Direction::BOTH;
-	// If x is not zero a horizontal action was latest action.
+		// If x is not zero a horizontal action was latest action.
 	} else if (resolution.x != 0) {
 		resolution_direction = Direction::X_DIRECTION;
 		// If both are 0 resolution y should not be changed (y_velocity can be 0 by kinematic object movement)
 		if (rigidbody.linear_velocity.x != 0 && rigidbody.linear_velocity.y != 0)
-			resolution.y = -rigidbody.linear_velocity.y * (resolution.x / rigidbody.linear_velocity.x);
+			resolution.y
+				= -rigidbody.linear_velocity.y * (resolution.x / rigidbody.linear_velocity.x);
 	} else if (resolution.y != 0) {
 		resolution_direction = Direction::Y_DIRECTION;
 		// If both are 0 resolution x should not be changed (x_velocity can be 0 by kinematic object movement)
 		if (rigidbody.linear_velocity.x != 0 && rigidbody.linear_velocity.y != 0)
-			resolution.x = -rigidbody.linear_velocity.x * (resolution.y / rigidbody.linear_velocity.y);
+			resolution.x
+				= -rigidbody.linear_velocity.x * (resolution.y / rigidbody.linear_velocity.y);
 	}
 
 	return resolution_direction;
 }
 
-CollisionSystem::CollisionInfo CollisionSystem::get_collision_info(const CollisionInternal & in_self, const CollisionInternal & in_other) const{
+CollisionSystem::CollisionInfo
+CollisionSystem::get_collision_info(const CollisionInternal & in_self,
+									const CollisionInternal & in_other) const {
 
-	crepe::CollisionSystem::ColliderInfo self {
-	.transform = in_self.info.transform,
-	.rigidbody = in_self.info.rigidbody,
-	.metadata = in_self.info.metadata,
+	crepe::CollisionSystem::ColliderInfo self{
+		.transform = in_self.info.transform,
+		.rigidbody = in_self.info.rigidbody,
+		.metadata = in_self.info.metadata,
 	};
 
-	crepe::CollisionSystem::ColliderInfo other {
-	.transform = in_other.info.transform,
-	.rigidbody = in_other.info.rigidbody,
-	.metadata = in_other.info.metadata,
+	crepe::CollisionSystem::ColliderInfo other{
+		.transform = in_other.info.transform,
+		.rigidbody = in_other.info.rigidbody,
+		.metadata = in_other.info.metadata,
 	};
 
-	struct CollisionInfo collision_info{
-		.self = self,
-		.other = other,
-		.resolution = in_self.resolution,
+	struct CollisionInfo collision_info {
+		.self = self, .other = other, .resolution = in_self.resolution,
 		.resolution_direction = in_self.resolution_direction,
 	};
 	return collision_info;
 }
 
 void CollisionSystem::determine_collision_handler(const CollisionInfo & info) {
-	Rigidbody::BodyType self_type =	info.self.rigidbody.data.body_type;
-	Rigidbody::BodyType other_type =	info.other.rigidbody.data.body_type;
+	Rigidbody::BodyType self_type = info.self.rigidbody.data.body_type;
+	Rigidbody::BodyType other_type = info.other.rigidbody.data.body_type;
 	bool self_kinematic = info.self.rigidbody.data.kinematic_collision;
 	bool other_kinematic = info.other.rigidbody.data.kinematic_collision;
 	// Inverted collision info
 	CollisionInfo inverted = -info;
 	// If both objects are static skip handle call collision script
-	if (self_type == STATIC
-		&& other_type == STATIC)
-		return;
+	if (self_type == STATIC && other_type == STATIC) return;
 
 	//	First body is not dynamic
 	if (self_type != DYNAMIC) {
 		bool static_collision = self_type == STATIC && other_type == DYNAMIC;
-		bool kinematic_collision = self_type == KINEMATIC && other_type == DYNAMIC && self_kinematic;
+		bool kinematic_collision
+			= self_type == KINEMATIC && other_type == DYNAMIC && self_kinematic;
 
-		// Handle collision 
+		// Handle collision
 		if (static_collision || kinematic_collision) this->static_collision_handler(inverted);
 		// Call scripts
 		this->call_collision_events(inverted);
@@ -451,7 +451,7 @@ void CollisionSystem::determine_collision_handler(const CollisionInfo & info) {
 	if (other_type != DYNAMIC) {
 		bool static_collision = other_type == STATIC;
 		bool kinematic_collision = other_type == KINEMATIC && other_kinematic;
-		// Handle collision 
+		// Handle collision
 		if (static_collision || kinematic_collision) this->static_collision_handler(info);
 		// Call scripts
 		this->call_collision_events(info);
@@ -459,18 +459,18 @@ void CollisionSystem::determine_collision_handler(const CollisionInfo & info) {
 	}
 
 	// Dynamic
-	// Handle collision 
+	// Handle collision
 	this->dynamic_collision_handler(info);
 	// Call scripts
 	this->call_collision_events(info);
 }
 
 void CollisionSystem::static_collision_handler(const CollisionInfo & info) {
-	
+
 	vec2 & transform_pos = info.self.transform.position;
 	float elasticity = info.self.rigidbody.data.elasticity_coefficient;
 	vec2 & rigidbody_vel = info.self.rigidbody.data.linear_velocity;
-	
+
 	// Move object back using calculate move back value
 	transform_pos += info.resolution;
 
@@ -588,10 +588,5 @@ void CollisionSystem::call_collision_events(const CollisionInfo & info) {
 	CollisionEvent data_inverted(-info);
 	EventManager & emgr = this->mediator.event_manager;
 	emgr.trigger_event<CollisionEvent>(data, info.self.transform.game_object_id);
-	emgr.trigger_event<CollisionEvent>(data_inverted,
-									   -info.self.transform.game_object_id);
+	emgr.trigger_event<CollisionEvent>(data_inverted, -info.self.transform.game_object_id);
 }
-
-
-
-
diff --git a/src/crepe/system/CollisionSystem.h b/src/crepe/system/CollisionSystem.h
index b7808f1..7be280a 100644
--- a/src/crepe/system/CollisionSystem.h
+++ b/src/crepe/system/CollisionSystem.h
@@ -21,6 +21,7 @@ namespace crepe {
 class CollisionSystem : public System {
 public:
 	using System::System;
+
 private:
 	//! Enum representing movement directions during collision resolution.
 	enum class Direction {
@@ -33,13 +34,13 @@ private:
 		//! Movement in both X and Y directions.
 		BOTH,
 	};
+
 public:
-	
 	//! Structure representing components of the collider
 	struct ColliderInfo {
-  Transform & transform;
-  Rigidbody & rigidbody;
-  Metadata & metadata;
+		Transform & transform;
+		Rigidbody & rigidbody;
+		Metadata & metadata;
 	};
 
 	/**
@@ -54,7 +55,7 @@ public:
 		vec2 resolution;
 		//! The direction of movement for resolving the collision.
 		Direction resolution_direction = Direction::NONE;
-		CollisionInfo operator - () const;
+		CollisionInfo operator-() const;
 	};
 
 private:
@@ -90,9 +91,9 @@ private:
 	//! Structure of a collider with additional components
 	template <typename ColliderType>
 	struct ColliderInternal {
-			ColliderType& collider;
-			Transform& transform;
-			Rigidbody& rigidbody;
+		ColliderType & collider;
+		Transform & transform;
+		Rigidbody & rigidbody;
 	};
 	//! Predefined BoxColliderInternal. (System is only made for this type)
 	using BoxColliderInternal = ColliderInternal<BoxCollider>;
@@ -113,7 +114,8 @@ private:
 		* \param collider2 Second collider variant (BoxCollider or CircleCollider).
 		* \return The combined type of the two colliders.
 		*/
-	CollisionInternalType get_collider_type(const collider_variant & collider1, const collider_variant & collider2) const;
+	CollisionInternalType get_collider_type(const collider_variant & collider1,
+											const collider_variant & collider2) const;
 
 private:
 	/**
@@ -126,8 +128,8 @@ private:
 		* \param data1 Collision data for the first collider.
 		* \param data2 Collision data for the second collider.
 		*/
-	CollisionInfo get_collision_info(const CollisionInternal & data1, const CollisionInternal & data2) const;
-
+	CollisionInfo get_collision_info(const CollisionInternal & data1,
+									 const CollisionInternal & data2) const;
 
 	/**
 		* \brief Corrects the collision resolution vector and determines its direction.
@@ -142,8 +144,7 @@ private:
 		* \param rigidbody rigidbody data used to correct resolution
 		* \return A Direction indicating the resolution direction
 		*/
-	Direction resolution_correction(vec2 & resolution,const Rigidbody::Data & rigidbody);
-
+	Direction resolution_correction(vec2 & resolution, const Rigidbody::Data & rigidbody);
 
 	/**
 		* \brief Determines the appropriate collision handler for a given collision event.
@@ -220,7 +221,8 @@ private:
 	 * \param other_metadata Rigidbody of second object
 	 * \return Returns true if there is at least one comparison found.
 	 */
-	bool should_collide(const CollisionInternal & self, const CollisionInternal & other) const; //done
+	bool should_collide(const CollisionInternal & self,
+						const CollisionInternal & other) const; //done
 
 	/**
 		* \brief Checks for collision between two colliders.
@@ -234,7 +236,8 @@ private:
 		* \param type The type of collider pair.
 		* \return True if a collision is detected, otherwise false.
 		*/
-	bool detect_collision(CollisionInternal & first_info, CollisionInternal & second_info, const CollisionInternalType & type);
+	bool detect_collision(CollisionInternal & first_info, CollisionInternal & second_info,
+						  const CollisionInternalType & type);
 
 	/**
 		* \brief Detects collisions between two BoxColliders.
@@ -247,7 +250,8 @@ private:
 		* \param box2 Information about the second BoxCollider.
 		* \return If colliding, returns the resolution vector; otherwise, returns {NaN, NaN}.
 		*/
-	vec2 get_box_box_detection(const BoxColliderInternal & box1, const BoxColliderInternal & box2) const;
+	vec2 get_box_box_detection(const BoxColliderInternal & box1,
+							   const BoxColliderInternal & box2) const;
 
 	/**
 	 * \brief Check collision for box on circle collider
@@ -260,7 +264,8 @@ private:
 	 * \param circle2 Information about the circleCollider.
 	 * \return If colliding, returns the resolution vector; otherwise, returns {NaN, NaN}.
 	 */
-	vec2 get_box_circle_detection(const BoxColliderInternal & box1, const CircleColliderInternal & circle2) const;
+	vec2 get_box_circle_detection(const BoxColliderInternal & box1,
+								  const CircleColliderInternal & circle2) const;
 
 	/**
 	 * \brief Check collision for circle on circle collider
@@ -273,7 +278,8 @@ private:
 	 * \param circle2 Information about the second circleCollider.
 	 * \return If colliding, returns the resolution vector; otherwise, returns {NaN, NaN}.
 	 */
-	vec2 get_circle_circle_detection(const CircleColliderInternal & circle1, const CircleColliderInternal & circle2) const;
+	vec2 get_circle_circle_detection(const CircleColliderInternal & circle1,
+									 const CircleColliderInternal & circle2) const;
 };
 
 /**
diff --git a/src/crepe/system/ParticleSystem.cpp b/src/crepe/system/ParticleSystem.cpp
index 31c1800..e66c603 100644
--- a/src/crepe/system/ParticleSystem.cpp
+++ b/src/crepe/system/ParticleSystem.cpp
@@ -51,7 +51,8 @@ void ParticleSystem::emit_particle(ParticleEmitter & emitter, const Transform &
 
 	vec2 initial_position = AbsolutePosition::get_position(transform, emitter.data.offset);
 	float random_angle
-		= this->generate_random_angle(emitter.data.min_angle+transform.rotation, emitter.data.max_angle+transform.rotation);
+		= this->generate_random_angle(emitter.data.min_angle + transform.rotation,
+									  emitter.data.max_angle + transform.rotation);
 
 	float random_speed
 		= this->generate_random_speed(emitter.data.min_speed, emitter.data.max_speed);
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 9d8e683..8c31743 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -16,9 +16,9 @@
 #include "../facade/Texture.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/ResourceManager.h"
-#include "util/AbsolutePosition.h"
 #include "api/Text.h"
 #include "facade/Font.h"
+#include "util/AbsolutePosition.h"
 
 #include "RenderSystem.h"
 #include "types.h"
diff --git a/src/example/game.cpp b/src/example/game.cpp
index 76ea8c2..fb7fb63 100644
--- a/src/example/game.cpp
+++ b/src/example/game.cpp
@@ -220,7 +220,7 @@ public:
 			});
 
 		GameObject game_object1 = new_object(
-			"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2+20}, 0, 1);
+			"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2 + 20}, 0, 1);
 		game_object1.add_component<Rigidbody>(Rigidbody::Data{
 			.mass = 1,
 			.gravity_scale = 0,
@@ -270,7 +270,7 @@ public:
 													 .size = {20, 20},
 													 .angle_offset = 45,
 													 .scale_offset = 1,
-													 .position_offset = {0,20},
+													 .position_offset = {0, 20},
 												 });
 
 		//add circle with cirlcecollider deactiveated
diff --git a/src/test/CollisionTest.cpp b/src/test/CollisionTest.cpp
index 8f566df..11916eb 100644
--- a/src/test/CollisionTest.cpp
+++ b/src/test/CollisionTest.cpp
@@ -25,7 +25,6 @@ using namespace std::chrono_literals;
 using namespace crepe;
 using namespace testing;
 
-
 class CollisionHandler : public Script {
 public:
 	int box_id;
-- 
cgit v1.2.3


From 69ca2bafcd617ac8af1b8f715f0c802205a60ab1 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Fri, 20 Dec 2024 09:49:40 +0100
Subject: fixes

---
 src/crepe/facade/SDLContext.cpp      |   2 +-
 src/crepe/system/CollisionSystem.cpp |   2 +-
 src/example/game.cpp                 | 492 +++++++++++++++++------------------
 3 files changed, 248 insertions(+), 248 deletions(-)

(limited to 'src/crepe/facade')

diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 164d35e..2dae1e7 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -141,7 +141,7 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 		= (ctx.sprite.aspect_ratio == 0) ? ctx.texture.get_ratio() : ctx.sprite.aspect_ratio;
 
 	vec2 size = data.size;
-	vec2 screen_pos = ctx.pos + data.position_offset;
+	vec2 screen_pos = ctx.pos;
 
 	if (data.size.x == 0 && data.size.y != 0) {
 		size.x = data.size.y * aspect_ratio;
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp
index e4396b9..3653d10 100644
--- a/src/crepe/system/CollisionSystem.cpp
+++ b/src/crepe/system/CollisionSystem.cpp
@@ -589,5 +589,5 @@ void CollisionSystem::call_collision_events(const CollisionInfo & info) {
 	CollisionEvent data_inverted(-info);
 	EventManager & emgr = this->mediator.event_manager;
 	emgr.trigger_event<CollisionEvent>(data, info.self.transform.game_object_id);
-	emgr.trigger_event<CollisionEvent>(data_inverted, -info.self.transform.game_object_id);
+	emgr.trigger_event<CollisionEvent>(data_inverted, info.other.transform.game_object_id);
 }
diff --git a/src/example/game.cpp b/src/example/game.cpp
index fb7fb63..7ee784a 100644
--- a/src/example/game.cpp
+++ b/src/example/game.cpp
@@ -1,3 +1,5 @@
+#include "api/Asset.h"
+#include "api/BehaviorScript.h"
 #include "api/CircleCollider.h"
 #include "api/ParticleEmitter.h"
 #include "api/Scene.h"
@@ -18,295 +20,293 @@
 #include <crepe/api/Vector2.h>
 
 using namespace crepe;
-
 using namespace std;
 
-class MyScript1 : public Script {
-	bool flip = false;
+class ScriptBox : public Script {
+public:
 	bool oncollision(const CollisionEvent & test) {
-		Log::logf("Box {} script on_collision()", test.info.self.metadata.game_object_id);
+		Log::logf("Box {} on_collision() with {}", test.info.self.metadata.game_object_id, test.info.other.metadata.game_object_id);
 		return true;
 	}
-	bool keypressed(const KeyPressEvent & test) {
-		Log::logf("Box script keypressed()");
-		switch (test.key) {
-			case Keycode::A: {
-				Rigidbody & tf = this->get_component<Rigidbody>();
-				tf.data.linear_velocity.x -= 1;
-				break;
-			}
-			case Keycode::W: {
-				Rigidbody & tf = this->get_component<Rigidbody>();
-				// tf.data.linear_velocity.y -= 1;
-				tf.add_force_linear({0, -1});
-				break;
-			}
-			case Keycode::S: {
-				Rigidbody & tf = this->get_component<Rigidbody>();
-				tf.data.linear_velocity.y += 1;
-				break;
-			}
-			case Keycode::D: {
-				Rigidbody & tf = this->get_component<Rigidbody>();
-				tf.data.linear_velocity.x += 1;
-				break;
-			}
-			case Keycode::E: {
-				if (flip) {
-					flip = false;
-					this->get_component<BoxCollider>().active = true;
-					this->get_components<Sprite>()[0].get().active = true;
-					this->get_component<CircleCollider>().active = false;
-					this->get_components<Sprite>()[1].get().active = false;
-				} else {
-					flip = true;
-					this->get_component<BoxCollider>().active = false;
-					this->get_components<Sprite>()[0].get().active = false;
-					this->get_component<CircleCollider>().active = true;
-					this->get_components<Sprite>()[1].get().active = true;
-				}
-
-				//add collider switch
-				break;
-			}
-			default:
-				break;
-		}
-		return false;
-	}
 
 	void init() {
-		Log::logf("init");
 		subscribe<CollisionEvent>(
 			[this](const CollisionEvent & ev) -> bool { return this->oncollision(ev); });
-		subscribe<KeyPressEvent>(
-			[this](const KeyPressEvent & ev) -> bool { return this->keypressed(ev); });
-	}
-	void update(duration_t) {
-		Rigidbody & tf = this->get_component<Rigidbody>();
-		Log::logf("linear_velocity.x {}", tf.data.linear_velocity.x);
-		Log::logf("linear_velocity.y {}", tf.data.linear_velocity.y);
-		// tf.data.linear_velocity = {0,0};
 	}
 };
 
-class MyScript2 : public Script {
-	bool flip = false;
+class ScriptCircle : public Script {
+public:
 	bool oncollision(const CollisionEvent & test) {
-		Log::logf("Box {} script on_collision()", test.info.self.metadata.game_object_id);
+		Log::logf("Circle {} on_collision() with {}", test.info.self.metadata.game_object_id, test.info.other.metadata.game_object_id);
 		return true;
 	}
-	bool keypressed(const KeyPressEvent & test) {
-		Log::logf("Box script keypressed()");
-		switch (test.key) {
-			case Keycode::LEFT: {
-				Transform & tf = this->get_component<Transform>();
-				tf.position.x -= 1;
-				break;
-			}
-			case Keycode::UP: {
-				Transform & tf = this->get_component<Transform>();
-				tf.position.y -= 1;
-				break;
-			}
-			case Keycode::DOWN: {
-				Transform & tf = this->get_component<Transform>();
-				tf.position.y += 1;
-				break;
-			}
-			case Keycode::RIGHT: {
-				Transform & tf = this->get_component<Transform>();
-				tf.position.x += 1;
-				break;
-			}
-			case Keycode::PAUSE: {
-				if (flip) {
-					flip = false;
-					this->get_component<BoxCollider>().active = true;
-					this->get_components<Sprite>()[0].get().active = true;
-					this->get_component<CircleCollider>().active = false;
-					this->get_components<Sprite>()[1].get().active = false;
-				} else {
-					flip = true;
-					this->get_component<BoxCollider>().active = false;
-					this->get_components<Sprite>()[0].get().active = false;
-					this->get_component<CircleCollider>().active = true;
-					this->get_components<Sprite>()[1].get().active = true;
-				}
-
-				//add collider switch
-				break;
-			}
-			case Keycode::J: {
-				Rigidbody & tf = this->get_component<Rigidbody>();
-				tf.data.linear_velocity.x = -10;
-				break;
-			}
-			case Keycode::I: {
-				Rigidbody & tf = this->get_component<Rigidbody>();
-				tf.data.linear_velocity.y -= 1;
-				break;
-			}
-			case Keycode::K: {
-				Rigidbody & tf = this->get_component<Rigidbody>();
-				tf.data.linear_velocity.y += 1;
-				break;
-			}
-			case Keycode::L: {
-				Rigidbody & tf = this->get_component<Rigidbody>();
-				tf.data.linear_velocity.x = 10;
-				break;
-			}
-			case Keycode::O: {
-				Rigidbody & tf = this->get_component<Rigidbody>();
-				tf.data.linear_velocity.x = 0;
-				break;
-			}
-			default:
-				break;
-		}
-		return false;
-	}
 
 	void init() {
-		Log::logf("init");
 		subscribe<CollisionEvent>(
 			[this](const CollisionEvent & ev) -> bool { return this->oncollision(ev); });
-		subscribe<KeyPressEvent>(
-			[this](const KeyPressEvent & ev) -> bool { return this->keypressed(ev); });
 	}
+};
+
+class ScriptMoveToLeft : public Script {
+public:
+	void update() {
+		Transform & transform = this->get_component<Transform>();
+		transform.position.x -= 0.02;
+	}
+};
+
+class ScriptMoveToRight : public Script {
+public:
 	void update() {
-		// Retrieve component from the same GameObject this script is on
+		Transform & transform = this->get_component<Transform>();
+		transform.position.x += 0.02;
 	}
 };
 
 class ConcreteScene1 : public Scene {
 public:
-	using Scene::Scene;
-
 	void load_scene() {
+		GameObject camera = this->new_object("camera");
+		camera.add_component<Camera>(ivec2(1080, 720), vec2(10, 10), Camera::Data{
+			.bg_color = Color::WHITE, 
+			.zoom = 1
+		});
 
-		Color color(0, 0, 0, 255);
+		GameObject reference = this->new_object("reference", "tag", vec2(0, 0), 0, 1);
+		Asset reference_asset = Asset("asset/texture/square.png");
+		reference.add_component<Sprite>(reference_asset, Sprite::Data{
+			.color = Color::RED,
+			.sorting_in_layer = 10,
+			.order_in_layer = 0,
+			.size = vec2(0.1, 0.1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(0, 0),
+		});
 
-		float screen_size_width = 320;
-		float screen_size_height = 240;
-		float world_collider = 1000;
-		//define playable world
-		GameObject world = new_object(
-			"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1);
-		world.add_component<Rigidbody>(Rigidbody::Data{
-			.mass = 1,
-			.gravity_scale = 0,
-			.body_type = Rigidbody::BodyType::DYNAMIC,
+		/*GameObject box_1 = this->new_object("box_1", "tag", vec2(0, 0), 0, 1);
+		Asset box_1_asset = Asset("asset/texture/square.png");
+		box_1.add_component<Sprite>(box_1_asset, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(0, 0.5),
+		});
+		Asset box_1_asset2 = Asset("asset/texture/test_ap43.png");
+		box_1.add_component<Sprite>(box_1_asset2, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(0, -0.5),
+		});*/
+
+		/*GameObject particles = this->new_object("particles", "tag", vec2(-1, 0), 180, 1);
+		Asset particles_asset = Asset("asset/texture/test_ap43.png");
+		Sprite & particles_sprite = particles.add_component<Sprite>(particles_asset, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(0, 0),
 		});
-		world.add_component<BoxCollider>(
-			vec2{world_collider, world_collider},
-			vec2{0, 0 - (screen_size_height / 2 + world_collider / 2)}); // Top
-		world.add_component<BoxCollider>(
-			vec2{world_collider, world_collider},
-			vec2{0, screen_size_height / 2 + world_collider / 2}); // Bottom
-		world.add_component<BoxCollider>(
-			vec2{world_collider, world_collider},
-			vec2{0 - (screen_size_width / 2 + world_collider / 2), 0}); // Left
-		world.add_component<BoxCollider>(
-			vec2{world_collider, world_collider},
-			vec2{screen_size_width / 2 + world_collider / 2, 0}); // right
-		world.add_component<Camera>(
-			ivec2{static_cast<int>(screen_size_width), static_cast<int>(screen_size_height)},
-			vec2{screen_size_width, screen_size_height},
-			Camera::Data{
-				.bg_color = Color::WHITE,
-				.zoom = 1,
-			});
+		ParticleEmitter & particles_emitter = particles.add_component<ParticleEmitter>(particles_sprite, ParticleEmitter::Data{
+			.offset = vec2(0, 0),
+			.emission_rate = 1,
+			.min_speed = 1,
+			.max_speed = 1,
+			.min_angle = 0,
+			.max_angle = 0,
+			.end_lifespan = 4,
+		});*/
 
-		GameObject game_object1 = new_object(
-			"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2 + 20}, 0, 1);
-		game_object1.add_component<Rigidbody>(Rigidbody::Data{
-			.mass = 1,
+		const bool SCRIPT = false;
+
+		const Rigidbody::BodyType BODYTYPE_LEFT = Rigidbody::BodyType::DYNAMIC;
+		const Rigidbody::BodyType BODYTYPE_RIGHT = Rigidbody::BodyType::DYNAMIC;
+		const bool BOUNCE_LEFT = false;
+		const bool BOUNCE_RIGHT = false;
+		const bool KINEMATIC_COLLISION = true;
+		const bool ONTOP = false;
+
+		const float SCALE = 0.5;
+		const float OFFSET_X_LEFT = 0;
+		const float OFFSET_X_RIGHT = 0;
+		const float OFFSET_Y_LEFT = 0;
+		const float OFFSET_Y_RIGHT = 0;
+
+		GameObject box_1 = this->new_object("box_1", "tag", ONTOP ? vec2(-0.25, -4) : vec2(-2, -4), 0, SCALE);
+		Asset box_1_asset = Asset("asset/texture/square.png");
+		box_1.add_component<Sprite>(box_1_asset, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(OFFSET_X_LEFT, OFFSET_Y_LEFT),
+		});
+		box_1.add_component<Rigidbody>(Rigidbody::Data{
 			.gravity_scale = 0,
-			.body_type = Rigidbody::BodyType::DYNAMIC,
-			.linear_velocity = {0, 0},
-			.constraints = {0, 0, 0},
-			.elasticity_coefficient = 1,
+			.body_type = BODYTYPE_LEFT,
+			.linear_velocity = SCRIPT ? vec2{0, 0} : vec2{1, 0},
+			.elasticity_coefficient = BOUNCE_LEFT ? 0.5 : 0,
+			.kinematic_collision = KINEMATIC_COLLISION,
 		});
-		// add box with boxcollider
-		game_object1.add_component<BoxCollider>(vec2{20, 20});
-		game_object1.add_component<BehaviorScript>().set_script<MyScript1>();
+		box_1.add_component<BehaviorScript>().set_script<ScriptMoveToRight>().active = SCRIPT;
+		box_1.add_component<BoxCollider>(vec2(1, 1), vec2(OFFSET_X_LEFT, OFFSET_Y_LEFT));
+		box_1.add_component<BehaviorScript>().set_script<ScriptBox>();
 
-		Asset img1{"asset/texture/test_ap43.png"};
-		game_object1.add_component<Sprite>(img1, Sprite::Data{
-													 .sorting_in_layer = 2,
-													 .order_in_layer = 2,
-													 .size = {20, 20},
-													 .position_offset = {0, 0},
-												 });
+		GameObject circle_1 = this->new_object("ricle_1", "tag", ONTOP ? vec2(0.25, -4) : vec2(2, -4), 0, SCALE);
+		Asset circle_1_asset = Asset("asset/texture/circle.png");
+		circle_1.add_component<Sprite>(circle_1_asset, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(OFFSET_X_RIGHT, OFFSET_Y_RIGHT),
+		});
+		circle_1.add_component<Rigidbody>(Rigidbody::Data{
+			.gravity_scale = 0,
+			.body_type = BODYTYPE_RIGHT,
+			.linear_velocity = SCRIPT ? vec2{0, 0} : vec2{-1, 0},
+			.elasticity_coefficient = BOUNCE_RIGHT ? 0.5 : 0,
+			.kinematic_collision = KINEMATIC_COLLISION,
+		});
+		circle_1.add_component<BehaviorScript>().set_script<ScriptMoveToLeft>().active = SCRIPT;
+		circle_1.add_component<CircleCollider>(0.5, vec2(OFFSET_X_RIGHT, OFFSET_Y_RIGHT));
+		circle_1.add_component<BehaviorScript>().set_script<ScriptCircle>();
 
-		//add circle with cirlcecollider deactiveated
-		game_object1.add_component<CircleCollider>(10).active = false;
-		Asset img2{"asset/texture/circle.png"};
-		game_object1
-			.add_component<Sprite>(img2,
-								   Sprite::Data{
-									   .size = {20, 20},
-								   })
-			.active
-			= false;
+		GameObject circle_2 = this->new_object("ricle_2", "tag", ONTOP ? vec2(-0.25, -1.5) : vec2(-2.5, -1.5), 0, SCALE);
+		Asset circle_2_asset = Asset("asset/texture/circle.png");
+		circle_2.add_component<Sprite>(circle_2_asset, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(OFFSET_X_LEFT, OFFSET_Y_LEFT),
+		});
+		circle_2.add_component<Rigidbody>(Rigidbody::Data{
+			.gravity_scale = 0,
+			.body_type = BODYTYPE_LEFT,
+			.linear_velocity = SCRIPT ? vec2{0, 0} : vec2{1, 0},
+			.elasticity_coefficient = BOUNCE_LEFT ? 0.5 : 0,
+			.kinematic_collision = KINEMATIC_COLLISION,
+		});
+		circle_2.add_component<BehaviorScript>().set_script<ScriptMoveToRight>().active = SCRIPT;
+		circle_2.add_component<CircleCollider>(0.5, vec2(OFFSET_X_LEFT, OFFSET_Y_LEFT));
+		circle_2.add_component<BehaviorScript>().set_script<ScriptCircle>();
 
-		GameObject game_object2 = new_object(
-			"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 90, 1);
-		game_object2.add_component<Rigidbody>(Rigidbody::Data{
-			.mass = 1,
+		GameObject box_2 = this->new_object("box_2", "tag", ONTOP ? vec2(0.25, -1.5) : vec2(2.5, -1.5), 0, SCALE);
+		Asset box_2_asset = Asset("asset/texture/square.png");
+		box_2.add_component<Sprite>(box_2_asset, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(OFFSET_X_RIGHT, OFFSET_Y_RIGHT),
+		});
+		box_2.add_component<Rigidbody>(Rigidbody::Data{
 			.gravity_scale = 0,
-			.body_type = Rigidbody::BodyType::STATIC,
-			.linear_velocity = {0, 0},
-			.constraints = {0, 0, 0},
-			.elasticity_coefficient = 1,
+			.body_type = BODYTYPE_RIGHT,
+			.linear_velocity = SCRIPT ? vec2{0, 0} : vec2{-1, 0},
+			.elasticity_coefficient = BOUNCE_RIGHT ? 0.5 : 0,
+			.kinematic_collision = KINEMATIC_COLLISION,
 		});
-		// add box with boxcollider
-		game_object2.add_component<BoxCollider>(vec2{20, 20});
-		game_object2.add_component<BehaviorScript>().set_script<MyScript2>();
+		box_2.add_component<BehaviorScript>().set_script<ScriptMoveToLeft>().active = SCRIPT;
+		box_2.add_component<BoxCollider>(vec2(1, 1), vec2(OFFSET_X_RIGHT, OFFSET_Y_RIGHT));
+		box_2.add_component<BehaviorScript>().set_script<ScriptBox>();
 
-		game_object2.add_component<Sprite>(img1, Sprite::Data{
-													 .size = {20, 20},
-													 .angle_offset = 45,
-													 .scale_offset = 1,
-													 .position_offset = {0, 20},
-												 });
+		GameObject box_3 = this->new_object("box_3", "tag", ONTOP ? vec2(-0.25, 1.5) : vec2(-3, 1.5), 0, SCALE);
+		Asset box_3_asset = Asset("asset/texture/square.png");
+		box_3.add_component<Sprite>(box_3_asset, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(OFFSET_X_LEFT, OFFSET_Y_LEFT),
+		});
+		box_3.add_component<Rigidbody>(Rigidbody::Data{
+			.gravity_scale = 0,
+			.body_type = BODYTYPE_LEFT,
+			.linear_velocity = SCRIPT ? vec2{0, 0} : vec2{1, 0},
+			.elasticity_coefficient = BOUNCE_LEFT ? 0.5 : 0,
+			.kinematic_collision = KINEMATIC_COLLISION,
+		});
+		box_3.add_component<BehaviorScript>().set_script<ScriptMoveToRight>().active = SCRIPT;
+		box_3.add_component<BoxCollider>(vec2(1, 1), vec2(OFFSET_X_LEFT, OFFSET_Y_LEFT));
+		box_3.add_component<BehaviorScript>().set_script<ScriptBox>();
 
-		//add circle with cirlcecollider deactiveated
-		game_object2.add_component<CircleCollider>(10).active = false;
+		GameObject box_4 = this->new_object("box_4", "tag", ONTOP ? vec2(0.25, 1.5) : vec2(3, 1.5), 0, SCALE);
+		Asset box_4_asset = Asset("asset/texture/square.png");
+		box_4.add_component<Sprite>(box_4_asset, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(OFFSET_X_RIGHT, OFFSET_Y_RIGHT),
+		});
+		box_4.add_component<Rigidbody>(Rigidbody::Data{
+			.gravity_scale = 0,
+			.body_type = BODYTYPE_RIGHT,
+			.linear_velocity = SCRIPT ? vec2{0, 0} : vec2{-1, 0},
+			.elasticity_coefficient = BOUNCE_RIGHT ? 0.5 : 0,
+			.kinematic_collision = KINEMATIC_COLLISION,
+		});
+		box_4.add_component<BehaviorScript>().set_script<ScriptMoveToLeft>().active = SCRIPT;
+		box_4.add_component<BoxCollider>(vec2(1, 1), vec2(OFFSET_X_RIGHT, OFFSET_Y_RIGHT));
+		box_4.add_component<BehaviorScript>().set_script<ScriptBox>();
 
-		game_object2
-			.add_component<Sprite>(img2,
-								   Sprite::Data{
-									   .size = {20, 20},
-								   })
-			.active
-			= false;
-		Asset img5{"asset/texture/square.png"};
+		GameObject circle_3 = this->new_object("ricle_3", "tag", ONTOP ? vec2(-0.25, 4) : vec2(-3.5, 4), 0, SCALE);
+		Asset circle_3_asset = Asset("asset/texture/circle.png");
+		circle_3.add_component<Sprite>(circle_3_asset, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(OFFSET_X_LEFT, OFFSET_Y_LEFT),
+		});
+		circle_3.add_component<Rigidbody>(Rigidbody::Data{
+			.gravity_scale = 0,
+			.body_type = BODYTYPE_LEFT,
+			.linear_velocity = SCRIPT ? vec2{0, 0} : vec2{1, 0},
+			.elasticity_coefficient = BOUNCE_LEFT ? 0.5 : 0,
+			.kinematic_collision = KINEMATIC_COLLISION,
+		});
+		circle_3.add_component<BehaviorScript>().set_script<ScriptMoveToRight>().active = SCRIPT;
+		circle_3.add_component<CircleCollider>(0.5, vec2(OFFSET_X_LEFT, OFFSET_Y_LEFT));
+		circle_3.add_component<BehaviorScript>().set_script<ScriptCircle>();
 
-		GameObject particle = new_object(
-			"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 90, 1);
-		auto & particle_image = particle.add_component<Sprite>(img5, Sprite::Data{
-																		 .size = {5, 5},
-																		 .angle_offset = 45,
-																		 .scale_offset = 1,
-																	 });
-		auto & test
-			= particle.add_component<ParticleEmitter>(particle_image, ParticleEmitter::Data{
-																		  .offset = {0, 0},
-																		  .max_particles = 256,
-																		  .emission_rate = 4,
-																		  .min_speed = 10,
-																		  .max_speed = 20,
-																		  .min_angle = -20,
-																		  .max_angle = 20,
-																		  .begin_lifespan = 0,
-																		  .end_lifespan = 5,
-																	  });
-		particle.add_component<Rigidbody>(Rigidbody::Data{
-			.angular_velocity = 20,
+		GameObject circle_4 = this->new_object("ricle_4", "tag", ONTOP ? vec2(0.25, 4) : vec2(3.5, 4), 0, SCALE);
+		Asset circle_4_asset = Asset("asset/texture/circle.png");
+		circle_4.add_component<Sprite>(circle_4_asset, Sprite::Data{
+			.sorting_in_layer = 0,
+			.order_in_layer = 0,
+			.size = vec2(1, 1),
+			.angle_offset = 0,
+			.scale_offset = 1,
+			.position_offset = vec2(OFFSET_X_RIGHT, OFFSET_Y_RIGHT),
+		});
+		circle_4.add_component<Rigidbody>(Rigidbody::Data{
+			.gravity_scale = 0,
+			.body_type = BODYTYPE_RIGHT,
+			.linear_velocity = SCRIPT ? vec2{0, 0} : vec2{-1, 0},
+			.elasticity_coefficient = BOUNCE_RIGHT ? 0.5 : 0,
+			.kinematic_collision = KINEMATIC_COLLISION,
 		});
+		circle_4.add_component<BehaviorScript>().set_script<ScriptMoveToLeft>().active = SCRIPT;
+		circle_4.add_component<CircleCollider>(0.5, vec2(OFFSET_X_RIGHT, OFFSET_Y_RIGHT));
+		circle_4.add_component<BehaviorScript>().set_script<ScriptCircle>();
 	}
 
 	string get_name() const { return "scene1"; }
-- 
cgit v1.2.3