From 35cef4cd90f3d0a388e7b2e82b90d821d4bfe0ab Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 11 Jul 2023 23:17:26 +0800 Subject: [PATCH 1/3] removed MultiMapTest --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 101eba3..3ad536a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,9 +45,6 @@ cm_example_project(CreateBinaryH) add_executable(NormalCompressTest NormalCompressTest.cpp) CM_EXAMPLE_PROJECT(NormalCompressTest) -add_executable(MultiMapTest MultiMapTest.cpp) -cm_example_project(MultiMapTest) - add_executable(OSFontList OSFontList.cpp) cm_example_project(OSFontList) target_link_libraries(OSFontList PRIVATE CMUtil) @@ -59,4 +56,4 @@ add_executable(DistributionChart2D DistributionChart2D.cpp BitmapFont.cpp Bitmap cm_example_project(DistributionChart2D) add_executable(Size2Test Size2Test.cpp) -cm_example_project(Size2Test) \ No newline at end of file +cm_example_project(Size2Test) From fc077c51008831b85f847ca9f817992da6b6608d Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 14 Jul 2023 23:36:26 +0800 Subject: [PATCH 2/3] renamed follow ObjectManage --- RuntimeAssetManager.h | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/RuntimeAssetManager.h b/RuntimeAssetManager.h index 7fe6e46..b00322c 100644 --- a/RuntimeAssetManager.h +++ b/RuntimeAssetManager.h @@ -1,10 +1,10 @@ #pragma once -#include +#include using namespace hgl; -template struct RuntimeAssetManager:public ResManage +template struct RuntimeAssetManager:public ObjectManage { public: @@ -12,7 +12,7 @@ public: { if(!v)return(false); - return ResManage::Add(v->GetID(),v); + return ObjectManage::Add(v->GetID(),v); } }; @@ -89,4 +89,33 @@ public: } }; +#define HGL_RUNTIME_ASSET_CLASS(RA_ID_TYPE,_RA_CLASS) + #define HGL_RUNTIME_ASSET_DECLARATION(RA_ID_TYPE,RA_CLASS) RuntimeAssetManager RuntimeAsset::RAM; + +/** + * ·¶Àý + * + * MyRuntimeAsset.h + * + * using MyAssetID=uint; + * + * struct MyRuntimeAsset:public RuntimeAsset + * { + * public: + * + * using RuntimeAsset::RuntimeAsset; + * }; + * + * MyRuntimeAsset.cpp + * + * #include"MyRuntimeAsset.h" + * + * HGL_RUNTIME_ASSET_DECLARATION(MyAssetID,MyRuntimeAsset); + * + */ + + + + + From 7bf664c24f6a578797228e29660dd56453e1cf39 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sat, 15 Jul 2023 00:47:34 +0800 Subject: [PATCH 3/3] fixed include LoadStringList --- DistributionChart2D.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributionChart2D.cpp b/DistributionChart2D.cpp index 1f34314..668f6a5 100644 --- a/DistributionChart2D.cpp +++ b/DistributionChart2D.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include