hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed to SortedSet from SortedSets

Browse Source
This commit is contained in:
hyzboy 2024-11-18 13:19:11 +08:00
parent 2c67990daa
commit 62d370e508
13 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/hgl/graph/RenderNode.h
View File

@ -2,7 +2,7 @@
#define HGL_GRAPH_RENDER_NODE_INCLUDE #define HGL_GRAPH_RENDER_NODE_INCLUDE
#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
#include<hgl/type/SortedSets.h> #include<hgl/type/SortedSet.h>
namespace hgl namespace hgl
{ {
namespace graph namespace graph
@ -27,7 +27,7 @@ namespace hgl
using RenderNodeList=List<RenderNode>; using RenderNodeList=List<RenderNode>;
using RenderNodePointerList=List<RenderNode *>; using RenderNodePointerList=List<RenderNode *>;
using MaterialInstanceSets=SortedSets<MaterialInstance *>; ///<材质实例集合 using MaterialInstanceSets=SortedSet<MaterialInstance *>; ///<材质实例集合
}//namespace graph }//namespace graph
}//namespace hgl }//namespace hgl
#endif//HGL_GRAPH_RENDER_NODE_INCLUDE #endif//HGL_GRAPH_RENDER_NODE_INCLUDE

4
inc/hgl/graph/VKDescriptorSet.h
View File

@ -4,7 +4,7 @@
#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
#include<hgl/type/Map.h> #include<hgl/type/Map.h>
#include<hgl/type/ObjectList.h> #include<hgl/type/ObjectList.h>
#include<hgl/type/SortedSets.h> #include<hgl/type/SortedSet.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
class DeviceBuffer; class DeviceBuffer;
@ -20,7 +20,7 @@ class DescriptorSet
ObjectList<VkDescriptorImageInfo> image_list; ObjectList<VkDescriptorImageInfo> image_list;
List<VkWriteDescriptorSet> wds_list; List<VkWriteDescriptorSet> wds_list;
SortedSets<uint32_t> binded_sets; SortedSet<uint32_t> binded_sets;
bool is_dirty; bool is_dirty;

2
inc/hgl/graph/VKMaterial.h
View File

@ -95,6 +95,6 @@ public:
MaterialInstance *CreateMI(const VILConfig *vil_cfg=nullptr); MaterialInstance *CreateMI(const VILConfig *vil_cfg=nullptr);
};//class Material };//class Material
using MaterialSets=SortedSets<Material *>; using MaterialSets=SortedSet<Material *>;
VK_NAMESPACE_END VK_NAMESPACE_END
#endif//HGL_GRAPH_VULKAN_MATERIAL_INCLUDE #endif//HGL_GRAPH_VULKAN_MATERIAL_INCLUDE

2
inc/hgl/graph/VKPhysicalDevice.h
View File

@ -2,7 +2,7 @@
#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
#include<hgl/type/String.h> #include<hgl/type/String.h>
#include<hgl/type/SortedSets.h> #include<hgl/type/SortedSet.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
class GPUPhysicalDevice class GPUPhysicalDevice

2
inc/hgl/graph/VKShaderModule.h
View File

@ -3,7 +3,7 @@
#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
#include<hgl/graph/VKVertexInputLayout.h> #include<hgl/graph/VKVertexInputLayout.h>
#include<hgl/type/SortedSets.h> #include<hgl/type/SortedSet.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN

4
inc/hgl/graph/font/FontSource.h
View File

@ -3,7 +3,7 @@
#include<hgl/type/StrChar.h> #include<hgl/type/StrChar.h>
#include<hgl/type/Map.h> #include<hgl/type/Map.h>
#include<hgl/type/SortedSets.h> #include<hgl/type/SortedSet.h>
#include<hgl/graph/font/Font.h> #include<hgl/graph/font/Font.h>
#include<hgl/type/UnicodeBlocks.h> #include<hgl/type/UnicodeBlocks.h>
@ -71,7 +71,7 @@ namespace hgl
{ {
protected: protected:
SortedSets<void *> ref_object; SortedSet<void *> ref_object;
ObjectMap<u32char,CLA> cla_cache; ObjectMap<u32char,CLA> cla_cache;

4
inc/hgl/graph/font/TextLayout.h
View File

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

6
inc/hgl/graph/font/TextPrimitive.h
View File

@ -24,10 +24,10 @@ namespace hgl
friend class TextLayout; friend class TextLayout;
friend class TextRender; friend class TextRender;
SortedSets<u32char> chars_sets; SortedSet<u32char> chars_sets;
const SortedSets<u32char> &GetCharsSets()const{return chars_sets;} const SortedSet<u32char> &GetCharsSets()const{return chars_sets;}
void SetCharsSets(const SortedSets<u32char> &sl){chars_sets=sl;} void SetCharsSets(const SortedSet<u32char> &sl){chars_sets=sl;}
void ClearCharsSets(){chars_sets.Clear();} void ClearCharsSets(){chars_sets.Clear();}
private: private:

2
inc/hgl/graph/font/TextRender.h
View File

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

4
inc/hgl/graph/font/TileFont.h
View File

@ -24,7 +24,7 @@ namespace hgl
TileResPool to_res; TileResPool to_res;
SortedSets<u32char> not_bitmap_chars; SortedSet<u32char> not_bitmap_chars;
public: public:
@ -37,7 +37,7 @@ namespace hgl
TileFont(TileData *td,FontSource *fs); TileFont(TileData *td,FontSource *fs);
virtual ~TileFont(); virtual ~TileFont();
bool Registry(TileUVFloatMap &,SortedSets<u32char> &chars_sets); ///<注册要使用的字符 bool Registry(TileUVFloatMap &,SortedSet<u32char> &chars_sets); ///<注册要使用的字符
void Unregistry(const List<u32char> &); ///<注销要使用的字符 void Unregistry(const List<u32char> &); ///<注销要使用的字符
};//class TileFont };//class TileFont
}//namespace graph }//namespace graph

4
inc/hgl/gui/Layout.h
View File

@ -2,7 +2,7 @@
#define HGL_GUI_LAYOUT_INCLUDE #define HGL_GUI_LAYOUT_INCLUDE
#include<hgl/gui/Widget.h> #include<hgl/gui/Widget.h>
#include<hgl/type/SortedSets.h> #include<hgl/type/SortedSet.h>
namespace hgl namespace hgl
{ {
namespace gui namespace gui
@ -14,7 +14,7 @@ namespace hgl
{ {
protected: protected:
SortedSets<Widget *> widgets_set; SortedSet<Widget *> widgets_set;
public: public:

2
src/SceneGraph/Vulkan/VKPipelineLayoutData.h
View File

@ -3,7 +3,7 @@
#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
#include<hgl/graph/VKDescriptorSetType.h> #include<hgl/graph/VKDescriptorSetType.h>
#include<hgl/type/Map.h> #include<hgl/type/Map.h>
#include<hgl/type/SortedSets.h> #include<hgl/type/SortedSet.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
struct PipelineLayoutData struct PipelineLayoutData
{ {

2
src/SceneGraph/font/TileFont.cpp
View File

@ -30,7 +30,7 @@ namespace hgl
* @param rs 每个字符在纹理中的UV坐标 * @param rs 每个字符在纹理中的UV坐标
* @param chars_sets 要注册的字符合集 * @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; ResPoolStats stats;