Merge branch 'wouter/text-component' into niels/UI

5 files changed, 13 insertions, 15 deletions

diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 668e5d1..a24e32e 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -156,6 +156,7 @@ private:
 	void subscribe_internal(const EventHandler<EventType> & callback, event_channel_t channel);
 
 protected:
+	OptionalRef<Mediator> mediator;
 	// NOTE: This must be the only constructor on Script, see "Late references" below
 	Script() = default;
 	//! Only \c BehaviorScript instantiates Script
@@ -190,7 +191,7 @@ private:
 	//! Reference to parent component
 	OptionalRef<bool> active;
 	//! Mediator reference
-	OptionalRef<Mediator> mediator;
+
 	//! \}
 
 private:
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index fbb1ad6..ec0bf74 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -53,7 +53,7 @@ public:
 	//! Label text.
 	std::string text = "";
 	//! Font asset variable
-	Asset font;
+	const Asset font;
 	//! Data instance
 	Data data;
 };
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index a9f1633..8c16563 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -1,3 +1,4 @@
+#include "../api/Asset.h"
 #include "../api/Config.h"
 #include "util/Log.h"
 #include <iostream>
@@ -11,17 +12,12 @@ 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();
-	cout << FONT_PATH.c_str() << endl;
-	TTF_Font * font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
-	if (font == NULL)
+	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));
-	this->font = {font, [](TTF_Font * font) { TTF_CloseFont(font); }};
-}
-
-Font::~Font(){
-	dbg_trace();
-	this->font.reset();
+	}
+	this->font = {loaded_font, [](TTF_Font * font) { TTF_CloseFont(font); }};
 }
 
 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 e9f5fa1..91c59c0 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -1,13 +1,14 @@
 #pragma once
+
 #include <SDL2/SDL_ttf.h>
 #include <memory>
 
 #include "../Resource.h"
-#include "../api/Asset.h"
 #include "../api/Config.h"
 
 namespace crepe {
 
+class Asset;
 /**
  * \brief Resource for managing font creation and destruction
  *
@@ -16,6 +17,7 @@ namespace crepe {
  * when this object is destroyed.
  */
 class Font : public Resource {
+
 public:
 	/**
      * \param src The Asset containing the font file path and metadata to load the font.
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index 708b2ff..aa9d00c 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -1,4 +1,3 @@
-#include <SDL2/SDL_ttf.h>
 #include <fontconfig/fontconfig.h>
 #include <stdexcept>
 
@@ -43,7 +42,7 @@ 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));
+	string font_file_path = reinterpret_cast<const char *>(file_path);
 	FcPatternDestroy(matched_pattern);
 	FcFini();
 	return Asset(font_file_path);