Use a truetype font for the options menu, although a better one could probably be chosen to match the theme of doom

src/CMakeLists.txt

@@ -982,6 +982,8 @@ set (PCH_SOURCES
 	common/fonts/specialfont.cpp
 	common/fonts/font.cpp
 	common/fonts/hexfont.cpp
+	common/fonts/ttffont.cpp
+	common/fonts/schrift.cpp
 	common/fonts/v_font.cpp
 	common/fonts/v_text.cpp	
 	common/textures/hw_ihwtexture.cpp

src/common/fonts/schrift.h

@@ -0,0 +1,95 @@
+/* This file is part of libschrift.
+ *
+ * © 2019-2022 Thomas Oltmann and contributors
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+
+#ifndef SCHRIFT_H
+#define SCHRIFT_H 1
+
+#include <stddef.h> /* size_t */
+#include <stdint.h> /* uint_fast32_t, uint_least32_t */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SFT_DOWNWARD_Y 0x01
+
+typedef struct SFT          SFT;
+typedef struct SFT_Font     SFT_Font;
+typedef uint_least32_t      SFT_UChar; /* Guaranteed to be compatible with char32_t. */
+typedef uint_fast32_t       SFT_Glyph;
+typedef struct SFT_LMetrics SFT_LMetrics;
+typedef struct SFT_GMetrics SFT_GMetrics;
+typedef struct SFT_Kerning  SFT_Kerning;
+typedef struct SFT_Image    SFT_Image;
+
+struct SFT
+{
+	SFT_Font *font;
+	double    xScale;
+	double    yScale;
+	double    xOffset;
+	double    yOffset;
+	int       flags;
+};
+
+struct SFT_LMetrics
+{
+	double ascender;
+	double descender;
+	double lineGap;
+};
+
+struct SFT_GMetrics
+{
+	double advanceWidth;
+	double leftSideBearing;
+	int    yOffset;
+	int    minWidth;
+	int    minHeight;
+};
+
+struct SFT_Kerning
+{
+	double xShift;
+	double yShift;
+};
+
+struct SFT_Image
+{
+	void *pixels;
+	int   width;
+	int   height;
+};
+
+const char *sft_version(void);
+
+SFT_Font *sft_loadmem (const void *mem, size_t size);
+SFT_Font *sft_loadfile(const char *filename);
+void      sft_freefont(SFT_Font *font);
+
+int sft_lmetrics(const SFT *sft, SFT_LMetrics *metrics);
+int sft_lookup  (const SFT *sft, SFT_UChar codepoint, SFT_Glyph *glyph);
+int sft_gmetrics(const SFT *sft, SFT_Glyph glyph, SFT_GMetrics *metrics);
+int sft_kerning (const SFT *sft, SFT_Glyph leftGlyph, SFT_Glyph rightGlyph,
+                 SFT_Kerning *kerning);
+int sft_render  (const SFT *sft, SFT_Glyph glyph, SFT_Image image);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

src/common/fonts/ttffont.cpp

@@ -0,0 +1,145 @@
+
+#include "engineerrors.h"
+#include "textures.h"
+#include "image.h"
+#include "v_font.h"
+#include "filesystem.h"
+#include "utf8.h"
+#include "sc_man.h"
+#include "texturemanager.h"
+#include "fontinternals.h"
+#include "schrift.h"
+
+class FTTFGlyph : public FImageSource
+{
+public:
+	FTTFGlyph(int width, int height, int leftoffset, int topoffset, TArray<uint8_t> pixels, PalEntry* palette)
+	{
+		Width = width;
+		Height = height;
+		LeftOffset = leftoffset;
+		TopOffset = topoffset;
+		Pixels = std::move(pixels);
+		Palette = palette;
+	}
+
+	PalettedPixels CreatePalettedPixels(int conversion, int frame = 0) override
+	{
+		PalettedPixels OutPixels(Pixels.Size());
+		memcpy(OutPixels.Data(), Pixels.Data(), Pixels.Size());
+		return OutPixels;
+	}
+
+	int CopyPixels(FBitmap* bmp, int conversion)
+	{
+		if (conversion == luminance)
+			conversion = normal;	// luminance images have no use as an RGB source.
+
+		auto ppix = CreatePalettedPixels(conversion);
+		bmp->CopyPixelData(0, 0, ppix.Data(), Width, Height, 1, Width, 0, Palette);
+		return 0;
+	}
+
+private:
+	TArray<uint8_t> Pixels;
+	PalEntry* Palette = nullptr;
+};
+
+class FTTFFont : public FFont
+{
+public:
+	FTTFFont(const char* fontname, int height, int lump) : FFont(lump)
+	{
+		auto lumpdata = fileSystem.ReadFile(lump);
+
+		SFT sft = {};
+		sft.xScale = height;
+		sft.yScale = height;
+		sft.flags = SFT_DOWNWARD_Y;
+		sft.font = sft_loadmem(lumpdata.GetMem(), lumpdata.GetSize());
+		if (!sft.font)
+			I_FatalError("Could not load truetype font file");
+
+		SFT_LMetrics lmtx;
+		if (sft_lmetrics(&sft, &lmtx) < 0)
+			I_FatalError("Could not get truetype font metrics");
+
+		FontName = fontname;
+		FontHeight = (int)std::floor((lmtx.ascender + lmtx.descender + lmtx.lineGap)) + 2;
+
+		{
+			SFT_Glyph gid;
+			SFT_GMetrics mtx;
+			if (sft_lookup(&sft, 32, &gid) < 0)
+				I_FatalError("Could not find the glyph id for the space character");
+
+			if (sft_gmetrics(&sft, gid, &mtx) < 0)
+				I_FatalError("Could not get the glyph metrics for the space character");
+
+			SpaceWidth = (int)std::round(mtx.advanceWidth);
+		}
+
+		GlobalKerning = 0;
+
+		FirstChar = 10;
+		LastChar = 255;
+
+		for (int i = 0; i < 256; i++)
+		{
+			palette[i] = PalEntry(i, 255, 255, 255);
+		}
+
+		Chars.Resize(LastChar - FirstChar + 1);
+		for (int i = FirstChar; i <= LastChar; i++)
+		{
+			SFT_Glyph gid;
+			if (sft_lookup(&sft, i, &gid) < 0)
+				continue;
+
+			SFT_GMetrics mtx;
+			if (sft_gmetrics(&sft, gid, &mtx) < 0)
+				continue;
+
+			if (mtx.minWidth <= 0 || mtx.minHeight <= 0)
+				continue;
+
+			SFT_Image img = {};
+			img.width = (mtx.minWidth + 3) & ~3;
+			img.height = mtx.minHeight;
+
+			TArray<uint8_t> pixels(img.width * img.height, true);
+			img.pixels = pixels.Data();
+			if (sft_render(&sft, gid, img) < 0)
+				continue;
+
+			Chars[i - FirstChar].OriginalPic = MakeGameTexture(new FImageTexture(CreateGlyph(lmtx, mtx, img.width, img.height, std::move(pixels))), nullptr, ETextureType::FontChar);
+			Chars[i - FirstChar].XMove = (int)std::floor(mtx.advanceWidth) + 1;
+			TexMan.AddGameTexture(Chars[i - FirstChar].OriginalPic);
+		}
+	}
+
+	void LoadTranslations() override
+	{
+		int minlum = 0;
+		int maxlum = 255;
+
+		Translations.Resize(NumTextColors);
+		for (int i = 0; i < NumTextColors; i++)
+		{
+			if (i == CR_UNTRANSLATED) Translations[i] = 0;
+			else Translations[i] = LuminosityTranslation(i * 2, minlum, maxlum);
+		}
+	}
+
+	virtual FTTFGlyph* CreateGlyph(const SFT_LMetrics& lmtx, const SFT_GMetrics& mtx, int width, int height, TArray<uint8_t> pixels)
+	{
+		return new FTTFGlyph(width, height, (int)std::round(-mtx.leftSideBearing), -mtx.yOffset - (int)std::round(lmtx.ascender + lmtx.descender + lmtx.lineGap * 0.5), std::move(pixels), palette);
+	}
+
+	PalEntry palette[256];
+};
+
+FFont* CreateTTFFont(const char* fontname, int height, int lump)
+{
+	return new FTTFFont(fontname, height, lump);
+}

src/common/fonts/v_font.cpp

@@ -870,11 +870,17 @@ void V_InitFonts()
 
 	FFont *CreateHexLumpFont(const char *fontname, int lump);
 	FFont *CreateHexLumpFont2(const char *fontname, int lump);
+	FFont* CreateTTFFont(const char* fontname, int height, int lump);
 
 	auto lump = fileSystem.CheckNumForFullName("newconsolefont.hex", 0);	// This is always loaded from gzdoom.pk3 to prevent overriding it with incomplete replacements.
 	if (lump == -1) I_FatalError("newconsolefont.hex not found");	// This font is needed - do not start up without it.
 	NewConsoleFont = CreateHexLumpFont("NewConsoleFont", lump);
-	NewSmallFont = CreateHexLumpFont2("NewSmallFont", lump);
+	//NewSmallFont = CreateHexLumpFont2("NewSmallFont", lump);
+
+	lump = fileSystem.CheckNumForFullName("newmenufont.ttf", 0);	// This is always loaded from gzdoom.pk3 to prevent overriding it with incomplete replacements.
+	if (lump == -1) I_FatalError("newmenufont.ttf not found");	// This font is needed - do not start up without it.
+	NewSmallFont = CreateTTFFont("NewSmallFont", 18, lump);
+
 	CurrentConsoleFont = NewConsoleFont;
 	ConFont = V_GetFont("ConsoleFont", "CONFONT");
 	V_GetFont("IndexFont", "INDEXFON");	// detect potential replacements for this one.

wadsrc/static/newmenufont.license

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.