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 --
 2 files changed, 4 insertions(+), 11 deletions(-)

(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:
 	/**
-- 
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 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 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 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 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 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 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 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 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 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 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