From 47bba754f4074e65e017d6a87723e089ffa10a5a Mon Sep 17 00:00:00 2001 From: Kyle Isom Date: Sun, 8 Oct 2023 22:42:00 -0700 Subject: [PATCH] Add better font support. --- ext/imgui/misc/freetype/imgui_freetype.cpp | 2 +- kge.cc | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ext/imgui/misc/freetype/imgui_freetype.cpp b/ext/imgui/misc/freetype/imgui_freetype.cpp index fe219b4..2e855de 100644 --- a/ext/imgui/misc/freetype/imgui_freetype.cpp +++ b/ext/imgui/misc/freetype/imgui_freetype.cpp @@ -38,7 +38,7 @@ #include "imgui_freetype.h" #include "imgui_internal.h" // ImMin,ImMax,ImFontAtlasBuild*, #include -#include +#include #include FT_FREETYPE_H // #include FT_MODULE_H // #include FT_GLYPH_H // diff --git a/kge.cc b/kge.cc index cbc37bb..3507ad7 100644 --- a/kge.cc +++ b/kge.cc @@ -15,6 +15,9 @@ #include "fonts/brassmono.h" +static const float fontPixelSizes[] = {16, 10, 12, 14, 18}; + + int main() { @@ -78,7 +81,19 @@ main() ImGui_ImplSDL2_InitForOpenGL(window, gl_context); ImGui_ImplOpenGL3_Init(glsl_version); - io.Fonts->AddFontFromMemoryCompressedTTF(B612Mono_Regular_compressed_data, B612Mono_Regular_compressed_size, 12); + for (auto pixelSize : fontPixelSizes) { + io.Fonts->AddFontFromMemoryCompressedTTF(BrassMono_Regular_compressed_data, BrassMono_Regular_compressed_size, pixelSize); + io.Fonts->AddFontFromMemoryCompressedTTF(B612Mono_Regular_compressed_data, B612Mono_Regular_compressed_size, pixelSize); + + io.Fonts->AddFontFromMemoryCompressedTTF(B612Mono_Bold_compressed_data, B612Mono_Bold_compressed_size, pixelSize); + io.Fonts->AddFontFromMemoryCompressedTTF(BrassMono_Bold_compressed_data, BrassMono_Bold_compressed_size, pixelSize); + + io.Fonts->AddFontFromMemoryCompressedTTF(B612Mono_BoldItalic_compressed_data, B612Mono_BoldItalic_compressed_size, pixelSize); + io.Fonts->AddFontFromMemoryCompressedTTF(BrassMono_BoldItalic_compressed_data, BrassMono_BoldItalic_compressed_size, pixelSize); + + io.Fonts->AddFontFromMemoryCompressedTTF(B612Mono_Italic_compressed_data, B612Mono_Italic_compressed_size, pixelSize); + io.Fonts->AddFontFromMemoryCompressedTTF(BrassMono_Italic_compressed_data, BrassMono_Italic_compressed_size, pixelSize); + } bool done = false; bool show_demo_window = true;