diff --git a/CMSceneGraph b/CMSceneGraph index c330c635..481d6a79 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit c330c635b226079f29664541b6c766959c244769 +Subproject commit 481d6a7924f373b8d0b40f25199eb987d4512fa8 diff --git a/inc/hgl/graph/VKPrimitive.h b/inc/hgl/graph/VKPrimitive.h index fce81027..8317d15e 100644 --- a/inc/hgl/graph/VKPrimitive.h +++ b/inc/hgl/graph/VKPrimitive.h @@ -14,6 +14,12 @@ VK_NAMESPACE_BEGIN * * 一类是传统的,使用独统的独立VAB的 * 一类是使用VDM的 + * + * + * + * WIP: *** 1.将数据全部转移到PrimitiveData,完成旧的渲染测试 + * 2.改成抽象类,将独立VAB的做成一个实现 + * 3.实现VDM支持 */ class Primitive { diff --git a/inc/hgl/graph/VKPrimitiveData.h b/inc/hgl/graph/VKPrimitiveData.h index aa836db0..748602e6 100644 --- a/inc/hgl/graph/VKPrimitiveData.h +++ b/inc/hgl/graph/VKPrimitiveData.h @@ -52,28 +52,16 @@ public: hgl_zero(*this); } - const int GetVABIndex(const char *name)const + const int GetVABIndex(const AnsiString &name)const{return vil->GetIndex(name);} + + VABAccess *GetVAB(const AnsiString &name) { - for(int i=0;i