Step 2
This commit is contained in:
@@ -16,7 +16,7 @@ namespace Display::UI::Text
|
||||
{0x1E, 0x21, 0x21, 0x1F, 0x01, 0x02, 0x1C} // 9
|
||||
};
|
||||
|
||||
void BitmapFont::drawDigit(Display::Graphics::Framebuffer &fb, int x, int y, int d, uint16_t color)
|
||||
void BitmapFont::drawDigit(Display::Graphics::Framebuffer &fb, int x, int y, int d, const Display::Graphics::Color &color)
|
||||
{
|
||||
if (d < 0 || d > 9)
|
||||
return;
|
||||
|
||||
@@ -8,6 +8,6 @@ namespace Display::UI::Text
|
||||
class BitmapFont
|
||||
{
|
||||
public:
|
||||
void drawDigit(Display::Graphics::Framebuffer &fb, int x, int y, int d, uint16_t color);
|
||||
void drawDigit(Display::Graphics::Framebuffer &fb, int x, int y, int d, const Display::Graphics::Color &color);
|
||||
};
|
||||
} // namespace Display::UI::Text
|
||||
|
||||
@@ -1,21 +1,26 @@
|
||||
message(STATUS " Configuring Text")
|
||||
message(STATUS "···Configuring Text")
|
||||
|
||||
add_library(Text
|
||||
add_library(DisplayUIText
|
||||
BitmapFont.cpp
|
||||
FontFace.cpp
|
||||
GlyphCache.cpp
|
||||
Renderer.cpp
|
||||
)
|
||||
|
||||
|
||||
add_library(Display::UI::Text ALIAS DisplayUIText)
|
||||
|
||||
find_package(Freetype REQUIRED)
|
||||
|
||||
target_link_libraries(Text
|
||||
PRIVATE Graphics ${FREETYPE_LIBRARIES}
|
||||
target_link_libraries(DisplayUIText
|
||||
PRIVATE
|
||||
Display::Graphics
|
||||
${FREETYPE_LIBRARIES}
|
||||
)
|
||||
|
||||
# include-root общий
|
||||
target_include_directories(Text
|
||||
target_include_directories(DisplayUIText
|
||||
PUBLIC
|
||||
${INCLUDE_BASE_DIR}
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user