From 5712efd7a5e44027c6d5a77af08dc60dde30758e Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Tue, 8 Feb 2022 11:12:17 +0800
Subject: [PATCH] Renamed to SortedSets instead of Sets.

---
 CMCore                                       | 2 +-
 inc/hgl/graph/RenderList.h                   | 4 ++--
 inc/hgl/graph/VKDescriptorSets.h             | 4 ++--
 inc/hgl/graph/VKPhysicalDevice.h             | 2 +-
 inc/hgl/graph/VKShaderModule.h               | 4 ++--
 inc/hgl/graph/VertexAttribDataAccess.h       | 2 +-
 inc/hgl/graph/font/FontSource.h              | 4 ++--
 inc/hgl/graph/font/TextLayout.h              | 2 +-
 inc/hgl/gui/Layout.h                         | 4 ++--
 src/SceneGraph/Vulkan/VKPhysicalDevice.cpp   | 2 +-
 src/SceneGraph/Vulkan/VKPipelineLayoutData.h | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CMCore b/CMCore
index 3b55f2f4..3c047a68 160000
--- a/CMCore
+++ b/CMCore
@@ -1 +1 @@
-Subproject commit 3b55f2f42b295f285fa0e4d7da8cd44e80adaf50
+Subproject commit 3c047a6803801c9f76be5774cf2ea7622751dc77
diff --git a/inc/hgl/graph/RenderList.h b/inc/hgl/graph/RenderList.h
index 6ee80e84..c4f8f75b 100644
--- a/inc/hgl/graph/RenderList.h
+++ b/inc/hgl/graph/RenderList.h
@@ -8,13 +8,13 @@
 #include<hgl/graph/VKArrayBuffer.h>
 #include<hgl/graph/SceneInfo.h>
 #include<hgl/type/Color4f.h>
