diff --git a/CMCore b/CMCore index 8c86a153..29e758f9 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 8c86a153ebe97bb03a6abf4bb7c0ac7bebb8eb4f +Subproject commit 29e758f96317da6e01173faf4efa1dc4ca3a43b2 diff --git a/inc/hgl/graph/RenderFramework.h b/inc/hgl/graph/RenderFramework.h index fc94814c..bec8f9b5 100644 --- a/inc/hgl/graph/RenderFramework.h +++ b/inc/hgl/graph/RenderFramework.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include @@ -69,7 +69,7 @@ public: //module template T * GetModule(){return graph_module_map.Get();} ///<获取指定类型的模块 - GraphModule * GetModule(const AnsiIDName &name,bool create=false); ///<获取指定名称的模块 + GraphModule * GetModule(const AIDName &name,bool create=false); ///<获取指定名称的模块 //template T *AddModule() //{ diff --git a/inc/hgl/graph/SceneNode.h b/inc/hgl/graph/SceneNode.h index 14ac91b8..85d30dd4 100644 --- a/inc/hgl/graph/SceneNode.h +++ b/inc/hgl/graph/SceneNode.h @@ -10,7 +10,7 @@ namespace hgl namespace graph { using SceneNodeID =uint64; - using SceneNodeName =UTF16IDName; + using SceneNodeName =U16IDName; /** * 场景节点数据类
diff --git a/inc/hgl/graph/module/GraphModule.h b/inc/hgl/graph/module/GraphModule.h index 0293be23..c935ae00 100644 --- a/inc/hgl/graph/module/GraphModule.h +++ b/inc/hgl/graph/module/GraphModule.h @@ -15,7 +15,7 @@ class GraphModule { RenderFramework *render_framework; - AnsiIDName module_name; + AIDName module_name; bool module_inited; bool module_enabled; @@ -25,7 +25,7 @@ protected: template T * GetModule(bool create=false){return render_framework->GetModule(create);} ///<获取指定类型的模块 - GraphModule * GetModule(const AnsiIDName &name,bool create=false); ///<获取指定名称的模块 + GraphModule * GetModule(const AIDName &name,bool create=false); ///<获取指定名称的模块 protected: @@ -41,8 +41,8 @@ public: RenderFramework * GetFramework () {return render_framework;} ///<取得渲染框架 - const AnsiIDName & GetName ()const {return module_name;} ///<取得模块名称(标准通用的名称,比如Upscale,供通用模块使用) - virtual const AnsiIDName & GetFullName ()const {return module_name;} ///<取得名称(完整的私有名称,比如FSR3Upscale,DLSS3Upscale) + const AIDName & GetName ()const {return module_name;} ///<取得模块名称(标准通用的名称,比如Upscale,供通用模块使用) + virtual const AIDName & GetFullName ()const {return module_name;} ///<取得名称(完整的私有名称,比如FSR3Upscale,DLSS3Upscale) virtual const bool IsPerFrame () {return false;} ///<是否每帧运行 virtual const bool IsRender () {return false;} ///<是否为渲染模块 @@ -57,7 +57,7 @@ public: protected: - GraphModule(RenderFramework *rf,const AnsiIDName &name); + GraphModule(RenderFramework *rf,const AIDName &name); public: @@ -76,7 +76,7 @@ public: //回调事件 virtual void OnPostFrame(){} ///<帧绘制后回调 };//class GraphModule -using GraphModuleMapByIDName=Map; +using GraphModuleMapByIDName=Map; //template class GraphModuleInherit:public BASE //{ @@ -98,9 +98,9 @@ using GraphModuleMapByIDName=Map; NO_COPY_NO_MOVE(name) \ static const size_t StaticHash(){return typeid(name).hash_code();} \ const size_t GetTypeHash()const override{return name::StaticHash();} \ - static const AnsiIDName &GetModuleName() \ + static const AIDName &GetModuleName() \ { \ - static const AnsiIDName id_name(#name); \ + static const AIDName id_name(#name); \ return id_name; \ } \ \ diff --git a/inc/hgl/graph/module/GraphModuleFactory.h b/inc/hgl/graph/module/GraphModuleFactory.h index 65d716dd..ab3f5664 100644 --- a/inc/hgl/graph/module/GraphModuleFactory.h +++ b/inc/hgl/graph/module/GraphModuleFactory.h @@ -28,7 +28,7 @@ public: if(!rf) return(nullptr); - Map dgm_map; + Map dgm_map; //检查依赖模块 { @@ -36,7 +36,7 @@ public: if(!dependent_modules.IsEmpty()) { - for(const AnsiIDName &name:dependent_modules) + for(const AIDName &name:dependent_modules) { GraphModule *dgm=rf->GetModule(name,true); diff --git a/inc/hgl/graph/module/GraphModuleMap.h b/inc/hgl/graph/module/GraphModuleMap.h index 50b6a5c7..767d916e 100644 --- a/inc/hgl/graph/module/GraphModuleMap.h +++ b/inc/hgl/graph/module/GraphModuleMap.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include @@ -11,7 +11,7 @@ class GraphModulesMap { SortedSet gm_set; - Map gm_map_by_name; + Map gm_map_by_name; Map gm_map_by_hash; List gm_list; //按创建顺序记录,用于倒序释放 @@ -25,7 +25,7 @@ public: return gm_set.IsEmpty(); } - GraphModule *Get(const AnsiIDName &name) + GraphModule *Get(const AIDName &name) { GraphModule *gm; @@ -46,7 +46,7 @@ public: template const bool IsLoaded()const{return gm_map_by_hash.ContainsKey(T::GetTypeHash());} - const bool IsLoaded(const AnsiIDName &name)const{return gm_map_by_name.ContainsKey(name);} + const bool IsLoaded(const AIDName &name)const{return gm_map_by_name.ContainsKey(name);} bool Release(GraphModule *gm); ///<释放一个模块 diff --git a/res b/res index e1a36d78..475d8ad4 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit e1a36d78f0eead5f6bb65493432c4690637b991d +Subproject commit 475d8ad43ceee084cd24f5d0bed59de9f6aa36fd diff --git a/src/SceneGraph/RenderFramework.cpp b/src/SceneGraph/RenderFramework.cpp index 86bbde70..fac12216 100644 --- a/src/SceneGraph/RenderFramework.cpp +++ b/src/SceneGraph/RenderFramework.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -21,7 +21,7 @@ namespace }//namespace -GraphModule *CreateGraphModule(const AnsiIDName &name,RenderFramework *rf); +GraphModule *CreateGraphModule(const AIDName &name,RenderFramework *rf); namespace { @@ -40,7 +40,7 @@ namespace } }//namespace -GraphModule *RenderFramework::GetModule(const AnsiIDName &name,bool create) +GraphModule *RenderFramework::GetModule(const AIDName &name,bool create) { GraphModule *gm=graph_module_map.Get(name); diff --git a/src/SceneGraph/module/GraphModule.cpp b/src/SceneGraph/module/GraphModule.cpp index d61c418f..0edd36c1 100644 --- a/src/SceneGraph/module/GraphModule.cpp +++ b/src/SceneGraph/module/GraphModule.cpp @@ -55,7 +55,7 @@ bool GraphModulesMap::Release(GraphModule *gm) return(true); } -GraphModule::GraphModule(RenderFramework *rf,const AnsiIDName &name) +GraphModule::GraphModule(RenderFramework *rf,const AIDName &name) { render_framework=rf; module_name=name; @@ -68,7 +68,7 @@ GraphModule::~GraphModule() LOG_INFO("GraphModule::~GraphModule: "+AnsiString(module_name.GetName())) } -GraphModule *GraphModule::GetModule(const AnsiIDName &name,bool create) +GraphModule *GraphModule::GetModule(const AIDName &name,bool create) { render_framework->GetModule(name,create); } diff --git a/src/SceneGraph/module/GraphModuleFactory.cpp b/src/SceneGraph/module/GraphModuleFactory.cpp index 9d5729a8..b836307a 100644 --- a/src/SceneGraph/module/GraphModuleFactory.cpp +++ b/src/SceneGraph/module/GraphModuleFactory.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -7,7 +7,7 @@ VK_NAMESPACE_BEGIN namespace { - using GraphModuleFactoryMap=ObjectMap; + using GraphModuleFactoryMap=ObjectMap; static GraphModuleFactoryMap *gmf_map=nullptr; } @@ -33,7 +33,7 @@ bool RegistryGraphModuleFactory(const char *module_name,GraphModuleFactory *gmf) if(!gmf_map) InitGraphModuleFactory(); - AnsiIDName name(module_name); + AIDName name(module_name); if(gmf_map->ContainsKey(name)) return(false); @@ -43,7 +43,7 @@ bool RegistryGraphModuleFactory(const char *module_name,GraphModuleFactory *gmf) return(true); } -GraphModule *CreateGraphModule(const AnsiIDName &name,RenderFramework *rf) +GraphModule *CreateGraphModule(const AIDName &name,RenderFramework *rf) { if(!rf) return(nullptr);