hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support multi FontSource in the DrawText example.

Browse Source
This commit is contained in:
hyzboy 2020-08-10 18:20:34 +08:00
parent 38a365306d
commit fd25567f13
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit 46574e0f49560525442b9d46575aed58678b965a Subproject commit 73b9fc265c3ab70b47fe1def8a34b66ac6c5e090

23
example/Vulkan/DrawText.cpp
View File

@ -19,7 +19,7 @@ using namespace hgl::graph;
constexpr uint32_t SCREEN_WIDTH =1280; constexpr uint32_t SCREEN_WIDTH =1280;
constexpr uint32_t SCREEN_HEIGHT=SCREEN_WIDTH/16*9; constexpr uint32_t SCREEN_HEIGHT=SCREEN_WIDTH/16*9;
constexpr uint CHAR_BITMAP_SIZE=14; //字符尺寸 constexpr uint CHAR_BITMAP_SIZE=12; //字符尺寸
class TestApp:public VulkanApplicationFramework class TestApp:public VulkanApplicationFramework
{ {
@ -39,7 +39,9 @@ private:
private: private:
FontSource * font_source =nullptr; FontSource * eng_fs =nullptr;
FontSource * chs_fs =nullptr;
FontSourceMulti * font_source =nullptr;
TileFont * tile_font =nullptr; TileFont * tile_font =nullptr;
TextLayout tl_engine; ///<文本排版引擎 TextLayout tl_engine; ///<文本排版引擎
@ -116,9 +118,14 @@ private:
bool InitTileFont() bool InitTileFont()
{ {
Font eng_fnt(OS_TEXT("Source Code Pro"),0,CHAR_BITMAP_SIZE);
Font chs_fnt(OS_TEXT("微软雅黑"),0,CHAR_BITMAP_SIZE); Font chs_fnt(OS_TEXT("微软雅黑"),0,CHAR_BITMAP_SIZE);
font_source=AcquireFontSource(chs_fnt); eng_fs=AcquireFontSource(eng_fnt);
chs_fs=AcquireFontSource(chs_fnt);
font_source=new FontSourceMulti(eng_fs);
font_source->AddCJK(chs_fs);
tile_font=device->CreateTileFont(font_source); tile_font=device->CreateTileFont(font_source);
return(true); return(true);
@ -133,7 +140,7 @@ private:
cla.BackgroundColor=Color4f(COLOR::Black); cla.BackgroundColor=Color4f(COLOR::Black);
tla.char_layout_attr=&cla; tla.char_layout_attr=&cla;
tla.line_gap=0.2f; tla.line_gap=0.1f;
tl_engine.Set(tile_font->GetFontSource()); tl_engine.Set(tile_font->GetFontSource());
tl_engine.Set(&tla); tl_engine.Set(&tla);
@ -149,7 +156,7 @@ private:
{ {
UTF16String str; UTF16String str;
LoadStringFromTextFile(str,OS_TEXT("res/text/DaoDeBible.txt")); LoadStringFromTextFile(str,OS_TEXT("README.md"));
text_render_obj=db->CreateTextRenderable(material); text_render_obj=db->CreateTextRenderable(material);
@ -162,6 +169,9 @@ public:
{ {
if(!VulkanApplicationFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT)) if(!VulkanApplicationFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT))
return(false); return(false);
if(!InitTileFont())
return(false);
if(!InitUBO()) if(!InitUBO())
return(false); return(false);
@ -172,9 +182,6 @@ public:
if(!InitPipeline()) if(!InitPipeline())
return(false); return(false);
if(!InitTileFont())
return(false);
if(!InitTextLayoutEngine()) if(!InitTextLayoutEngine())
return(false); return(false);