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

renamed MaterialID to MaterialInstanceID

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-05-12 20:28:44 +08:00
parent 254264ac5e
commit 8855f0b880
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMSceneGraph

@ -1 +1 @@
Subproject commit bc0f03e2ba281ec30a331c3d0490e45797da8b17
Subproject commit 1251e2a735c87995b57c0e7fa3bd41981dee086f

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

@ -8,7 +8,7 @@ VK_NAMESPACE_BEGIN
/**
* <summary>
*
* layout(location=?) in uint MaterialID
* layout(location=?) in uint MaterialInstanceID
*
* #define MI_MAX_COUNT ??? //该值由引擎根据 UBORange/sizeof(MaterialInstance) 计算出来
*
@ -26,7 +26,7 @@ VK_NAMESPACE_BEGIN
*
* void main()
* {
* MaterialInstance mi=mtl.mi[(MaterialID>=MI_MAX_COUNT)?:0:MaterialID]; //如果超出范围则使用0号材质实例数据
* MaterialInstance mi=mtl.mi[(MaterialInstanceID>=MI_MAX_COUNT)?:0:MaterialInstanceID]; //如果超出范围则使用0号材质实例数据
*
* vec4 BaseColor =mi.BaseColor;
* vec4 Emissive =mi.Emissive;

2
inc/hgl/shadergen/ShaderCreateInfoVertex.h
View File

@ -23,7 +23,7 @@ namespace hgl
{
constexpr const VAT vat{VertexAttribType::BaseType::UInt,1}; //使用uint8
AddInput(vat,VAN::MaterialID,VK_VERTEX_INPUT_RATE_VERTEX,VertexInputGroup::MaterialID);
AddInput(vat,VAN::MaterialInstanceID,VK_VERTEX_INPUT_RATE_VERTEX,VertexInputGroup::MaterialInstanceID);
}
void AddBone()

4
src/SceneGraph/RenderNode.cpp
View File

@ -273,11 +273,11 @@ namespace hgl
if(count<binding_count) //材质组
{
const uint mtl_binding_count=vil->GetCount(VertexInputGroup::MaterialID);
const uint mtl_binding_count=vil->GetCount(VertexInputGroup::MaterialInstanceID);
if(mtl_binding_count>0)
{
if(mtl_binding_count!=1) //只有MaterialID
if(mtl_binding_count!=1) //只有MaterialInstanceID
return(false);
count+=mtl_binding_count;