ouczbs/zengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refl bugfix

Browse Source
This commit is contained in:
ouczbs 2024-11-23 18:05:54 +08:00
parent b4028d719f
commit dc3bce761e
10 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/3rdparty/singleton/include/singleton.h vendored
View File

@ -8,6 +8,8 @@ namespace singleapi {
};
template <class T>
concept is_unique_wrap_t = requires(T* t) { typename T::UniqueType; { t->Ptr() } -> std::same_as<typename T::UniqueType*>; };
template <class T>
concept is_reinitialize_t = requires(T * t) { { t->reinitialize() }; };
struct MemoryInfo {
void* data;
bool isAlive;
@ -67,6 +69,9 @@ public:
else {
ms_Singleton = new(info.data)T(std::forward<Args>(args)...);
}
if constexpr (is_reinitialize_t<T>) {
ms_Singleton->reinitialize();
}
}
~UniquePtr() {
using namespace singleapi;
@ -109,6 +114,9 @@ public:
else {
ms_Singleton = new(info.data)T(std::forward<Args>(args)...);
}
if constexpr (is_reinitialize_t<T>) {
ms_Singleton->reinitialize();
}
}
~UniquePtr() {
using namespace singleapi;

6
engine/modules/engine/asset/impl/asset_visit_impl.inl
View File

@ -39,4 +39,10 @@ namespace api {
}
return new_meta;
}
void AssetModule::InitResourceType()
{
meta::for_each_type<Resources>([]<typename T>() {
refl::register_meta<T>();
});
}
}

1
engine/modules/engine/asset/include/asset/module.h
View File

@ -6,5 +6,6 @@ namespace api {
void OnLoad(int argc, char** argv) override;
void OnUnload() override;
void InitMetaData(void) override {};
void InitResourceType();
};
}

1
engine/modules/engine/asset/src/module.cpp
View File

@ -5,6 +5,7 @@
namespace api {
void AssetModule::OnLoad(int argc, char** argv)
{
InitResourceType();
AddSystem<ResourceSystem>();
AssetLoader::Init();
TextArchive::Register<Guid>();

2
engine/modules/engine/render/include/render/asset/shader.h
View File

@ -8,11 +8,13 @@ namespace api {
GENERATED_BODY()
UPROPERTY()
RscHandle<Shader> mOwner;
UPROPERTY()
ShaderStage mStage;
public:
refl::Any Meta() {
return refl::Any{this};
}
ShaderProgram() : mOwner{},mStage(ShaderStage::NONE) {}
ShaderProgram(ShaderStage stage) : mStage(stage) {};
ShaderStage GetStage() {
return mStage;

2
engine/modules/engine/zlib/include/meta/tuple.h
View File

@ -39,5 +39,7 @@ namespace meta
template<typename T, typename ... Args>
constexpr auto tuple_construct(const std::tuple<Args...>&) noexcept;
template <typename Tuple, typename Func>
void for_each_type(Func&& func)noexcept;
}
#include "tuple.inl"

13
engine/modules/engine/zlib/include/meta/tuple.inl
View File

@ -27,4 +27,17 @@ namespace meta
{
using type = std::tuple<Wrap<Ts>...>;
};
// 泛型接口
template <typename Tuple, typename Func, size_t... Index>
void for_each_type_impl(Func&& func, std::index_sequence<Index...>) noexcept {
(func.template operator() < std::tuple_element_t<Index, Tuple> > (), ...);
}
template <typename Tuple, typename Func>
void for_each_type(Func&& func) noexcept {
for_each_type_impl<Tuple>(
std::forward<Func>(func),
std::make_index_sequence<std::tuple_size_v<Tuple>>{}
);
}
}

1
engine/modules/engine/zlib/include/pmr/name.h
View File

@ -163,6 +163,7 @@ namespace pmr {
std::mutex mutex;
public:
StringEntryMemoryManager();
void reinitialize();
StringEntry* GetStringEntry(StringEntryHandle stringEntryHandle) const;
StringEntryHandle AllocateStringEntry(StringEntryHeader stringEntryHeader, const char* data);
private:

5
engine/modules/engine/zlib/include/pmr/name.inl
View File

@ -82,12 +82,15 @@ namespace pmr {
slotPool.slotArray = (Slot*)(xmalloc(SlotPool::SLOT_POOL_INITIALIZE_SIZE * sizeof(Slot)));
std::memset(slotPool.slotArray, 0, SlotPool::SLOT_POOL_INITIALIZE_SIZE);
}
g_memory_blocks = memoryBlockArray;
currentMemoryBlockIndex = 0;
currentMemoryBlockAlignedCursor = 0;
memoryBlockArray[0] = (char*)(xmalloc(MAX_MEMORY_BLOCK_SIZE));
std::memset(memoryBlockArray[0], 0, MAX_MEMORY_BLOCK_SIZE);
}
inline void Name::StringEntryMemoryManager::reinitialize()
{
g_memory_blocks = memoryBlockArray;
}
inline Name::StringEntry* Name::StringEntryMemoryManager::GetStringEntry(StringEntryHandle stringEntryHandle) const
{
return reinterpret_cast<Name::StringEntry*>(memoryBlockArray[stringEntryHandle.GetMemoryBlockIndex()] + stringEntryHandle.GetMemoryBlockAlignedOffset() * ALIGN_BYTES);

2
engine/modules/engine/zlib/include/refl/detail/any.inl
View File

@ -112,6 +112,7 @@ namespace refl{
}
auto fieldList = GetFields(EFieldFind::FIND_CTOR, Name("Ctor"));
if (fieldList.empty()) {
memset(ptr, 0, size);
return false;
}
std::array<Any, MAX_ARGS_LENGTH> ArgsArray = { Any{} , Any{ptr} };
@ -129,6 +130,7 @@ namespace refl{
return true;
}
}
memset(ptr, 0, size);
return false;
}
if (!ArgsList.empty() && ArgsList[0].Check(this)) {