diff --git a/CMCore b/CMCore index 25a26059..2ec8168b 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 25a2605932f72286333d83a4e10e490107b0f6fd +Subproject commit 2ec8168b16c709342320b4f7db0782ca2288edb0 diff --git a/inc/hgl/graph/font/FontSource.h b/inc/hgl/graph/font/FontSource.h index b19d5d4f..51d8b1dc 100644 --- a/inc/hgl/graph/font/FontSource.h +++ b/inc/hgl/graph/font/FontSource.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include @@ -70,7 +70,7 @@ namespace hgl { protected: - Set ref_object; + Sets ref_object; MapObject cla_cache; diff --git a/inc/hgl/graph/font/TextLayout.h b/inc/hgl/graph/font/TextLayout.h index c1d40d2a..3bb4bba0 100644 --- a/inc/hgl/graph/font/TextLayout.h +++ b/inc/hgl/graph/font/TextLayout.h @@ -99,7 +99,7 @@ namespace hgl int draw_chars_count; ///<要绘制字符列表 - Set alone_chars; ///<不重复字符统计缓冲区 + Sets alone_chars; ///<不重复字符统计缓冲区 TileUVFloatMap alone_chars_uv; ///<所有要绘制字符的uv struct CharDrawAttr diff --git a/inc/hgl/graph/vulkan/VKPhysicalDevice.h b/inc/hgl/graph/vulkan/VKPhysicalDevice.h index 77e3b080..4a452dc7 100644 --- a/inc/hgl/graph/vulkan/VKPhysicalDevice.h +++ b/inc/hgl/graph/vulkan/VKPhysicalDevice.h @@ -2,7 +2,7 @@ #include #include -#include +#include VK_NAMESPACE_BEGIN class PhysicalDevice diff --git a/inc/hgl/graph/vulkan/VKShaderModule.h b/inc/hgl/graph/vulkan/VKShaderModule.h index 1f3f899a..15dc8804 100644 --- a/inc/hgl/graph/vulkan/VKShaderModule.h +++ b/inc/hgl/graph/vulkan/VKShaderModule.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_VULKAN_SHADER_MODULE_INCLUDE #include -#include +#include VK_NAMESPACE_BEGIN @@ -68,7 +68,7 @@ class VertexShaderModule:public ShaderModule private: - Set vab_sets; + Sets vab_sets; public: