renamed to SortedSet from SortedSets
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
#define HGL_GRAPH_RENDER_NODE_INCLUDE
|
||||
|
||||
#include<hgl/graph/VK.h>
|
||||
#include<hgl/type/SortedSets.h>
|
||||
#include<hgl/type/SortedSet.h>
|
||||
namespace hgl
|
||||
{
|
||||
namespace graph
|
||||
@@ -27,7 +27,7 @@ namespace hgl
|
||||
using RenderNodeList=List<RenderNode>;
|
||||
using RenderNodePointerList=List<RenderNode *>;
|
||||
|
||||
using MaterialInstanceSets=SortedSets<MaterialInstance *>; ///<材质实例集合
|
||||
using MaterialInstanceSets=SortedSet<MaterialInstance *>; ///<材质实例集合
|
||||
}//namespace graph
|
||||
}//namespace hgl
|
||||
#endif//HGL_GRAPH_RENDER_NODE_INCLUDE
|
||||
|
@@ -4,7 +4,7 @@
|
||||
#include<hgl/graph/VK.h>
|
||||
#include<hgl/type/Map.h>
|
||||
#include<hgl/type/ObjectList.h>
|
||||
#include<hgl/type/SortedSets.h>
|
||||
#include<hgl/type/SortedSet.h>
|
||||
VK_NAMESPACE_BEGIN
|
||||
class DeviceBuffer;
|
||||
|
||||
@@ -20,7 +20,7 @@ class DescriptorSet
|
||||
ObjectList<VkDescriptorImageInfo> image_list;
|
||||
List<VkWriteDescriptorSet> wds_list;
|
||||
|
||||
SortedSets<uint32_t> binded_sets;
|
||||
SortedSet<uint32_t> binded_sets;
|
||||
|
||||
bool is_dirty;
|
||||
|
||||
|
@@ -95,6 +95,6 @@ public:
|
||||
MaterialInstance *CreateMI(const VILConfig *vil_cfg=nullptr);
|
||||
};//class Material
|
||||
|
||||
using MaterialSets=SortedSets<Material *>;
|
||||
using MaterialSets=SortedSet<Material *>;
|
||||
VK_NAMESPACE_END
|
||||
#endif//HGL_GRAPH_VULKAN_MATERIAL_INCLUDE
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
#include<hgl/graph/VK.h>
|
||||
#include<hgl/type/String.h>
|
||||
#include<hgl/type/SortedSets.h>
|
||||
#include<hgl/type/SortedSet.h>
|
||||
|
||||
VK_NAMESPACE_BEGIN
|
||||
class GPUPhysicalDevice
|
||||
|
@@ -3,7 +3,7 @@
|
||||
|
||||
#include<hgl/graph/VK.h>
|
||||
#include<hgl/graph/VKVertexInputLayout.h>
|
||||
#include<hgl/type/SortedSets.h>
|
||||
#include<hgl/type/SortedSet.h>
|
||||
|
||||
VK_NAMESPACE_BEGIN
|
||||
|
||||
|
@@ -3,7 +3,7 @@
|
||||
|
||||
#include<hgl/type/StrChar.h>
|
||||
#include<hgl/type/Map.h>
|
||||
#include<hgl/type/SortedSets.h>
|
||||
#include<hgl/type/SortedSet.h>
|
||||
#include<hgl/graph/font/Font.h>
|
||||
#include<hgl/type/UnicodeBlocks.h>
|
||||
|
||||
@@ -71,7 +71,7 @@ namespace hgl
|
||||
{
|
||||
protected:
|
||||
|
||||
SortedSets<void *> ref_object;
|
||||
SortedSet<void *> ref_object;
|
||||
|
||||
ObjectMap<u32char,CLA> cla_cache;
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -24,10 +24,10 @@ namespace hgl
|
||||
friend class TextLayout;
|
||||
friend class TextRender;
|
||||
|
||||
SortedSets<u32char> chars_sets;
|
||||
SortedSet<u32char> chars_sets;
|
||||
|
||||
const SortedSets<u32char> &GetCharsSets()const{return chars_sets;}
|
||||
void SetCharsSets(const SortedSets<u32char> &sl){chars_sets=sl;}
|
||||
const SortedSet<u32char> &GetCharsSets()const{return chars_sets;}
|
||||
void SetCharsSets(const SortedSet<u32char> &sl){chars_sets=sl;}
|
||||
void ClearCharsSets(){chars_sets.Clear();}
|
||||
|
||||
private:
|
||||
|
@@ -33,7 +33,7 @@ namespace hgl
|
||||
Color4f color;
|
||||
DeviceBuffer * ubo_color;
|
||||
|
||||
SortedSets<TextPrimitive *> tr_sets;
|
||||
SortedSet<TextPrimitive *> tr_sets;
|
||||
|
||||
private:
|
||||
|
||||
|
@@ -24,7 +24,7 @@ namespace hgl
|
||||
|
||||
TileResPool to_res;
|
||||
|
||||
SortedSets<u32char> not_bitmap_chars;
|
||||
SortedSet<u32char> not_bitmap_chars;
|
||||
|
||||
public:
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace hgl
|
||||
TileFont(TileData *td,FontSource *fs);
|
||||
virtual ~TileFont();
|
||||
|
||||
bool Registry(TileUVFloatMap &,SortedSets<u32char> &chars_sets); ///<注册要使用的字符
|
||||
bool Registry(TileUVFloatMap &,SortedSet<u32char> &chars_sets); ///<注册要使用的字符
|
||||
void Unregistry(const List<u32char> &); ///<注销要使用的字符
|
||||
};//class TileFont
|
||||
}//namespace graph
|
||||
|
Reference in New Issue
Block a user