From b98aced38d8329ab6b4524a658914727217b0dd6 Mon Sep 17 00:00:00 2001
From: Labrium <76017200+Labrium@users.noreply.github.com>
Date: Sat, 22 Jun 2024 17:07:06 -0600
Subject: [PATCH] Move sdf option to settings table

---
 src/modules/font/Rasterizer.h                    |  1 +
 src/modules/font/TrueTypeRasterizer.h            |  1 +
 src/modules/font/freetype/TrueTypeRasterizer.cpp | 10 ++++++++++
 src/modules/font/wrap_Font.cpp                   |  5 +++++
 4 files changed, 17 insertions(+)

diff --git a/src/modules/font/Rasterizer.h b/src/modules/font/Rasterizer.h
index 20174e498..c3a51e8dd 100644
--- a/src/modules/font/Rasterizer.h
+++ b/src/modules/font/Rasterizer.h
@@ -147,6 +147,7 @@ protected:
 
 	FontMetrics metrics;
 	float dpiScale;
+	bool sdf;
 
 }; // Rasterizer
 
diff --git a/src/modules/font/TrueTypeRasterizer.h b/src/modules/font/TrueTypeRasterizer.h
index 1a158a39a..c627b6e30 100644
--- a/src/modules/font/TrueTypeRasterizer.h
+++ b/src/modules/font/TrueTypeRasterizer.h
@@ -50,6 +50,7 @@ public:
 	{
 		Hinting hinting = HINTING_NORMAL;
 		OptionalFloat dpiScale;
+		bool sdf = false;
 	};
 
 	virtual ~TrueTypeRasterizer() {}
diff --git a/src/modules/font/freetype/TrueTypeRasterizer.cpp b/src/modules/font/freetype/TrueTypeRasterizer.cpp
index c88deedb3..e96863ac5 100644
--- a/src/modules/font/freetype/TrueTypeRasterizer.cpp
+++ b/src/modules/font/freetype/TrueTypeRasterizer.cpp
@@ -40,6 +40,8 @@ TrueTypeRasterizer::TrueTypeRasterizer(FT_Library library, love::Data *data, int
 	dpiScale = settings.dpiScale.get(defaultdpiscale);
 	size = floorf(size * dpiScale + 0.5f);
 
+	sdf = settings.sdf;
+
 	if (size <= 0)
 		throw love::Exception("Invalid TrueType font size: %d", size);
 
@@ -121,7 +123,11 @@ GlyphData *TrueTypeRasterizer::getGlyphDataForIndex(int index) const
 	FT_Render_Mode rendermode = FT_RENDER_MODE_NORMAL;
 	if (hinting == HINTING_MONO)
 		rendermode = FT_RENDER_MODE_MONO;
+<<<<<<< Updated upstream
 	else if (hinting == HINTING_SDF)
+=======
+	else if (sdf == true)
+>>>>>>> Stashed changes
 		rendermode = FT_RENDER_MODE_SDF;
 
 	err = FT_Glyph_To_Bitmap(&ftglyph, rendermode, 0, 1);
@@ -138,6 +144,10 @@ GlyphData *TrueTypeRasterizer::getGlyphDataForIndex(int index) const
 			throw love::Exception("TrueType Font glyph error: FT_Glyph_To_Bitmap failed (0x%x)", err);
 		}
 	}
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
 	FT_BitmapGlyph bitmap_glyph = (FT_BitmapGlyph) ftglyph;
 	const FT_Bitmap &bitmap = bitmap_glyph->bitmap; //just to make things easier
 
diff --git a/src/modules/font/wrap_Font.cpp b/src/modules/font/wrap_Font.cpp
index a43377bb0..9c8d00918 100644
--- a/src/modules/font/wrap_Font.cpp
+++ b/src/modules/font/wrap_Font.cpp
@@ -95,6 +95,11 @@ static TrueTypeRasterizer::Settings luax_checktruetypesettings(lua_State* L, int
 		if (!lua_isnoneornil(L, -1))
 			s.dpiScale.set((float)luaL_checknumber(L, -1));
 		lua_pop(L, 1);
+
+		lua_getfield(L, startidx, "sdf");
+		if (!lua_isnoneornil(L, -1))
+			s.sdf = lua_toboolean(L, -1);
+		lua_pop(L, 1);
 	}
 
 	return s;