10 files changed, 156 insertions, 75 deletions

diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 85016f5..7531388 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -40,4 +40,3 @@ bool Script::get_key_state(Keycode key) const noexcept {
 		return false;
 	}
 }
-
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 54a4370..4a94180 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -1,5 +1,3 @@
-#include "../facade/FontFacade.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/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 0d5eb01..ca45b79 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -20,7 +20,11 @@
 #include "../api/Config.h"
 #include "../api/Sprite.h"
 #include "../util/Log.h"
+#include "api/Text.h"
+#include "api/Transform.h"
+#include "facade/Font.h"
 #include "manager/Mediator.h"
+#include "util/AbsolutePosition.h"
 
 #include "SDLContext.h"
 #include "Texture.h"
@@ -31,9 +35,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()));
 	}
@@ -62,6 +63,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;
 }
 
@@ -74,8 +79,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();
 }
 
@@ -147,14 +152,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) {
-		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
-						  - size / 2 + cam_aux_data.bar_size;
-		screen_pos += multiplier;
+		screen_pos
+			= (screen_pos + cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale
+			  - size / 2 + cam_aux_data.bar_size;
 	}
 
 	return SDL_FRect{
@@ -195,6 +199,52 @@ void SDLContext::draw(const RenderContext & ctx) {
 					  angle, NULL, render_flip);
 }
 
+void SDLContext::draw_text(const RenderText & data) {
+
+	const Text & text = data.text;
+	const Font & font = data.font;
+	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;
+
+	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 * tmp_font_surface
+		= TTF_RenderText_Solid(font.get_font(), text.text.c_str(), color);
+	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 == NULL) {
+		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 * data.transform.scale;
+	vec2 screen_pos = (absoluut_pos - cam_aux_data.cam_pos
+					   + (cam_aux_data.zoomed_viewport) / 2)
+						  * cam_aux_data.render_scale
+					  - size / 2 + cam_aux_data.bar_size;
+
+	SDL_FRect dstrect{
+		.x = screen_pos.x,
+		.y = screen_pos.y,
+		.w = size.x,
+		.h = size.y,
+	};
+
+	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) {
 
 	const Camera::Data & cam_data = cam.data;
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index b687f87..e570073 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -12,18 +12,21 @@
 #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 "types.h"
 
 #include "EventData.h"
 #include "FontFacade.h"
+#include "types.h"
 
 namespace crepe {
 class Texture;
+class Text;
+class Font;
 class Mediator;
 
 /**
@@ -71,12 +74,11 @@ public:
 		const double & scale;
 	};
 
-public:
-	/**
-	 * \brief Gets the singleton instance of SDLContext.
-	 * \return Reference to the SDLContext instance.
-	 */
-	static SDLContext & get_instance();
+	struct RenderText {
+		const Text & text;
+		const Font & font;
+		const Transform & transform;
+	};
 
 public:
 	SDLContext(const SDLContext &) = delete;
@@ -186,6 +188,13 @@ 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.
 	void clear_screen();
 
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 57d180f..e8339c3 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -16,6 +16,8 @@
 #include "../facade/Texture.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/ResourceManager.h"
+#include "api/Text.h"
+#include "facade/Font.h"
 
 #include "RenderSystem.h"
 #include "types.h"
@@ -70,12 +72,34 @@ RefVector<Sprite> RenderSystem::sort(RefVector<Sprite> & objs) const {
 void RenderSystem::update() {
 	this->clear_screen();
 	this->render();
+	this->render_text();
 	this->present_screen();
 }
 
-bool RenderSystem::render_particle(const Sprite & sprite, const float & transform_angle,
-								   const float & scale) {
+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;
+		if (!text.font.has_value())
+			text.font.emplace(ctx.get_font_from_name(text.font_family));
+
+		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 Transform & transform) {
 	ComponentManager & mgr = this->mediator.component_manager;
 	SDLContext & ctx = this->mediator.sdl_context;
 	ResourceManager & resource_manager = this->mediator.resource_manager;
@@ -99,14 +123,14 @@ bool RenderSystem::render_particle(const Sprite & sprite, const float & transfor
 				.sprite = sprite,
 				.texture = res,
 				.pos = p.position,
-				.angle = p.angle + transform_angle,
-				.scale = scale,
+				.angle = p.angle + transform.rotation,
+				.scale = transform.scale,
 			});
 		}
 	}
 	return rendering_particles;
 }
-void RenderSystem::render_normal(const Sprite & sprite, const Transform & tm) {
+void RenderSystem::render_normal(const Sprite & sprite, const Transform & transform) {
 	SDLContext & ctx = this->mediator.sdl_context;
 	ResourceManager & resource_manager = this->mediator.resource_manager;
 	const Texture & res = resource_manager.get<Texture>(sprite.source);
@@ -114,9 +138,9 @@ void RenderSystem::render_normal(const Sprite & sprite, const Transform & tm) {
 	ctx.draw(SDLContext::RenderContext{
 		.sprite = sprite,
 		.texture = res,
-		.pos = tm.position,
-		.angle = tm.rotation,
-		.scale = tm.scale,
+		.pos = transform.position,
+		.angle = transform.rotation,
+		.scale = transform.scale,
 	});
 }
 
@@ -128,36 +152,16 @@ 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
 			= mgr.get_components_by_id<Transform>(sprite.game_object_id).front().get();
 
-		bool rendered_particles
-			= this->render_particle(sprite, transform.rotation, transform.scale);
+		bool rendered_particles = this->render_particle(sprite, transform);
 
 		if (rendered_particles) continue;
 
 		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.emplace(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 76df0e0..14e5c2d 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -36,35 +36,28 @@ private:
 	//! Updates the active camera used for rendering.
 	void update_camera();
 
-	//! Renders the whole screen
+	//! Renders all the sprites and particles
 	void render();
 
+	//! Renders all Text components
+	void render_text();
+
+private:
 	/**
 	 * \brief Renders all the particles on the screen from a given sprite.
 	 *
 	 * \param sprite renders the particles with given texture
-	 * \param tm the Transform component for scale. This is not a const reference because each
-	 *  particle has a position and rotation that needs to overwrite the transform position and
-	 *  rotation without overwriting the current transform. and because the transform
-	 *  constructor is now protected i cannot make tmp inside
+	 * \param transform the component that holds the position, rotation, and scale.
 	 * \return true if particles have been rendered
 	 */
-	bool render_particle(const Sprite & sprite, const float & transform_angle,
-						 const float & 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);
+	bool render_particle(const Sprite & sprite, const Transform & transform);
 	/**
 	 * \brief renders a sprite with a Transform component on the screen
 	 *
 	 * \param sprite  the sprite component that holds all the data
-	 * \param tm the Transform component that holds the position,rotation and scale
+	 * \param transform the Transform component that holds the position,rotation and scale
 	 */
-	void render_normal(const Sprite & sprite, const Transform & tm);
+	void render_normal(const Sprite & sprite, const Transform & transform);
 
 	/**
 	 * \brief sort a vector sprite objects with
@@ -73,12 +66,6 @@ private:
 	 * \return returns a sorted reference vector
 	 */
 	RefVector<Sprite> sort(RefVector<Sprite> & objs) const;
-
-	/**
-	 * \todo Add text rendering using SDL_ttf for text components.
-	 * \todo Implement a text component and a button component.
-	 * \todo Consider adding text input functionality.
-	 */
 };
 
 } // namespace crepe
diff --git a/src/crepe/util/AbsolutePosition.cpp b/src/crepe/util/AbsolutePosition.cpp
new file mode 100644
index 0000000..29ade23
--- /dev/null
+++ b/src/crepe/util/AbsolutePosition.cpp
@@ -0,0 +1,20 @@
+#include "AbsolutePosition.h"
+
+using namespace crepe;
+
+vec2 AbsolutePosition::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/AbsolutePosition.h b/src/crepe/util/AbsolutePosition.h
new file mode 100644
index 0000000..0bc8748
--- /dev/null
+++ b/src/crepe/util/AbsolutePosition.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "api/Transform.h"
+
+#include "types.h"
+
+namespace crepe {
+
+class AbsolutePosition {
+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..33160a7 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
+	AbsolutePosition.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
+	AbsolutePosition.h
 )