From ee9dfd4593d59473de1cefe868d2f9d89af794d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= <simon.luebess@gmail.com>
Date: Sat, 15 Jan 2022 13:29:45 +0100
Subject: [PATCH] Don't use Harfbuzz for simple text rendering + Ignored
 warnings

---
 GlitchyEngine/src/Renderer/Text/Font.bf         |  2 +-
 GlitchyEngine/src/Renderer/Text/FontRenderer.bf | 10 ++++++----
 GlitchyEngine/vendor/freetype                   |  2 +-
 GlitchyEngine/vendor/msdfgen                    |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/GlitchyEngine/src/Renderer/Text/Font.bf b/GlitchyEngine/src/Renderer/Text/Font.bf
index 2ae7fb3..bdebda4 100644
--- a/GlitchyEngine/src/Renderer/Text/Font.bf
+++ b/GlitchyEngine/src/Renderer/Text/Font.bf
@@ -671,7 +671,7 @@ namespace GlitchyEngine.Renderer.Text
 
 			shape.Normalize();
 
-			var bounds = shape.GetBounds();
+			//var bounds = shape.GetBounds();
 			
 			//shape.ReverseIfNeeded(bounds);
 
diff --git a/GlitchyEngine/src/Renderer/Text/FontRenderer.bf b/GlitchyEngine/src/Renderer/Text/FontRenderer.bf
index c0e8d63..7df0e37 100644
--- a/GlitchyEngine/src/Renderer/Text/FontRenderer.bf
+++ b/GlitchyEngine/src/Renderer/Text/FontRenderer.bf
@@ -457,7 +457,8 @@ namespace GlitchyEngine.Renderer.Text
 			// about 8 million (2^23) increments to reach a depth of 1 so I think it's safe enough.
 			//float f = 1.0f;
 			//int32 depthInt = *(int32*)&f;
-
+			
+			/*
 			// Shape!!!!!!!!!!!!!!!!!!!
 
 			// 1. Create a buffer and put your text in it:
@@ -469,7 +470,7 @@ namespace GlitchyEngine.Renderer.Text
 			hb_buffer_set_direction(buf, .HB_DIRECTION_LTR);
 			hb_buffer_set_script(buf, .HB_SCRIPT_LATIN);
 			hb_buffer_set_language(buf, hb_language_from_string("en".CStr(), -1));
-
+			
 			// 3. Get the face
 			hb_font_t* hb_font = font._harfBuzzFont;
 			
@@ -561,7 +562,8 @@ namespace GlitchyEngine.Renderer.Text
 			    penPosition += (x_advance / 64) * glyphFontScale;
 			    baseline += (y_advance / 64) * glyphFontScale;
 			}
-			/*
+			*/
+
 			// enumerate through the unicode codepoints
 			for(char32 char in text.DecodedChars)
 			{
@@ -635,7 +637,7 @@ namespace GlitchyEngine.Renderer.Text
 				// Increase depth for the next glyph
 				//depthInt--;
 			}
-			*/
+
 			Renderer2D.Flush();
 
 			// TODO: not good!
diff --git a/GlitchyEngine/vendor/freetype b/GlitchyEngine/vendor/freetype
index 1dff3b0..fc81890 160000
--- a/GlitchyEngine/vendor/freetype
+++ b/GlitchyEngine/vendor/freetype
@@ -1 +1 @@
-Subproject commit 1dff3b06b9d10c703cd9b66961c0cd541be15fda
+Subproject commit fc81890eb0d8bc57246dab0a7b8c0b8b459560fb
diff --git a/GlitchyEngine/vendor/msdfgen b/GlitchyEngine/vendor/msdfgen
index 9f19e63..03cd808 160000
--- a/GlitchyEngine/vendor/msdfgen
+++ b/GlitchyEngine/vendor/msdfgen
@@ -1 +1 @@
-Subproject commit 9f19e63a51b6108bf6c22fad058d1b059ce72c81
+Subproject commit 03cd808438e0c5c6e1578d9b7b868d11e1d899ec