2 files changed, 77 insertions, 18 deletions

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();