5 files changed, 42 insertions, 8 deletions

diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index f202c05..81a9e7a 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -2,6 +2,7 @@
 
 #include "../api/Asset.h"
 #include "../api/Config.h"
+#include <string>
 
 #include "Font.h"
 
@@ -11,6 +12,7 @@ using namespace crepe;
 Font::Font(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
 	Config & config = Config::get_instance();
 	const std::string FONT_PATH = src.get_path();
+
 	TTF_Font * loaded_font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
 	if (loaded_font == NULL) {
 		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
@@ -19,3 +21,4 @@ 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/Font.h b/src/crepe/facade/Font.h
index b208d96..b08366d 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/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index 7edfeb8..cec3507 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"
@@ -16,7 +17,7 @@ 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.");
 	}
 
@@ -32,8 +33,7 @@ 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
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index c88687e..a5ccdae 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"
@@ -32,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()));
 	}
@@ -63,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;
 }
 
@@ -75,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();
 }
 
@@ -283,6 +286,30 @@ 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_Rect dstrect {
+		.x = (int)text.offset.x,
+		.y = (int)text.offset.y,
+		.w = (int)text.dimensions.x,
+		.h = (int)text.dimensions.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_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 6f6eddb..33a4ff9 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -22,6 +22,8 @@
 namespace crepe {
 
 class Texture;
+class Text;
+class Font;
 class Mediator;
 
 /**
@@ -185,6 +187,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();