From 53bfbb0cd0c2578075b2037eb107823eecdce5b7 Mon Sep 17 00:00:00 2001
From: lisyarus <lisyarus@gmail.com>
Date: Tue, 18 Apr 2023 15:28:52 +0300
Subject: [PATCH] Move fonts code to a separate library

---
 libs/fonts/CMakeLists.txt                                 | 8 ++++++++
 .../psemek/ui => fonts/include/psemek/fonts}/bmfont.hpp   | 2 +-
 .../psemek/ui => fonts/include/psemek/fonts}/font.hpp     | 2 +-
 .../ui => fonts/include/psemek/fonts}/kerned_font.hpp     | 6 +++---
 .../ui => fonts/include/psemek/fonts}/monospace_font.hpp  | 4 ++--
 .../ui => fonts/include/psemek/fonts}/msdf_font.hpp       | 6 +++---
 .../resources/font_10x12_bold_glyphs.txt                  | 0
 libs/{ui_legacy => fonts}/resources/font_9x12_glyphs.txt  | 0
 libs/{ui_legacy => fonts}/source/bmfont.cpp               | 4 ++--
 libs/{ui_legacy => fonts}/source/kerned_font.cpp          | 4 ++--
 libs/{ui_legacy => fonts}/source/monospace_font.cpp       | 4 ++--
 libs/{ui_legacy => fonts}/source/msdf_font.cpp            | 4 ++--
 12 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 libs/fonts/CMakeLists.txt
 rename libs/{ui_legacy/include/psemek/ui => fonts/include/psemek/fonts}/bmfont.hpp (95%)
 rename libs/{ui_legacy/include/psemek/ui => fonts/include/psemek/fonts}/font.hpp (98%)
 rename libs/{ui_legacy/include/psemek/ui => fonts/include/psemek/fonts}/kerned_font.hpp (92%)
 rename libs/{ui_legacy/include/psemek/ui => fonts/include/psemek/fonts}/monospace_font.hpp (95%)
 rename libs/{ui_legacy/include/psemek/ui => fonts/include/psemek/fonts}/msdf_font.hpp (73%)
 rename libs/{ui_legacy => fonts}/resources/font_10x12_bold_glyphs.txt (100%)
 rename libs/{ui_legacy => fonts}/resources/font_9x12_glyphs.txt (100%)
 rename libs/{ui_legacy => fonts}/source/bmfont.cpp (98%)
 rename libs/{ui_legacy => fonts}/source/kerned_font.cpp (98%)
 rename libs/{ui_legacy => fonts}/source/monospace_font.cpp (97%)
 rename libs/{ui_legacy => fonts}/source/msdf_font.cpp (90%)

