update fonts.

wutipong · Jan 26, 2024 · d5eea90 · d5eea90
1 parent b57c477
commit d5eea90
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 34 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,7 @@
 
 [submodule "imgui-filebrowser"]
-	path = imgui-filebrowser
+	path = ext/imgui-filebrowser
 	url = https://github.com/AirGuanZ/imgui-filebrowser
+[submodule "ext/IconFontCppHeaders"]
+	path = ext/IconFontCppHeaders
+	url = https://github.com/juliettef/IconFontCppHeaders
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,10 @@ add_executable(font-render-tester
         "src/texture.cpp"
         "src/texture.hpp"
 )
-target_include_directories(font-render-tester PRIVATE imgui-filebrowser)
+target_include_directories(font-render-tester PRIVATE 
+        "ext/imgui-filebrowser"
+        "ext/IconFontCppHeaders"
+)
 
 target_compile_features(font-render-tester PRIVATE cxx_std_23)
 set_property(TARGET font-render-tester PROPERTY CXX_STANDARD 23)
@@ -72,9 +75,12 @@ copy_resources(
         TARGET CopyFontFiles
         DESTINATION "fonts"
         INPUT 
-                "fonts/NotoSans-Regular.ttf" 
-                "fonts/NotoSansThai-Regular.ttf" 
-                "fonts/NotoSansCJKjp-Regular.otf" 
-                "fonts/NotoSansCJKkr-Regular.otf" 
-                "fonts/NotoSansCJKsc-Regular.otf"
+                "fonts/forkawesome-webfont.ttf"
+                "fonts/NotoSans-Regular.ttf"
+                "fonts/NotoSansArabic-Regular.ttf"
+                "fonts/NotoSansJP-Regular.ttf"
+                "fonts/NotoSansKR-Regular.ttf"
+                "fonts/NotoSansSC-Regular.ttf"
+                "fonts/NotoSansTC-Regular.ttf"
+                "fonts/NotoSansThai-Regular.ttf"
 )
diff --git a/ext/IconFontCppHeaders b/ext/IconFontCppHeaders
diff --git a/imgui-filebrowser → ext/imgui-filebrowser b/imgui-filebrowser → ext/imgui-filebrowser
diff --git a/fonts/NotoSans-Regular.ttf b/fonts/NotoSans-Regular.ttf
diff --git a/fonts/NotoSansArabic-Regular.ttf b/fonts/NotoSansArabic-Regular.ttf
diff --git a/fonts/NotoSansCJKjp-Regular.otf b/fonts/NotoSansCJKjp-Regular.otf
diff --git a/fonts/NotoSansCJKkr-Regular.otf b/fonts/NotoSansCJKkr-Regular.otf
diff --git a/fonts/NotoSansCJKsc-Regular.otf b/fonts/NotoSansCJKsc-Regular.otf
diff --git a/fonts/NotoSansJP-Regular.ttf b/fonts/NotoSansJP-Regular.ttf
diff --git a/fonts/NotoSansKR-Regular.ttf b/fonts/NotoSansKR-Regular.ttf
diff --git a/fonts/NotoSansSC-Regular.ttf b/fonts/NotoSansSC-Regular.ttf
diff --git a/fonts/NotoSansTC-Regular.ttf b/fonts/NotoSansTC-Regular.ttf
diff --git a/fonts/NotoSansThai-Regular.ttf b/fonts/NotoSansThai-Regular.ttf
diff --git a/fonts/forkawesome-webfont.ttf b/fonts/forkawesome-webfont.ttf
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,15 +1,15 @@
+#include "context.hpp"
+#include "io_util.hpp"
+#include "main_scene.hpp"
+#include "scene.hpp"
+#include <IconsForkAwesome.h>
 #include <SDL2/SDL.h>
 #include <imgui.h>
 #include <imgui_impl_sdl2.h>
 #include <imgui_impl_sdlrenderer2.h>
 #include <spdlog/sinks/rotating_file_sink.h>
 #include <spdlog/spdlog.h>
 
-#include "context.hpp"
-#include "io_util.hpp"
-#include "main_scene.hpp"
-#include "scene.hpp"
-
 static constexpr char imguiIni[] = "imgui.ini";
 static constexpr char logfile[] = "log.txt";
 
@@ -56,16 +56,22 @@ int main(int argc, char **argv) {
   ImFontConfig config;
   config.MergeMode = true;
 
-  io.Fonts->AddFontFromFileTTF("fonts/NotoSansCJKjp-Regular.otf", 20.0f,
-                               &config, io.Fonts->GetGlyphRangesJapanese());
+  ImWchar iconRangesFK[] = {ICON_MIN_FK, ICON_MAX_FK, 0};
+  io.Fonts->AddFontFromFileTTF("fonts/forkawesome-webfont.ttf", 20.0f, &config,
+                               iconRangesFK);
+  io.Fonts->AddFontFromFileTTF("fonts/NotoSansJP-Regular.ttf", 20.0f, &config,
+                               io.Fonts->GetGlyphRangesJapanese());
   io.Fonts->AddFontFromFileTTF("fonts/NotoSansThai-Regular.ttf", 20.0f, &config,
                                io.Fonts->GetGlyphRangesThai());
-  io.Fonts->AddFontFromFileTTF("fonts/NotoSansCJKkr-Regular.otf", 20.0f,
-                               &config, io.Fonts->GetGlyphRangesKorean());
+  io.Fonts->AddFontFromFileTTF("fonts/NotoSansKR-Regular.ttf", 20.0f, &config,
+                               io.Fonts->GetGlyphRangesKorean());
   io.Fonts->AddFontFromFileTTF(
-      "fonts/NotoSansCJKsc-Regular.otf", 20.0f, &config,
+      "fonts/NotoSansSC-Regular.ttf", 20.0f, &config,
       io.Fonts->GetGlyphRangesChineseSimplifiedCommon());
 
+  io.Fonts->AddFontFromFileTTF("fonts/NotoSansTC-Regular.ttf", 20.0f, &config,
+                               io.Fonts->GetGlyphRangesChineseFull());
+
   io.Fonts->Build();
 
   ImGui_ImplSDL2_InitForSDLRenderer(window, renderer);

diff --git a/src/main_scene.cpp b/src/main_scene.cpp
@@ -5,6 +5,7 @@
 #include "settings.hpp"
 #include "text_renderer.hpp"
 #include "version.hpp"
+#include <IconsForkAwesome.h>
 #include <algorithm>
 #include <array>
 #include <filesystem>
@@ -121,7 +122,7 @@ void MainScene::DoUI(Context &context) {
           ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings |
               ImGuiWindowFlags_MenuBar)) {
     if (ImGui::BeginMenuBar()) {
-      ImGui::LabelText("Font Directory", fontDirPath.c_str());
+      ImGui::LabelText(ICON_FK_FOLDER " Font Directory", fontDirPath.c_str());
       ImGui::EndMenuBar();
     }
   }
@@ -358,6 +359,10 @@ void MainScene::DoUI(Context &context) {
 
     ImGui::Text("http://github.com/wutipong/font-render-tester");
 
+    ImGui::SeparatorText("Fonts");
+    ImGui::Text("Fork Awesome");
+    ImGui::Text("Noto Sans Family");
+
     ImGui::SeparatorText("Dependencies");
 
     ImGui::Text("Dear ImGui %s", ImGui::GetVersion());
@@ -376,7 +381,7 @@ void MainScene::DoUI(Context &context) {
     ImGui::Text("UTF8-CPP");
 
     ImGui::Separator();
-    
+
     if (ImGui::Button("Close")) {
       ImGui::CloseCurrentPopup();
     }