From 62d370e508870f5860a099c738446e9b39e23d1c Mon Sep 17 00:00:00 2001 From: hyzboy Date: Mon, 18 Nov 2024 13:19:11 +0800 Subject: [PATCH] renamed to SortedSet from SortedSets --- inc/hgl/graph/RenderNode.h | 4 ++-- inc/hgl/graph/VKDescriptorSet.h | 4 ++-- inc/hgl/graph/VKMaterial.h | 2 +- inc/hgl/graph/VKPhysicalDevice.h | 2 +- inc/hgl/graph/VKShaderModule.h | 2 +- inc/hgl/graph/font/FontSource.h | 4 ++-- inc/hgl/graph/font/TextLayout.h | 4 ++-- inc/hgl/graph/font/TextPrimitive.h | 6 +++--- inc/hgl/graph/font/TextRender.h | 2 +- inc/hgl/graph/font/TileFont.h | 4 ++-- inc/hgl/gui/Layout.h | 4 ++-- src/SceneGraph/Vulkan/VKPipelineLayoutData.h | 2 +- src/SceneGraph/font/TileFont.cpp | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/inc/hgl/graph/RenderNode.h b/inc/hgl/graph/RenderNode.h index 41a42dcc..1ee2ffe3 100644 --- a/inc/hgl/graph/RenderNode.h +++ b/inc/hgl/graph/RenderNode.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_RENDER_NODE_INCLUDE #include -#include +#include namespace hgl { namespace graph @@ -27,7 +27,7 @@ namespace hgl using RenderNodeList=List; using RenderNodePointerList=List; - using MaterialInstanceSets=SortedSets; ///<材质实例集合 + using MaterialInstanceSets=SortedSet; ///<材质实例集合 }//namespace graph }//namespace hgl #endif//HGL_GRAPH_RENDER_NODE_INCLUDE diff --git a/inc/hgl/graph/VKDescriptorSet.h b/inc/hgl/graph/VKDescriptorSet.h index 476bd8b2..af103422 100644 --- a/inc/hgl/graph/VKDescriptorSet.h +++ b/inc/hgl/graph/VKDescriptorSet.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include VK_NAMESPACE_BEGIN class DeviceBuffer; @@ -20,7 +20,7 @@ class DescriptorSet ObjectList image_list; List wds_list; - SortedSets binded_sets; + SortedSet binded_sets; bool is_dirty; diff --git a/inc/hgl/graph/VKMaterial.h b/inc/hgl/graph/VKMaterial.h index b22ce3fb..31b74d59 100644 --- a/inc/hgl/graph/VKMaterial.h +++ b/inc/hgl/graph/VKMaterial.h @@ -95,6 +95,6 @@ public: MaterialInstance *CreateMI(const VILConfig *vil_cfg=nullptr); };//class Material -using MaterialSets=SortedSets; +using MaterialSets=SortedSet; VK_NAMESPACE_END #endif//HGL_GRAPH_VULKAN_MATERIAL_INCLUDE diff --git a/inc/hgl/graph/VKPhysicalDevice.h b/inc/hgl/graph/VKPhysicalDevice.h index febaaf7c..71b8095c 100644 --- a/inc/hgl/graph/VKPhysicalDevice.h +++ b/inc/hgl/graph/VKPhysicalDevice.h @@ -2,7 +2,7 @@ #include #include -#include +#include VK_NAMESPACE_BEGIN class GPUPhysicalDevice diff --git a/inc/hgl/graph/VKShaderModule.h b/inc/hgl/graph/VKShaderModule.h index d948cf0d..40a50eff 100644 --- a/inc/hgl/graph/VKShaderModule.h +++ b/inc/hgl/graph/VKShaderModule.h @@ -3,7 +3,7 @@ #include #include -#include +#include VK_NAMESPACE_BEGIN diff --git a/inc/hgl/graph/font/FontSource.h b/inc/hgl/graph/font/FontSource.h index f8d2ac01..cc5a64fe 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 @@ -71,7 +71,7 @@ namespace hgl { protected: - SortedSets ref_object; + SortedSet ref_object; ObjectMap cla_cache; diff --git a/inc/hgl/graph/font/TextLayout.h b/inc/hgl/graph/font/TextLayout.h index 6796f1f5..0f417b0b 100644 --- a/inc/hgl/graph/font/TextLayout.h +++ b/inc/hgl/graph/font/TextLayout.h @@ -100,8 +100,8 @@ namespace hgl int draw_chars_count; ///<要绘制字符列表 - SortedSets chars_sets; ///<不重复字符统计缓冲区 - SortedSets clear_chars_sets; ///<待清除的字符合集 + SortedSet chars_sets; ///<不重复字符统计缓冲区 + SortedSet clear_chars_sets; ///<待清除的字符合集 TileUVFloatMap chars_uv; ///<所有要绘制字符的uv struct CharDrawAttr diff --git a/inc/hgl/graph/font/TextPrimitive.h b/inc/hgl/graph/font/TextPrimitive.h index 7bad2791..38faceec 100644 --- a/inc/hgl/graph/font/TextPrimitive.h +++ b/inc/hgl/graph/font/TextPrimitive.h @@ -24,10 +24,10 @@ namespace hgl friend class TextLayout; friend class TextRender; - SortedSets chars_sets; + SortedSet chars_sets; - const SortedSets &GetCharsSets()const{return chars_sets;} - void SetCharsSets(const SortedSets &sl){chars_sets=sl;} + const SortedSet &GetCharsSets()const{return chars_sets;} + void SetCharsSets(const SortedSet &sl){chars_sets=sl;} void ClearCharsSets(){chars_sets.Clear();} private: diff --git a/inc/hgl/graph/font/TextRender.h b/inc/hgl/graph/font/TextRender.h index 932bd522..3675b95d 100644 --- a/inc/hgl/graph/font/TextRender.h +++ b/inc/hgl/graph/font/TextRender.h @@ -33,7 +33,7 @@ namespace hgl Color4f color; DeviceBuffer * ubo_color; - SortedSets tr_sets; + SortedSet tr_sets; private: diff --git a/inc/hgl/graph/font/TileFont.h b/inc/hgl/graph/font/TileFont.h index 74e31ab5..16fe46e5 100644 --- a/inc/hgl/graph/font/TileFont.h +++ b/inc/hgl/graph/font/TileFont.h @@ -24,7 +24,7 @@ namespace hgl TileResPool to_res; - SortedSets not_bitmap_chars; + SortedSet not_bitmap_chars; public: @@ -37,7 +37,7 @@ namespace hgl TileFont(TileData *td,FontSource *fs); virtual ~TileFont(); - bool Registry(TileUVFloatMap &,SortedSets &chars_sets); ///<注册要使用的字符 + bool Registry(TileUVFloatMap &,SortedSet &chars_sets); ///<注册要使用的字符 void Unregistry(const List &); ///<注销要使用的字符 };//class TileFont }//namespace graph diff --git a/inc/hgl/gui/Layout.h b/inc/hgl/gui/Layout.h index 57e3deeb..f3d22940 100644 --- a/inc/hgl/gui/Layout.h +++ b/inc/hgl/gui/Layout.h @@ -2,7 +2,7 @@ #define HGL_GUI_LAYOUT_INCLUDE #include -#include +#include namespace hgl { namespace gui @@ -14,7 +14,7 @@ namespace hgl { protected: - SortedSets widgets_set; + SortedSet widgets_set; public: diff --git a/src/SceneGraph/Vulkan/VKPipelineLayoutData.h b/src/SceneGraph/Vulkan/VKPipelineLayoutData.h index b2310dbc..efecdd98 100644 --- a/src/SceneGraph/Vulkan/VKPipelineLayoutData.h +++ b/src/SceneGraph/Vulkan/VKPipelineLayoutData.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include VK_NAMESPACE_BEGIN struct PipelineLayoutData { diff --git a/src/SceneGraph/font/TileFont.cpp b/src/SceneGraph/font/TileFont.cpp index 002a6494..29f411ea 100644 --- a/src/SceneGraph/font/TileFont.cpp +++ b/src/SceneGraph/font/TileFont.cpp @@ -30,7 +30,7 @@ namespace hgl * @param rs 每个字符在纹理中的UV坐标 * @param chars_sets 要注册的字符合集 */ - bool TileFont::Registry(TileUVFloatMap &uv_map,SortedSets &chars_sets) + bool TileFont::Registry(TileUVFloatMap &uv_map,SortedSet &chars_sets) { ResPoolStats stats;