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

renamed to PerMaterialInstance instead of PerMaterial

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2023-02-23 12:31:42 +08:00
parent 3dbb1c40b7
commit cce2cab12c
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inc/hgl/graph/VK.h
View File

@@ -74,10 +74,10 @@ enum class DescriptorSetType
{
//设计使其对应shader中的set
Global=0, ///<全局参数(如太阳光等)
PerFrame, ///<帧参数(如摄像机等)
PerMaterial,///<材质参数(如纹理等)
PerObject, ///<对象参数(如模型矩阵等)
Global=0, ///<全局参数(如太阳光等)
PerFrame, ///<帧参数(如摄像机等)
PerMaterialInstance,///<材质实例参数(如纹理等)
PerObject, ///<对象参数(如模型矩阵等)
Instance,
Skeleton,
@@ -87,7 +87,7 @@ enum class DescriptorSetType
constexpr char *DescriptSetsTypeName[]=
{
"Global","PerFrame","PerMaterial","PerObject","Instance","Skeleton"
"Global","PerFrame","PerMaterialInstance","PerObject","Instance","Skeleton"
};
inline const char *GetDescriptorSetTypeName(const enum class DescriptorSetType &type)

18
inc/hgl/graph/VKMaterialParameters.h
View File

@@ -9,9 +9,9 @@ class MaterialParameters
{
const MaterialDescriptorSets *mds;
DescriptorSetType ds_type;
DescriptorSetType set_type;
DescriptorSet *descriptor_sets;
DescriptorSet *descriptor_set;
private:
@@ -21,20 +21,20 @@ private:
public:
const DescriptorSetType GetType (){return ds_type;}
DescriptorSet * GetDescriptorSet (){return descriptor_sets;}
const VkDescriptorSet GetVkDescriptorSet ()const{return descriptor_sets->GetDescriptorSet();}
const DescriptorSetType GetType (){return set_type;}
DescriptorSet * GetDescriptorSet (){return descriptor_set;}
const VkDescriptorSet GetVkDescriptorSet ()const{return descriptor_set->GetDescriptorSet();}
const uint32_t GetCount ()const{return descriptor_sets->GetCount();}
const bool IsReady ()const{return descriptor_sets->IsReady();}
const uint32_t GetCount ()const{return descriptor_set->GetCount();}
const bool IsReady ()const{return descriptor_set->IsReady();}
public:
#define MP_TYPE_IS(name) const bool is##name()const{return ds_type==DescriptorSetType::name;}
#define MP_TYPE_IS(name) const bool is##name()const{return set_type==DescriptorSetType::name;}
MP_TYPE_IS(Skeleton)
MP_TYPE_IS(Instance)
MP_TYPE_IS(PerObject)
MP_TYPE_IS(PerMaterial)
MP_TYPE_IS(PerMaterialInstance)
MP_TYPE_IS(PerFrame)
MP_TYPE_IS(Global)
#undef MP_TYPE_IS