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/example/rendering_particle.cpp | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'src/example/rendering_particle.cpp')

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/example/rendering_particle.cpp')

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/example/rendering_particle.cpp')

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 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/example/rendering_particle.cpp')

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 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/example/rendering_particle.cpp')

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/example/rendering_particle.cpp')

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 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/example/rendering_particle.cpp')

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/example/rendering_particle.cpp')

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