diff --git a/CMCore b/CMCore index d09fe432..a7b0cb61 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit d09fe4326ea3629434adcd034a99ebbdb8fa6c22 +Subproject commit a7b0cb6112c1dfad65523e619d88917398ca7c9a diff --git a/CMPlatform b/CMPlatform index 67e8e956..0948b3a6 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit 67e8e956658cb9abbb94cd01f0a465e8275b44dd +Subproject commit 0948b3a6257fdcc1e33eeb61bf42d0e93b32d326 diff --git a/CMSceneGraph b/CMSceneGraph index f74d7045..e3680c47 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit f74d7045fa0d143b94103e49093fe18a1d5a884c +Subproject commit e3680c477d25d2b4d93ff4da2d84725524f047b2 diff --git a/example/Basic/CMakeLists.txt b/example/Basic/CMakeLists.txt index 18c0514c..7413c4a4 100644 --- a/example/Basic/CMakeLists.txt +++ b/example/Basic/CMakeLists.txt @@ -10,7 +10,7 @@ set_property(TARGET ${name} PROPERTY FOLDER "ULRE/Example/Basic") endmacro() -CreateProject(00_RenderFrameworkTest rf_test.cpp) +CreateProject(00_RenderFrameworkTest rf_test.cpp AssetData.h) CreateProject(01_draw_triangle_in_NDC draw_triangle_in_NDC.cpp) CreateProject(02_draw_triangle_use_UBO draw_triangle_use_UBO.cpp) CreateProject(03_auto_instance auto_instance.cpp) diff --git a/example/Basic/rf_test.cpp b/example/Basic/rf_test.cpp index 4704a041..df68129c 100644 --- a/example/Basic/rf_test.cpp +++ b/example/Basic/rf_test.cpp @@ -3,6 +3,7 @@ #include #include #include +#include"AssetData.h" using namespace hgl; using namespace hgl::graph; diff --git a/inc/hgl/component/Component.h b/inc/hgl/component/Component.h index 4a09ab70..4afc201a 100644 --- a/inc/hgl/component/Component.h +++ b/inc/hgl/component/Component.h @@ -109,12 +109,12 @@ public: ComponentSet & GetComponents(){return component_set;} - int GetComponents(List &comp_list,SceneNode *); + int GetComponents(ArrayList &comp_list,SceneNode *); virtual void UpdateComponents(const double delta_time); - virtual void JoinComponent(Component *c){if(!c)return;component_set.Add(c);} - virtual void UnjonComponent(Component *c){if(!c)return;component_set.Delete(c);} + virtual void AttachComponent(Component *c){if(!c)return;component_set.Add(c);} + virtual void DetachComponent(Component *c){if(!c)return;component_set.Delete(c);} public: //事件 diff --git a/inc/hgl/graph/RenderNode.h b/inc/hgl/graph/RenderNode.h index 15aca634..2f2e7b0b 100644 --- a/inc/hgl/graph/RenderNode.h +++ b/inc/hgl/graph/RenderNode.h @@ -29,8 +29,8 @@ namespace hgl const int compare(const RenderNode &)const override; }; - using RenderNodeList=List; - using RenderNodePointerList=List; + using RenderNodeList=ArrayList; + using RenderNodePointerList=ArrayList; using MaterialInstanceSets=SortedSet; ///<材质实例集合 }//namespace graph diff --git a/inc/hgl/graph/SceneNode.h b/inc/hgl/graph/SceneNode.h index d4a53e5e..73d0a4fb 100644 --- a/inc/hgl/graph/SceneNode.h +++ b/inc/hgl/graph/SceneNode.h @@ -119,7 +119,7 @@ namespace hgl bool Contains (Component *comp) {return ComponentList.Contains(comp);} ///<是否包含指定组件 bool HasComponent (const ComponentManager *); ///<是否有指定组件管理器的组件 - virtual int GetComponents (List &comp_list,const ComponentManager *); ///<取得所有组件 + virtual int GetComponents (ArrayList &comp_list,const ComponentManager *); ///<取得所有组件 };//class SceneNode diff --git a/inc/hgl/graph/TileData.h b/inc/hgl/graph/TileData.h index 87cd692c..0ce20b16 100644 --- a/inc/hgl/graph/TileData.h +++ b/inc/hgl/graph/TileData.h @@ -37,7 +37,7 @@ namespace hgl DeviceBuffer *tile_buffer; /// commit_list; + ArrayList commit_list; uint8 *commit_ptr; bool CommitTile(TileObject *,const void *,const uint,const int,const int); ///<提交一个Tile数据 diff --git a/inc/hgl/graph/VKDescriptorSet.h b/inc/hgl/graph/VKDescriptorSet.h index af103422..8367425d 100644 --- a/inc/hgl/graph/VKDescriptorSet.h +++ b/inc/hgl/graph/VKDescriptorSet.h @@ -18,7 +18,7 @@ class DescriptorSet ObjectList vab_list; ObjectList image_list; - List wds_list; + ArrayList wds_list; SortedSet binded_sets; diff --git a/inc/hgl/graph/VKDeviceAttribute.h b/inc/hgl/graph/VKDeviceAttribute.h index 9de75c3f..e56b490d 100644 --- a/inc/hgl/graph/VKDeviceAttribute.h +++ b/inc/hgl/graph/VKDeviceAttribute.h @@ -34,7 +34,7 @@ struct GPUDeviceAttribute VkQueue present_queue =VK_NULL_HANDLE; VkSurfaceFormatKHR surface_format; - List present_modes; + ArrayList present_modes; VkSurfaceTransformFlagBitsKHR preTransform; VkCompositeAlphaFlagBitsKHR compositeAlpha =VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; diff --git a/inc/hgl/graph/VKInstance.h b/inc/hgl/graph/VKInstance.h index c50aee9a..2507324a 100644 --- a/inc/hgl/graph/VKInstance.h +++ b/inc/hgl/graph/VKInstance.h @@ -101,8 +101,8 @@ VK_NAMESPACE_BEGIN };//class VulkanInstance void InitVulkanInstanceProperties(); - const List & GetInstanceLayerProperties(); - const List & GetInstanceExtensionProperties(); + const ArrayList & GetInstanceLayerProperties(); + const ArrayList & GetInstanceExtensionProperties(); const bool CheckInstanceLayerSupport(const AnsiString &); const bool GetInstanceLayerVersion(const AnsiString &,uint32_t &spec,uint32_t &impl); const bool CheckInstanceExtensionSupport(const AnsiString &); diff --git a/inc/hgl/graph/VKMaterial.h b/inc/hgl/graph/VKMaterial.h index 31b74d59..e3a8ccdc 100644 --- a/inc/hgl/graph/VKMaterial.h +++ b/inc/hgl/graph/VKMaterial.h @@ -11,8 +11,10 @@ namespace hgl { class ActiveMemoryBlockManager; } + VK_NAMESPACE_BEGIN -using ShaderStageCreateInfoList=List; + +using ShaderStageCreateInfoList=ArrayList; /** * 材质类
diff --git a/inc/hgl/graph/VKPhysicalDevice.h b/inc/hgl/graph/VKPhysicalDevice.h index b753f924..54c51d7d 100644 --- a/inc/hgl/graph/VKPhysicalDevice.h +++ b/inc/hgl/graph/VKPhysicalDevice.h @@ -23,9 +23,9 @@ class GPUPhysicalDevice VkPhysicalDeviceVulkan14Properties properties14; VkPhysicalDeviceMemoryProperties memory_properties; - List layer_properties; - List extension_properties; - List queue_family_properties; + ArrayList layer_properties; + ArrayList extension_properties; + ArrayList queue_family_properties; private: diff --git a/inc/hgl/graph/VKRenderPass.h b/inc/hgl/graph/VKRenderPass.h index bb531dae..e48c6e6f 100644 --- a/inc/hgl/graph/VKRenderPass.h +++ b/inc/hgl/graph/VKRenderPass.h @@ -16,7 +16,7 @@ class RenderPass VkPipelineCache pipeline_cache; VkRenderPass render_pass; - List color_formats; + ArrayList color_formats; VkFormat depth_format; VkExtent2D granularity; @@ -31,7 +31,7 @@ private: friend class RenderPassManager; - RenderPass(VkDevice d,VkPipelineCache pc,VkRenderPass rp,const List &cf,VkFormat df); + RenderPass(VkDevice d,VkPipelineCache pc,VkRenderPass rp,const ArrayList &cf,VkFormat df); public: @@ -43,7 +43,7 @@ public: const VkPipelineCache GetPipelineCache()const{return pipeline_cache;} const uint GetColorCount()const{return color_formats.GetCount();} - const List & GetColorFormat()const{return color_formats;} + const ArrayList & GetColorFormat()const{return color_formats;} const VkFormat GetColorFormat(int index)const { if(index<0||index>=color_formats.GetCount())return VK_FORMAT_UNDEFINED; diff --git a/inc/hgl/graph/font/TileFont.h b/inc/hgl/graph/font/TileFont.h index 0844388b..ab0cbe6d 100644 --- a/inc/hgl/graph/font/TileFont.h +++ b/inc/hgl/graph/font/TileFont.h @@ -38,7 +38,7 @@ namespace hgl virtual ~TileFont(); bool Registry(TileUVFloatMap &,SortedSet &chars_sets); ///<注册要使用的字符 - void Unregistry(const List &); ///<注销要使用的字符 + void Unregistry(const ArrayList &); ///<注销要使用的字符 };//class TileFont }//namespace graph }//namespace hgl diff --git a/inc/hgl/graph/module/GraphModuleManager.h b/inc/hgl/graph/module/GraphModuleManager.h index 62a68e69..1a54bd9d 100644 --- a/inc/hgl/graph/module/GraphModuleManager.h +++ b/inc/hgl/graph/module/GraphModuleManager.h @@ -11,7 +11,7 @@ class GraphModuleManager protected: - List module_list; + ArrayList module_list; Map module_map; public: diff --git a/inc/hgl/graph/module/RenderPassManager.h b/inc/hgl/graph/module/RenderPassManager.h index 8b546976..a667a632 100644 --- a/inc/hgl/graph/module/RenderPassManager.h +++ b/inc/hgl/graph/module/RenderPassManager.h @@ -28,9 +28,9 @@ private: private: - RenderPass * CreateRenderPass( const List &desc_list, - const List &subpass, - const List &dependency, + RenderPass * CreateRenderPass( const ArrayList &desc_list, + const ArrayList &subpass, + const ArrayList &dependency, const RenderbufferInfo *); public: diff --git a/inc/hgl/graph/module/RenderTargetManager.h b/inc/hgl/graph/module/RenderTargetManager.h index 914478ed..28bc70a1 100644 --- a/inc/hgl/graph/module/RenderTargetManager.h +++ b/inc/hgl/graph/module/RenderTargetManager.h @@ -20,7 +20,7 @@ public: public: //FrameBuffer相关 Framebuffer *CreateFBO(RenderPass *rp,ImageView **color_list,const uint image_count,ImageView *depth); -// Framebuffer *CreateFBO(RenderPass *,List &color,ImageView *depth); +// Framebuffer *CreateFBO(RenderPass *,ArrayList &color,ImageView *depth); Framebuffer *CreateFBO(RenderPass *,ImageView *color,ImageView *depth); Framebuffer *CreateFBO(RenderPass *,ImageView *); diff --git a/inc/hgl/graph/module/TextureManager.h b/inc/hgl/graph/module/TextureManager.h index 28fdd263..98a0bb90 100644 --- a/inc/hgl/graph/module/TextureManager.h +++ b/inc/hgl/graph/module/TextureManager.h @@ -91,11 +91,11 @@ public: //Create/Chagne void Clear(TextureCreateInfo *); - bool ChangeTexture2D(Texture2D *,DeviceBuffer *buf, const List &,VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); + bool ChangeTexture2D(Texture2D *,DeviceBuffer *buf, const ArrayList &,VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); bool ChangeTexture2D(Texture2D *,DeviceBuffer *buf, const RectScope2ui &, VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); bool ChangeTexture2D(Texture2D *,const void *data,const VkDeviceSize size, const RectScope2ui &, VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); -// bool ChangeTexture2DArray(Texture2DArray *,DeviceBuffer *buf, const List &, const uint32_t base_layer,const uint32_t layer_count,VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); +// bool ChangeTexture2DArray(Texture2DArray *,DeviceBuffer *buf, const ArrayList &, const uint32_t base_layer,const uint32_t layer_count,VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); bool ChangeTexture2DArray(Texture2DArray *,DeviceBuffer *buf, const RectScope2ui &, const uint32_t base_layer,const uint32_t layer_count,VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); bool ChangeTexture2DArray(Texture2DArray *,const void *data,const VkDeviceSize size,const RectScope2ui &, const uint32_t base_layer,const uint32_t layer_count,VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); diff --git a/inc/hgl/graph/mtl/ShaderVariableType.h b/inc/hgl/graph/mtl/ShaderVariableType.h index dfdfa478..eaecbb98 100644 --- a/inc/hgl/graph/mtl/ShaderVariableType.h +++ b/inc/hgl/graph/mtl/ShaderVariableType.h @@ -274,7 +274,7 @@ struct ShaderVariable Interpolation interpolation; //插值方式 }; -using SVList=List; +using SVList=ArrayList; struct ShaderVariableArray:public Comparator { diff --git a/inc/hgl/shadergen/ShaderCreateInfo.h b/inc/hgl/shadergen/ShaderCreateInfo.h index d5f530a1..c1210922 100644 --- a/inc/hgl/shadergen/ShaderCreateInfo.h +++ b/inc/hgl/shadergen/ShaderCreateInfo.h @@ -37,7 +37,7 @@ protected: AnsiString mi_codes; - List function_list; + ArrayList function_list; AnsiString main_function; AnsiString final_shader; diff --git a/inc/hgl/shadergen/ShaderDescriptorInfo.h b/inc/hgl/shadergen/ShaderDescriptorInfo.h index 5f62c6af..76d474b2 100644 --- a/inc/hgl/shadergen/ShaderDescriptorInfo.h +++ b/inc/hgl/shadergen/ShaderDescriptorInfo.h @@ -9,8 +9,8 @@ namespace hgl{namespace graph { -using UBODescriptorList=List; -using SamplerDescriptorList=List; +using UBODescriptorList=ArrayList; +using SamplerDescriptorList=ArrayList; using ConstValueDescriptorList=ObjectList; using SubpassInputDescriptorList=ObjectList; diff --git a/src/SceneGraph/Vulkan/DebugOutProperties.h b/src/SceneGraph/Vulkan/DebugOutProperties.h index fca3fe06..5b4e7dfa 100644 --- a/src/SceneGraph/Vulkan/DebugOutProperties.h +++ b/src/SceneGraph/Vulkan/DebugOutProperties.h @@ -11,7 +11,7 @@ inline void debug_out_vk_version(const uint32_t version) < &layer_properties) +inline void debug_out(const char *front,const hgl::ArrayList &layer_properties) { const int property_count=layer_properties.GetCount(); @@ -32,7 +32,7 @@ inline void debug_out(const char *front,const hgl::List &laye } } -inline void debug_out(const char *front,const hgl::List &extension_properties) +inline void debug_out(const char *front,const hgl::ArrayList &extension_properties) { const int extension_count=extension_properties.GetCount(); diff --git a/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2D.cpp b/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2D.cpp index b9208db7..abcb94e7 100644 --- a/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2D.cpp +++ b/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2D.cpp @@ -160,7 +160,7 @@ bool TextureManager::CommitTexture2DMipmaps(Texture2D *tex,DeviceBuffer *buf,con return CopyBufferToImage2D(tex,buf,buffer_image_copy,miplevel,VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); } -bool TextureManager::ChangeTexture2D(Texture2D *tex,DeviceBuffer *buf,const List &ir_list,VkPipelineStageFlags destinationStage) +bool TextureManager::ChangeTexture2D(Texture2D *tex,DeviceBuffer *buf,const ArrayList &ir_list,VkPipelineStageFlags destinationStage) { if(!tex||!buf||ir_list.GetCount()<=0) return(false); diff --git a/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2DArray.cpp b/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2DArray.cpp index b1411b9a..895ca0eb 100644 --- a/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2DArray.cpp +++ b/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2DArray.cpp @@ -169,7 +169,7 @@ Texture2DArray *TextureManager::CreateTexture2DArray(const uint32_t w,const uint // return CopyBufferToImageArray(tex,buf,buffer_image_copy,miplevel,VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); //} // -//bool GPUDevice::ChangeTexture2DArray(Texture2DArray *tex,DeviceBuffer *buf,const List &ir_list,const uint32_t base_layer,const uint32_t layer_count,VkPipelineStageFlags destinationStage) +//bool GPUDevice::ChangeTexture2DArray(Texture2DArray *tex,DeviceBuffer *buf,const ArrayList &ir_list,const uint32_t base_layer,const uint32_t layer_count,VkPipelineStageFlags destinationStage) //{ // if(!tex||!buf||ir_list.GetCount()<=0) // return(false); diff --git a/src/SceneGraph/Vulkan/Texture/VKDeviceTextureCube.cpp b/src/SceneGraph/Vulkan/Texture/VKDeviceTextureCube.cpp index 43e39af5..1fe7e112 100644 --- a/src/SceneGraph/Vulkan/Texture/VKDeviceTextureCube.cpp +++ b/src/SceneGraph/Vulkan/Texture/VKDeviceTextureCube.cpp @@ -148,7 +148,7 @@ bool TextureManager::CommitTextureCubeMipmaps(TextureCube *tex,DeviceBuffer *buf return CopyBufferToImageCube(tex,buf,buffer_image_copy,miplevel,VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); } -//bool GPUDevice::ChangeTexture2D(Texture2D *tex,DeviceBuffer *buf,const List &ir_list,VkPipelineStageFlags destinationStage) +//bool GPUDevice::ChangeTexture2D(Texture2D *tex,DeviceBuffer *buf,const ArrayList &ir_list,VkPipelineStageFlags destinationStage) //{ // if(!tex||!buf||ir_list.GetCount()<=0) // return(false); diff --git a/src/SceneGraph/Vulkan/VKDeviceFramebuffer.cpp b/src/SceneGraph/Vulkan/VKDeviceFramebuffer.cpp index f0ad043a..ceafb67e 100644 --- a/src/SceneGraph/Vulkan/VKDeviceFramebuffer.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceFramebuffer.cpp @@ -34,7 +34,7 @@ Framebuffer *RenderTargetManager::CreateFBO(RenderPass *rp,ImageView **color_lis if(color_count) { - const List &cf_list=rp->GetColorFormat(); + const ArrayList &cf_list=rp->GetColorFormat(); const VkFormat *cf=cf_list.GetData(); ImageView **iv=color_list; @@ -81,7 +81,7 @@ Framebuffer *RenderTargetManager::CreateFBO(RenderPass *rp,ImageView **color_lis return(new Framebuffer(GetVkDevice(),fbo,extent,rp,color_count,depth)); } // -//Framebuffer *RenderTargetManager::CreateFBO(RenderPass *rp,List &color,ImageView *depth) +//Framebuffer *RenderTargetManager::CreateFBO(RenderPass *rp,ArrayList &color,ImageView *depth) //{ // if(!rp)return(nullptr); // diff --git a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp index ad5a3345..eaeffbbd 100644 --- a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp +++ b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp @@ -5,7 +5,7 @@ VK_NAMESPACE_BEGIN namespace { - void debug_queue_family_properties_out(const char *front,const List &qfp_list) + void debug_queue_family_properties_out(const char *front,const ArrayList &qfp_list) { constexpr const char *queue_bit_name[]= { diff --git a/src/SceneGraph/Vulkan/VKProperties.cpp b/src/SceneGraph/Vulkan/VKProperties.cpp index cef48666..a259ffff 100644 --- a/src/SceneGraph/Vulkan/VKProperties.cpp +++ b/src/SceneGraph/Vulkan/VKProperties.cpp @@ -6,12 +6,12 @@ VK_NAMESPACE_BEGIN namespace { - static List layer_properties; - static List extension_properties; + static ArrayList layer_properties; + static ArrayList extension_properties; }//namespace -const List &GetLayerProperties(){return layer_properties;} -const List &GetExtensionProperties(){return extension_properties;} +const ArrayList &GetLayerProperties(){return layer_properties;} +const ArrayList &GetExtensionProperties(){return extension_properties;} void InitVulkanInstanceProperties() { diff --git a/src/SceneGraph/Vulkan/VKRenderPass.cpp b/src/SceneGraph/Vulkan/VKRenderPass.cpp index 8f03fe29..d7175280 100644 --- a/src/SceneGraph/Vulkan/VKRenderPass.cpp +++ b/src/SceneGraph/Vulkan/VKRenderPass.cpp @@ -5,7 +5,7 @@ #include #include VK_NAMESPACE_BEGIN -RenderPass::RenderPass(VkDevice d,VkPipelineCache pc,VkRenderPass rp,const List &cf,VkFormat df) +RenderPass::RenderPass(VkDevice d,VkPipelineCache pc,VkRenderPass rp,const ArrayList &cf,VkFormat df) { device=d; pipeline_cache=pc; diff --git a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp index 0b54d2df..b01c5c07 100644 --- a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp @@ -18,7 +18,7 @@ VK_NAMESPACE_BEGIN namespace { - void CreateShaderStageList(List &shader_stage_list,ShaderModuleMap *shader_maps) + void CreateShaderStageList(ArrayList &shader_stage_list,ShaderModuleMap *shader_maps) { const ShaderModule *sm; diff --git a/src/SceneGraph/component/ComponentManager.cpp b/src/SceneGraph/component/ComponentManager.cpp index 446a4a4c..bd8fa063 100644 --- a/src/SceneGraph/component/ComponentManager.cpp +++ b/src/SceneGraph/component/ComponentManager.cpp @@ -31,7 +31,7 @@ namespace hgl::graph return component_manager_map.at(hash_code); } - int ComponentManager::GetComponents(List &comp_list,SceneNode *node) + int ComponentManager::GetComponents(ArrayList &comp_list,SceneNode *node) { if(!node)return(-1); diff --git a/src/SceneGraph/module/RenderPassManager.cpp b/src/SceneGraph/module/RenderPassManager.cpp index db525e09..e5d3cec1 100644 --- a/src/SceneGraph/module/RenderPassManager.cpp +++ b/src/SceneGraph/module/RenderPassManager.cpp @@ -3,7 +3,7 @@ #include VK_NAMESPACE_BEGIN -void CreateSubpassDependency(List &subpass_dependency_list,const uint32_t count) +void CreateSubpassDependency(ArrayList &subpass_dependency_list,const uint32_t count) { if(count<=0)return; @@ -73,7 +73,7 @@ inline void CreateColorAttachmentReference(VkAttachmentReference *ref_list, uint inline void CreateDepthAttachmentReference(VkAttachmentReference *depth_ref,uint index) {CreateAttachmentReference(depth_ref, index,1 ,VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);} inline void CreateInputAttachmentReference(VkAttachmentReference *ref_list, uint start,uint count) {CreateAttachmentReference(ref_list, start,count,VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);} -bool CreateAttachmentDescription(List &desc_list,const RenderbufferInfo *rbi) +bool CreateAttachmentDescription(ArrayList &desc_list,const RenderbufferInfo *rbi) { const uint image_count=rbi->GetColorCount(); @@ -117,7 +117,7 @@ bool CreateAttachmentDescription(List &desc_list,const return(true); } -bool CreateColorAttachment( List &ref_list,List &desc_list,const List &color_format,const VkImageLayout color_final_layout=VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) +bool CreateColorAttachment( ArrayList &ref_list,ArrayList &desc_list,const ArrayList &color_format,const VkImageLayout color_final_layout=VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) { //const VkFormat *cf=color_format_list.GetData(); @@ -155,7 +155,7 @@ bool CreateColorAttachment( List &ref_list,List &ref_list,List &desc_list,const VkFormat &depth_format,const VkImageLayout depth_final_layout=VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) +bool CreateDepthAttachment( ArrayList &ref_list,ArrayList &desc_list,const VkFormat &depth_format,const VkImageLayout depth_final_layout=VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) { //if(!attr->physical_device->IsDepthAttachmentOptimal(depth_format)) // return(false); @@ -263,9 +263,9 @@ namespace } } -RenderPass *RenderPassManager::CreateRenderPass(const List &desc_list, - const List &subpass, - const List &dependency, +RenderPass *RenderPassManager::CreateRenderPass(const ArrayList &desc_list, + const ArrayList &subpass, + const ArrayList &dependency, const RenderbufferInfo *rbi) { const VkFormat depth_format=rbi->GetDepthFormat(); @@ -311,11 +311,11 @@ RenderPass *RenderPassManager::AcquireRenderPass(const RenderbufferInfo *rbi,con if(RenderPassList.Get(hash,rp)) return rp; - List color_ref_list; + ArrayList color_ref_list; VkAttachmentReference depth_ref; - List atta_desc_list; - List subpass_desc_list; - List subpass_dependency_list; + ArrayList atta_desc_list; + ArrayList subpass_desc_list; + ArrayList subpass_dependency_list; color_ref_list.SetCount(rbi->GetColorCount()); CreateColorAttachmentReference(color_ref_list.GetData(),0,rbi->GetColorCount()); diff --git a/src/SceneGraph/scene/SceneNode.cpp b/src/SceneGraph/scene/SceneNode.cpp index dd5c8993..7c581e48 100644 --- a/src/SceneGraph/scene/SceneNode.cpp +++ b/src/SceneGraph/scene/SceneNode.cpp @@ -89,7 +89,7 @@ namespace hgl LocalBoundingBox=local; } - int SceneNode::GetComponents(List &comp_list,const ComponentManager *mgr) + int SceneNode::GetComponents(ArrayList &comp_list,const ComponentManager *mgr) { if(!mgr)return(-1); if(ComponentIsEmpty())return(0); diff --git a/src/ShaderGen/MaterialFileData.h b/src/ShaderGen/MaterialFileData.h index c2a95e5f..9fd53a50 100644 --- a/src/ShaderGen/MaterialFileData.h +++ b/src/ShaderGen/MaterialFileData.h @@ -47,7 +47,7 @@ namespace material_file AccumMemoryManager::Block *block; }; - using UBODataList=List; + using UBODataList=ArrayList; struct ShaderData { @@ -56,7 +56,7 @@ namespace material_file const char * code; uint code_length; - List sampler; + ArrayList sampler; public: