diff --git a/CMCore b/CMCore index 6316f3cd..43bc9af0 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 6316f3cd59aa749ca31226f82fc764dd77ac40ff +Subproject commit 43bc9af0200846ce3f31fe97d963009e6b199f38 diff --git a/CMSceneGraph b/CMSceneGraph index 9ff596c4..c958a6cb 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 9ff596c42437ada641f62b4d0d2bfae535638666 +Subproject commit c958a6cb2ac4a52716eabc1c45eba184f4c7e46c diff --git a/inc/hgl/graph/RenderNode.h b/inc/hgl/graph/RenderNode.h index 79e0075d..319acf8c 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/RenderWorkflow.h b/inc/hgl/graph/RenderWorkflow.h index 1e59b7f1..722d4983 100644 --- a/inc/hgl/graph/RenderWorkflow.h +++ b/inc/hgl/graph/RenderWorkflow.h @@ -2,7 +2,7 @@ #include #include -#include +#include VK_NAMESPACE_BEGIN @@ -24,7 +24,7 @@ struct RenderWorkConfig BlendMode blend_mode; RenderOrder render_order; - SortedSets output_buffer; + SortedSet output_buffer; };//struct RenderWorkConfig; VK_NAMESPACE_END 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 acd00c18..5fd505a8 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/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 {