diff --git a/CMSceneGraph b/CMSceneGraph index fe635b58..405da4aa 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit fe635b5851cd651f570a88b84a9353edf18a55ed +Subproject commit 405da4aa758983c99e3bf07b7de6a0d889731820 diff --git a/inc/hgl/graph/VKMaterialParameters.h b/inc/hgl/graph/VKMaterialParameters.h index 4e2f8113..a8d76220 100644 --- a/inc/hgl/graph/VKMaterialParameters.h +++ b/inc/hgl/graph/VKMaterialParameters.h @@ -40,7 +40,7 @@ public: #define MP_TYPE_IS(name) const bool is##name()const{return set_type==DescriptorSetType::name;} MP_TYPE_IS(Instance) - MP_TYPE_IS(PerMaterial) + //MP_TYPE_IS(PerMaterial) MP_TYPE_IS(PerFrame) MP_TYPE_IS(Global) #undef MP_TYPE_IS diff --git a/inc/hgl/graph/VertexAttribData.h b/inc/hgl/graph/VertexAttribData.h index 64aee685..8f3b968b 100644 --- a/inc/hgl/graph/VertexAttribData.h +++ b/inc/hgl/graph/VertexAttribData.h @@ -6,27 +6,6 @@ namespace hgl { namespace graph { - /** - * 预定义一些顶点属性名称,可用可不用。但一般默认shader会使用这些名称 - */ - namespace VertexAttribName - { - #define VAN_DEFINE(name) constexpr char name[]=#name; - VAN_DEFINE(Position) - VAN_DEFINE(Normal) - VAN_DEFINE(Color) - VAN_DEFINE(Tangent) - VAN_DEFINE(Bitangent) - VAN_DEFINE(TexCoord) - VAN_DEFINE(Metallic) - VAN_DEFINE(Specular) - VAN_DEFINE(Roughness) - VAN_DEFINE(Emission) - #undef VAN_DEFINE - }//namespace VertexAttribName - - #define VAN VertexAttribName - /** * 顶点属性数据 */