lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move fonts code to a separate library

Browse source
This commit is contained in:
Nikita Lisitsa 2023-04-18 15:28:52 +03:00
parent b21332b9a4
commit 53bfbb0cd0
12 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/fonts/CMakeLists.txt Normal file
View file

@ -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)

2
libs/ui_legacy/include/psemek/ui/bmfont.hpp → libs/fonts/include/psemek/fonts/bmfont.hpp
View file

@ -6,7 +6,7 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
namespace psemek::ui namespace psemek::fonts
{ {
struct bmfont_data struct bmfont_data

2
libs/ui_legacy/include/psemek/ui/font.hpp → libs/fonts/include/psemek/fonts/font.hpp
View file

@ -11,7 +11,7 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
namespace psemek::ui namespace psemek::fonts
{ {
enum class font_type enum class font_type

6
libs/ui_legacy/include/psemek/ui/kerned_font.hpp → libs/fonts/include/psemek/fonts/kerned_font.hpp
View file

@ -1,11 +1,11 @@
#pragma once #pragma once
#include <psemek/ui/font.hpp> #include <psemek/fonts/font.hpp>
#include <psemek/ui/bmfont.hpp> #include <psemek/fonts/bmfont.hpp>
#include <unordered_map> #include <unordered_map>
namespace psemek::ui namespace psemek::fonts
{ {
struct kerned_font struct kerned_font

4
libs/ui_legacy/include/psemek/ui/monospace_font.hpp → libs/fonts/include/psemek/fonts/monospace_font.hpp
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
#include <psemek/ui/font.hpp> #include <psemek/fonts/font.hpp>
namespace psemek::ui namespace psemek::fonts
{ {
struct monospace_font struct monospace_font

6
libs/ui_legacy/include/psemek/ui/msdf_font.hpp → libs/fonts/include/psemek/fonts/msdf_font.hpp
View file

@ -1,11 +1,11 @@
#pragma once #pragma once
#include <psemek/ui/font.hpp> #include <psemek/fonts/font.hpp>
#include <psemek/ui/kerned_font.hpp> #include <psemek/fonts/kerned_font.hpp>
#include <unordered_map> #include <unordered_map>
namespace psemek::ui namespace psemek::fonts
{ {
struct msdf_font struct msdf_font

0
libs/ui_legacy/resources/font_10x12_bold_glyphs.txt → libs/fonts/resources/font_10x12_bold_glyphs.txt
View file

0
libs/ui_legacy/resources/font_9x12_glyphs.txt → libs/fonts/resources/font_9x12_glyphs.txt
View file

4
libs/ui_legacy/source/bmfont.cpp → libs/fonts/source/bmfont.cpp
View file

@ -1,4 +1,4 @@
#include <psemek/ui/bmfont.hpp> #include <psemek/fonts/bmfont.hpp>
#include <psemek/util/to_string.hpp> #include <psemek/util/to_string.hpp>
#include <boost/preprocessor/stringize.hpp> #include <boost/preprocessor/stringize.hpp>
@ -9,7 +9,7 @@
#include <rapidjson/document.h> #include <rapidjson/document.h>
#include <rapidjson/istreamwrapper.h> #include <rapidjson/istreamwrapper.h>
namespace psemek::ui namespace psemek::fonts
{ {
namespace namespace

4
libs/ui_legacy/source/kerned_font.cpp → libs/fonts/source/kerned_font.cpp
View file

@ -1,8 +1,8 @@
#include <psemek/ui/kerned_font.hpp> #include <psemek/fonts/kerned_font.hpp>
#include <psemek/util/unicode.hpp> #include <psemek/util/unicode.hpp>
namespace psemek::ui namespace psemek::fonts
{ {
kerned_font::kerned_font(bmfont_data data, gfx::texture_2d atlas) kerned_font::kerned_font(bmfont_data data, gfx::texture_2d atlas)

4
libs/ui_legacy/source/monospace_font.cpp → libs/fonts/source/monospace_font.cpp
View file

@ -1,8 +1,8 @@
#include <psemek/ui/monospace_font.hpp> #include <psemek/fonts/monospace_font.hpp>
#include <psemek/util/unicode.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) 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)

4
libs/ui_legacy/source/msdf_font.cpp → libs/fonts/source/msdf_font.cpp
View file

@ -1,7 +1,7 @@
#include <psemek/ui/msdf_font.hpp> #include <psemek/fonts/msdf_font.hpp>
#include <psemek/gfx/pixmap.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) std::unique_ptr<font> make_msdf_font(io::istream && description, io::istream && texture)