-#include<hgl/type/Sets.h>
+#include<hgl/type/SortedSets.h>
 namespace hgl
 {
     namespace graph
     {
         using MVPArrayBuffer=GPUArrayBuffer<MVPMatrix>;
-        using MaterialSets=Sets<Material *>;
+        using MaterialSets=SortedSets<Material *>;
 
         /**
          * 渲染对象列表<br>
diff --git a/inc/hgl/graph/VKDescriptorSets.h b/inc/hgl/graph/VKDescriptorSets.h
index 1112ac02..d3a39780 100644
--- a/inc/hgl/graph/VKDescriptorSets.h
+++ b/inc/hgl/graph/VKDescriptorSets.h
@@ -3,7 +3,7 @@
 
 #include<hgl/graph/VK.h>
 #include<hgl/type/Map.h>
-#include<hgl/type/Sets.h>
+#include<hgl/type/SortedSets.h>
 VK_NAMESPACE_BEGIN
 class GPUBuffer;
 
@@ -19,7 +19,7 @@ class DescriptorSets
     ObjectList<VkDescriptorImageInfo> image_list;
     List<VkWriteDescriptorSet> wds_list;
 
-    Sets<uint32_t> binded_sets;
+    SortedSets<uint32_t> binded_sets;
 
     bool is_dirty;
 
diff --git a/inc/hgl/graph/VKPhysicalDevice.h b/inc/hgl/graph/VKPhysicalDevice.h
index c2629c50..7b1c3206 100644
--- a/inc/hgl/graph/VKPhysicalDevice.h
+++ b/inc/hgl/graph/VKPhysicalDevice.h
@@ -2,7 +2,7 @@
 
 #include<hgl/graph/VK.h>
 #include<hgl/type/String.h>
-#include<hgl/type/Sets.h>
+#include<hgl/type/SortedSets.h>
 
 VK_NAMESPACE_BEGIN
 class GPUPhysicalDevice
diff --git a/inc/hgl/graph/VKShaderModule.h b/inc/hgl/graph/VKShaderModule.h
index b74e29d4..f0dd8087 100644
--- a/inc/hgl/graph/VKShaderModule.h
+++ b/inc/hgl/graph/VKShaderModule.h
@@ -2,7 +2,7 @@
 #define HGL_GRAPH_VULKAN_SHADER_MODULE_INCLUDE
 
 #include<hgl/graph/VKShaderResource.h>
-#include<hgl/type/Sets.h>
+#include<hgl/type/SortedSets.h>
 
 VK_NAMESPACE_BEGIN
 
@@ -60,7 +60,7 @@ class VertexShaderModule:public ShaderModule
 
 private:
     
-    Sets<VAB *> vab_sets;
+    SortedSets<VAB *> vab_sets;
 
 public:
 
diff --git a/inc/hgl/graph/VertexAttribDataAccess.h b/inc/hgl/graph/VertexAttribDataAccess.h
index f1985e65..c011f3cd 100644
--- a/inc/hgl/graph/VertexAttribDataAccess.h
+++ b/inc/hgl/graph/VertexAttribDataAccess.h
@@ -44,7 +44,7 @@ namespace hgl
 
             virtual ~VertexAttribDataAccess()=default;
 
-            void GPUBufferData(const T *ptr)
+            void Write(const T *ptr)
             {
                 if(!ptr)return;
 
diff --git a/inc/hgl/graph/font/FontSource.h b/inc/hgl/graph/font/FontSource.h
index 51d8b1dc..771e7f36 100644
--- a/inc/hgl/graph/font/FontSource.h
+++ b/inc/hgl/graph/font/FontSource.h
@@ -3,7 +3,7 @@
 
 #include<hgl/type/StrChar.h>
 #include<hgl/type/Map.h>
-#include<hgl/type/Sets.h>
+#include<hgl/type/SortedSets.h>
 #include<hgl/graph/font/Font.h>
 #include<hgl/type/UnicodeBlocks.h>
 
@@ -70,7 +70,7 @@ namespace hgl
         {
         protected:
 
-            Sets<void *> ref_object;
+            SortedSets<void *> ref_object;
 
             MapObject<u32char,CLA> cla_cache;
 
diff --git a/inc/hgl/graph/font/TextLayout.h b/inc/hgl/graph/font/TextLayout.h
index 6e1aabaa..a56f4995 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;                       ///<要绘制字符列表
 
-            Sets<u32char> alone_chars;                   ///<不重复字符统计缓冲区
+            SortedSets<u32char> alone_chars;                   ///<不重复字符统计缓冲区
             TileUVFloatMap alone_chars_uv;              ///<所有要绘制字符的uv
 
             struct CharDrawAttr
diff --git a/inc/hgl/gui/Layout.h b/inc/hgl/gui/Layout.h
index bad9a50f..57e3deeb 100644
--- a/inc/hgl/gui/Layout.h
+++ b/inc/hgl/gui/Layout.h
@@ -2,7 +2,7 @@
 #define HGL_GUI_LAYOUT_INCLUDE
 
 #include<hgl/gui/Widget.h>
-#include<hgl/type/Sets.h>
+#include<hgl/type/SortedSets.h>
 namespace hgl
 {
     namespace gui
@@ -14,7 +14,7 @@ namespace hgl
         {
         protected:
 
-            Sets<Widget *> widgets_set;
+            SortedSets<Widget *> widgets_set;
 
         public:
 
diff --git a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp
index 7360f90e..c39c3d99 100644
--- a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp
+++ b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp
@@ -198,7 +198,7 @@ const bool GPUPhysicalDevice::CheckExtensionSupport(const AnsiString &name)const
 const int GPUPhysicalDevice::GetMemoryType(uint32_t typeBits,VkMemoryPropertyFlags properties)const
 {
     // Search memtypes to find first index with those properties
-    for(int i=0; i<memory_properties.memoryTypeCount; i++)
+    for(uint32_t i=0; i<memory_properties.memoryTypeCount; i++)
     {
         if(typeBits&1)  // Type is available, does it match user properties?
             if((memory_properties.memoryTypes[i].propertyFlags&properties)==properties)
diff --git a/src/SceneGraph/Vulkan/VKPipelineLayoutData.h b/src/SceneGraph/Vulkan/VKPipelineLayoutData.h
index 720ad7d9..957ca441 100644
--- a/src/SceneGraph/Vulkan/VKPipelineLayoutData.h
+++ b/src/SceneGraph/Vulkan/VKPipelineLayoutData.h
@@ -3,7 +3,7 @@
 #include<hgl/graph/VK.h>
 #include<hgl/graph/VKShaderResource.h>
 #include<hgl/type/Map.h>
-#include<hgl/type/Sets.h>
+#include<hgl/type/SortedSets.h>
 VK_NAMESPACE_BEGIN
 struct PipelineLayoutData
 {