From f22f5237743569de989699fc65ecd01b8ea11848 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sat, 30 Mar 2024 23:23:39 +0100 Subject: [PATCH] minor frag store refactor --- src/fragment_store/fragment_store.cpp | 4 ---- src/fragment_store/fragment_store.hpp | 3 --- src/fragment_store/fragment_store_i.cpp | 8 ++++++++ src/fragment_store/fragment_store_i.hpp | 4 ++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/fragment_store/fragment_store.cpp b/src/fragment_store/fragment_store.cpp index 7ac7164d..17830d8c 100644 --- a/src/fragment_store/fragment_store.cpp +++ b/src/fragment_store/fragment_store.cpp @@ -67,10 +67,6 @@ FragmentStore::FragmentStore( registerSerializers(); } -FragmentHandle FragmentStore::fragmentHandle(FragmentID fid) { - return {_reg, fid}; -} - std::vector FragmentStore::generateNewUID(std::array& uuid_namespace) { std::vector new_uid(uuid_namespace.cbegin(), uuid_namespace.cend()); new_uid.resize(new_uid.size() + 16); diff --git a/src/fragment_store/fragment_store.hpp b/src/fragment_store/fragment_store.hpp index 811b4bef..0e52e51c 100644 --- a/src/fragment_store/fragment_store.hpp +++ b/src/fragment_store/fragment_store.hpp @@ -31,9 +31,6 @@ struct FragmentStore : public FragmentStoreI { FragmentStore(void); FragmentStore(std::array session_uuid_namespace); - // HACK: get access to the reg - FragmentHandle fragmentHandle(FragmentID fid); - // TODO: make the frags ref counted // TODO: check for exising diff --git a/src/fragment_store/fragment_store_i.cpp b/src/fragment_store/fragment_store_i.cpp index 75a9e449..3f757fd1 100644 --- a/src/fragment_store/fragment_store_i.cpp +++ b/src/fragment_store/fragment_store_i.cpp @@ -2,6 +2,14 @@ #include +FragmentRegistry& FragmentStoreI::registry(void) { + return _reg; +} + +FragmentHandle FragmentStoreI::fragmentHandle(const FragmentID fid) { + return {_reg, fid}; +} + void FragmentStoreI::throwEventConstruct(const FragmentID fid) { std::cout << "FSI debug: event construct " << entt::to_integral(fid) << "\n"; dispatch( diff --git a/src/fragment_store/fragment_store_i.hpp b/src/fragment_store/fragment_store_i.hpp index 68d96a4d..774a7669 100644 --- a/src/fragment_store/fragment_store_i.hpp +++ b/src/fragment_store/fragment_store_i.hpp @@ -52,8 +52,12 @@ struct FragmentStoreI : public FragmentStoreEventProviderI { virtual ~FragmentStoreI(void) {} + FragmentRegistry& registry(void); + FragmentHandle fragmentHandle(const FragmentID fid); + void throwEventConstruct(const FragmentID fid); void throwEventUpdate(const FragmentID fid); + // TODO //void throwEventDestroy(); };