From 346d8b3279c414ec3b5c3be3798119e2195e7776 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 4 Aug 2020 00:08:21 +0800 Subject: [PATCH] fix TileFont::Registry function --- CMCMakeModule | 2 +- src/SceneGraph/font/TileFont.cpp | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CMCMakeModule b/CMCMakeModule index 7eb1cafe..b2676f3e 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit 7eb1cafe575cc305a9d09fce66494a5445da5305 +Subproject commit b2676f3e15b059069611a20a4b998b2387dbe9c2 diff --git a/src/SceneGraph/font/TileFont.cpp b/src/SceneGraph/font/TileFont.cpp index e484f689..7a1bd112 100644 --- a/src/SceneGraph/font/TileFont.cpp +++ b/src/SceneGraph/font/TileFont.cpp @@ -35,8 +35,6 @@ namespace hgl const u32char *cp=ch_list; TileObject *to; - List new_chars; - int in_active_count; //在活跃列表中的数量 int in_idle_count; //在闲置列表中的数量 int out_count; //不存在的字符数量 @@ -52,7 +50,7 @@ namespace hgl FontBitmap *bmp; cp=ch_list; - if(new_chars.GetCount()) + if(out_count>0) { tile_data->BeginCommit(); for(uint i=0;iuv_float; - ++tp; + uv_map.Add(*cp,to->uv_float); + ++cp; } }