- reworked console font loading to use the glyph sheets directly and allowing to load more than one per font.

src/gamedata/fonts/font.cpp

@@ -55,6 +55,7 @@
 #include "image.h"
 #include "utf8.h"
 #include "textures/formats/fontchars.h"
+#include "textures/formats/multipatchtexture.h"
 
 #include "fontinternals.h"
 
@@ -91,6 +92,7 @@ FFont::FFont (const char *name, const char *nametemplate, const char *filetempla
 	uint8_t pp = 0;
 	for (auto &p : PatchRemap) p = pp++;
 	translateUntranslated = false;
+	int FixedWidth = 0;
 
 	maxyoffs = 0;
 
@@ -151,6 +153,14 @@ FFont::FFont (const char *name, const char *nametemplate, const char *filetempla
 						sc.MustGetValue(false);
 						FontHeight = sc.Number;
 					}
+					else if (sc.Compare("CellSize"))
+					{
+						sc.MustGetValue(false);
+						FixedWidth = sc.Number;
+						sc.MustGetToken(',');
+						sc.MustGetValue(false);
+						FontHeight = sc.Number;
+					}
 					else if (sc.Compare("Translationtype"))
 					{
 						sc.MustGetToken(TK_Identifier);
@@ -172,7 +182,12 @@ FFont::FFont (const char *name, const char *nametemplate, const char *filetempla
 		}
 	}
 	
-	
+	if (FixedWidth > 0)
+	{
+		ReadSheetFont(folderdata, FixedWidth, FontHeight, Scale);
+	}
+	else
+	{
 		if (nametemplate != nullptr)
 		{
 			for (i = 0; i < lcount; i++)
@@ -224,7 +239,6 @@ FFont::FFont (const char *name, const char *nametemplate, const char *filetempla
 				}
 			}
 		}
-
 		FirstChar = minchar;
 		LastChar = maxchar;
 		auto count = maxchar - minchar + 1;
@@ -294,10 +308,112 @@ FFont::FFont (const char *name, const char *nametemplate, const char *filetempla
 		if (FontHeight == 0) FontHeight = fontheight;
 
 		FixXMoves();
+	}
 
 	if (!noTranslate) LoadTranslations();
 }
 
+void FFont::ReadSheetFont(TArray<FolderEntry> &folderdata, int width, int height, const DVector2 &Scale)
+{
+	// all valid lumps must be named with a hex number that represents the Unicode character index for its first character,
+	TArray<TexPart> part(1, true);
+	TMap<int, FTexture*> charMap;
+	int minchar = INT_MAX;
+	int maxchar = INT_MIN;
+	for (auto &entry : folderdata)
+	{
+		char *endp;
+		auto base = ExtractFileBase(entry.name);
+		auto position = strtoll(base.GetChars(), &endp, 16);
+		if ((*endp == 0 || (*endp == '.' && position >= 0 && position < 0xffff)))	// Sheet fonts may fill in the low control chars.
+		{
+			auto lump = TexMan.CheckForTexture(entry.name, ETextureType::MiscPatch);
+			if (lump.isValid())
+			{
+				auto tex = TexMan.GetTexture(lump);
+				int numtex_x = tex->GetWidth() / width;
+				int numtex_y = tex->GetHeight() / height;
+				int maxinsheet = int(position) + numtex_x * numtex_y - 1;
+				if (minchar > position) minchar = int(position);
+				if (maxchar < maxinsheet) maxchar = maxinsheet;
+
+				for (int y = 0; y < numtex_y; y++)
+				{
+					for (int x = 0; x < numtex_x; x++)
+					{
+						part[0].OriginX = -width * x;
+						part[0].OriginY = -height * y;
+						part[0].Image = tex->GetImage();
+						FMultiPatchTexture *image = new FMultiPatchTexture(width, height, part, false, false);
+						FImageTexture *tex = new FImageTexture(image, "");
+						tex->SetUseType(ETextureType::FontChar);
+						tex->bMultiPatch = true;
+						tex->Width = width;
+						tex->Height = height;
+						tex->_LeftOffset[0] = 
+						tex->_LeftOffset[1] = 
+						tex->_TopOffset[0] = 
+						tex->_TopOffset[1] = 0;
+						tex->Scale = Scale;
+						tex->bMasked = true;
+						tex->bTranslucent = -1;
+						tex->bWorldPanning = true;
+						tex->bNoDecals = false;
+						tex->SourceLump = -1;	// We do not really care.
+						TexMan.AddTexture(tex);
+						charMap.Insert(position + x + y * numtex_x, tex);
+					}
+				}
+			}
+		}
+	}
+
+
+	FirstChar = minchar;
+	bool map1252 = false;
+	if (minchar < 0x80 && maxchar >= 0xa0) // should be a settable option, but that'd probably cause more problems than it'd solve.
+	{
+		if (maxchar < 0x2122) maxchar = 0x2122;
+		map1252 = true;
+	}
+	LastChar = maxchar;
+	auto count = maxchar - minchar + 1;
+	Chars.Resize(count);
+	int fontheight = 0;
+
+	for (int i = 0; i < count; i++)
+	{
+		auto lump = charMap.CheckKey(FirstChar + i);
+		if (lump != nullptr)
+		{
+			FTexture *pic = *lump;
+
+			auto b = pic->Get8BitPixels(false);
+
+			Chars[i].OriginalPic = pic;
+			Chars[i].TranslatedPic = new FImageTexture(new FFontChar1(pic->GetImage()), "");
+			Chars[i].TranslatedPic->CopySize(pic);
+			Chars[i].TranslatedPic->SetUseType(ETextureType::FontChar);
+			TexMan.AddTexture(Chars[i].TranslatedPic);
+		}
+		Chars[i].XMove = width;
+	}
+
+	if (map1252)
+	{
+		// Move the Windows-1252 characters to their proper place.
+		for (int i = 0x80; i < 0xa0; i++)
+		{
+			if (win1252map[i - 0x80] != i && Chars[i - minchar].TranslatedPic != nullptr && Chars[win1252map[i - 0x80] - minchar].TranslatedPic == nullptr)
+			{
+				std::swap(Chars[i - minchar], Chars[win1252map[i - 0x80] - minchar]);
+			}
+		}
+	}
+
+	SpaceWidth = width;
+}
+
 //==========================================================================
 //
 // FFont :: ~FFont

src/gamedata/fonts/v_font.cpp

@@ -1477,7 +1477,6 @@ void V_InitFonts()
 	{
 		BigFont = SmallFont;
 	}
-	
 }
 
 void V_ClearFonts()

src/gamedata/fonts/v_font.h

@@ -35,6 +35,8 @@
 #define __V_FONT_H__
 
 #include "doomtype.h"
+#include "w_wad.h"
+#include "vectors.h"
 
 class DCanvas;
 struct FRemapTable;
@@ -114,6 +116,8 @@ protected:
 	static int SimpleTranslation (uint8_t *colorsused, uint8_t *translation,
 		uint8_t *identity, TArray<double> &Luminosity);
 
+	void ReadSheetFont(TArray<FolderEntry> &folderdata, int width, int height, const DVector2 &Scale);
+
 	int FirstChar, LastChar;
 	int SpaceWidth;
 	int FontHeight;

wadsrc/static/fonts/consolefont/font.inf

@@ -0,0 +1,3 @@
+TranslationType Console
+CellSize 8, 8	// This implies font sheets
+