diff --git a/libs/fonts/CMakeLists.txt b/libs/fonts/CMakeLists.txt
new file mode 100644
index 00000000..13d861e6
--- /dev/null
+++ b/libs/fonts/CMakeLists.txt
@@ -0,0 +1,8 @@
+file(GLOB_RECURSE PSEMEK_FONTS_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "include/*.hpp")
+file(GLOB_RECURSE PSEMEK_FONTS_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "source/*.cpp")
+
+psemek_add_library(psemek-fonts ${PSEMEK_FONTS_HEADERS} ${PSEMEK_FONTS_SOURCES})
+target_include_directories(psemek-fonts PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
+target_link_libraries(psemek-fonts PUBLIC psemek-util psemek-geom psemek-gfx rapidjson)
+
+psemek_glob_resources(psemek-fonts resources psemek/fonts/resources)
diff --git a/libs/ui_legacy/include/psemek/ui/bmfont.hpp b/libs/fonts/include/psemek/fonts/bmfont.hpp
similarity index 95%
rename from libs/ui_legacy/include/psemek/ui/bmfont.hpp
rename to libs/fonts/include/psemek/fonts/bmfont.hpp
index 51058de1..8ab035f9 100644
--- a/libs/ui_legacy/include/psemek/ui/bmfont.hpp
+++ b/libs/fonts/include/psemek/fonts/bmfont.hpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <unordered_map>
 
-namespace psemek::ui
+namespace psemek::fonts
 {
 
 	struct bmfont_data
diff --git a/libs/ui_legacy/include/psemek/ui/font.hpp b/libs/fonts/include/psemek/fonts/font.hpp
similarity index 98%
rename from libs/ui_legacy/include/psemek/ui/font.hpp
rename to libs/fonts/include/psemek/fonts/font.hpp
index d323ea96..2ed728a9 100644
--- a/libs/ui_legacy/include/psemek/ui/font.hpp
+++ b/libs/fonts/include/psemek/fonts/font.hpp
@@ -11,7 +11,7 @@
 #include <vector>
 #include <memory>
 
-namespace psemek::ui
+namespace psemek::fonts
 {
 
 	enum class font_type
diff --git a/libs/ui_legacy/include/psemek/ui/kerned_font.hpp b/libs/fonts/include/psemek/fonts/kerned_font.hpp
similarity index 92%
rename from libs/ui_legacy/include/psemek/ui/kerned_font.hpp
rename to libs/fonts/include/psemek/fonts/kerned_font.hpp
index f834a803..305cc674 100644
--- a/libs/ui_legacy/include/psemek/ui/kerned_font.hpp
+++ b/libs/fonts/include/psemek/fonts/kerned_font.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <psemek/ui/font.hpp>
-#include <psemek/ui/bmfont.hpp>
+#include <psemek/fonts/font.hpp>
+#include <psemek/fonts/bmfont.hpp>
 
 #include <unordered_map>
 
-namespace psemek::ui
+namespace psemek::fonts
 {
 
 	struct kerned_font
diff --git a/libs/ui_legacy/include/psemek/ui/monospace_font.hpp b/libs/fonts/include/psemek/fonts/monospace_font.hpp
similarity index 95%
rename from libs/ui_legacy/include/psemek/ui/monospace_font.hpp
rename to libs/fonts/include/psemek/fonts/monospace_font.hpp
index 1bd07d1e..6fba3279 100644
--- a/libs/ui_legacy/include/psemek/ui/monospace_font.hpp
+++ b/libs/fonts/include/psemek/fonts/monospace_font.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <psemek/ui/font.hpp>
+#include <psemek/fonts/font.hpp>
 
-namespace psemek::ui
+namespace psemek::fonts
 {
 
 	struct monospace_font
diff --git a/libs/ui_legacy/include/psemek/ui/msdf_font.hpp b/libs/fonts/include/psemek/fonts/msdf_font.hpp
similarity index 73%
rename from libs/ui_legacy/include/psemek/ui/msdf_font.hpp
rename to libs/fonts/include/psemek/fonts/msdf_font.hpp
index a36f9e6a..27de94e9 100644
--- a/libs/ui_legacy/include/psemek/ui/msdf_font.hpp
+++ b/libs/fonts/include/psemek/fonts/msdf_font.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <psemek/ui/font.hpp>
-#include <psemek/ui/kerned_font.hpp>
+#include <psemek/fonts/font.hpp>
+#include <psemek/fonts/kerned_font.hpp>
 
 #include <unordered_map>
 
-namespace psemek::ui
+namespace psemek::fonts
 {
 
 	struct msdf_font
diff --git a/libs/ui_legacy/resources/font_10x12_bold_glyphs.txt b/libs/fonts/resources/font_10x12_bold_glyphs.txt
similarity index 100%
rename from libs/ui_legacy/resources/font_10x12_bold_glyphs.txt
rename to libs/fonts/resources/font_10x12_bold_glyphs.txt
diff --git a/libs/ui_legacy/resources/font_9x12_glyphs.txt b/libs/fonts/resources/font_9x12_glyphs.txt
similarity index 100%
rename from libs/ui_legacy/resources/font_9x12_glyphs.txt
rename to libs/fonts/resources/font_9x12_glyphs.txt
diff --git a/libs/ui_legacy/source/bmfont.cpp b/libs/fonts/source/bmfont.cpp
similarity index 98%
rename from libs/ui_legacy/source/bmfont.cpp
rename to libs/fonts/source/bmfont.cpp
index a48248a3..113fcb07 100644
--- a/libs/ui_legacy/source/bmfont.cpp
+++ b/libs/fonts/source/bmfont.cpp
@@ -1,4 +1,4 @@
-#include <psemek/ui/bmfont.hpp>
+#include <psemek/fonts/bmfont.hpp>
 #include <psemek/util/to_string.hpp>
 
 #include <boost/preprocessor/stringize.hpp>
@@ -9,7 +9,7 @@
 #include <rapidjson/document.h>
 #include <rapidjson/istreamwrapper.h>
 
-namespace psemek::ui
+namespace psemek::fonts
 {
 
 	namespace
diff --git a/libs/ui_legacy/source/kerned_font.cpp b/libs/fonts/source/kerned_font.cpp
similarity index 98%
rename from libs/ui_legacy/source/kerned_font.cpp
rename to libs/fonts/source/kerned_font.cpp
index d685b0d4..8ac1bab0 100644
--- a/libs/ui_legacy/source/kerned_font.cpp
+++ b/libs/fonts/source/kerned_font.cpp
@@ -1,8 +1,8 @@
-#include <psemek/ui/kerned_font.hpp>
+#include <psemek/fonts/kerned_font.hpp>
 
 #include <psemek/util/unicode.hpp>
 
-namespace psemek::ui
+namespace psemek::fonts
 {
 
 	kerned_font::kerned_font(bmfont_data data, gfx::texture_2d atlas)
diff --git a/libs/ui_legacy/source/monospace_font.cpp b/libs/fonts/source/monospace_font.cpp
similarity index 97%
rename from libs/ui_legacy/source/monospace_font.cpp
rename to libs/fonts/source/monospace_font.cpp
index 1cace335..6ffee890 100644
--- a/libs/ui_legacy/source/monospace_font.cpp
+++ b/libs/fonts/source/monospace_font.cpp
@@ -1,8 +1,8 @@
-#include <psemek/ui/monospace_font.hpp>
+#include <psemek/fonts/monospace_font.hpp>
 
 #include <psemek/util/unicode.hpp>
 
-namespace psemek::ui
+namespace psemek::fonts
 {
 
 	monospace_font::monospace_font(character_range range, std::string_view name, geom::vector<int, 2> size, gfx::texture_2d atlas, std::vector<geom::box<float, 2>> texcoords)
diff --git a/libs/ui_legacy/source/msdf_font.cpp b/libs/fonts/source/msdf_font.cpp
similarity index 90%
rename from libs/ui_legacy/source/msdf_font.cpp
rename to libs/fonts/source/msdf_font.cpp
index 793095bf..7c125a4b 100644
--- a/libs/ui_legacy/source/msdf_font.cpp
+++ b/libs/fonts/source/msdf_font.cpp
@@ -1,7 +1,7 @@
-#include <psemek/ui/msdf_font.hpp>
+#include <psemek/fonts/msdf_font.hpp>
 #include <psemek/gfx/pixmap.hpp>
 
-namespace psemek::ui
+namespace psemek::fonts
 {
 
 	std::unique_ptr<font> make_msdf_font(io::istream && description, io::istream && texture)