Merge branch 'devel_36_PickGizmo' of http://www.hyzgame.com:3000/hyzboy/ULRE into devel_36_PickGizmo

This commit is contained in:
hyzboy 2024-11-21 01:30:50 +08:00
commit d810540b81
3 changed files with 4 additions and 4 deletions

View File

@ -100,8 +100,8 @@ namespace hgl
int draw_chars_count; ///<要绘制字符列表
SortedSets<u32char> chars_sets; ///<不重复字符统计缓冲区
SortedSets<u32char> clear_chars_sets; ///<待清除的字符合集
SortedSet<u32char> chars_sets; ///<不重复字符统计缓冲区
SortedSet<u32char> clear_chars_sets; ///<待清除的字符合集
TileUVFloatMap chars_uv; ///<所有要绘制字符的uv
struct CharDrawAttr

View File

@ -33,7 +33,7 @@ namespace hgl
Color4f color;
DeviceBuffer * ubo_color;
SortedSets<TextPrimitive *> tr_sets;
SortedSet<TextPrimitive *> tr_sets;
private:

View File

@ -30,7 +30,7 @@ namespace hgl
* @param rs UV坐标
* @param chars_sets
*/
bool TileFont::Registry(TileUVFloatMap &uv_map,SortedSets<u32char> &chars_sets)
bool TileFont::Registry(TileUVFloatMap &uv_map,SortedSet<u32char> &chars_sets)
{
ResPoolStats stats;