Merge branch 'master' into loek/scripts

1 files changed, 25 insertions, 1 deletions

diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 505433a..62d42ec 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -2,13 +2,16 @@
 #include <cassert>
 #include <cmath>
 #include <functional>
+#include <optional>
 #include <stdexcept>
 #include <vector>
 
 #include "../api/Camera.h"
 #include "../api/ParticleEmitter.h"
 #include "../api/Sprite.h"
+#include "../api/Text.h"
 #include "../api/Transform.h"
+#include "../facade/Font.h"
 #include "../facade/SDLContext.h"
 #include "../facade/Texture.h"
 #include "../manager/ComponentManager.h"
@@ -120,8 +123,14 @@ void RenderSystem::render() {
 	this->update_camera();
 
 	RefVector<Sprite> sprites = mgr.get_components_by_type<Sprite>();
+	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
@@ -134,3 +143,18 @@ void RenderSystem::render() {
 		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);
+}