From d7ee2efaca226fc478e3f0c78abdbe86a887f17a Mon Sep 17 00:00:00 2001 From: rtk0c Date: Mon, 7 Jun 2021 12:19:51 -0700 Subject: Complete asset loading/saving and UI management logic --- core/src/Model/Assets.hpp | 97 +++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 49 deletions(-) (limited to 'core/src/Model/Assets.hpp') diff --git a/core/src/Model/Assets.hpp b/core/src/Model/Assets.hpp index bc5219d..3401e42 100644 --- a/core/src/Model/Assets.hpp +++ b/core/src/Model/Assets.hpp @@ -1,18 +1,22 @@ #pragma once #include +#include #include #include #include #include /// A structure representing a ready-to-be-loaded asset, locating on the disk. +/// Each asset should be identified by a unique uuid within the asset category (i.e. a workflow and a template can share the same uuid), +/// generated on insertion to an asset list if not given by the caller. struct SavedAsset { - std::filesystem::path Path; std::string Name; - /// `Path`'s string form, encoded in UTF-8. - std::string PathString = Path.string(); + /// UUID of this asset. This field is generated as a random UUID v4 upon insertion into an AssetList, if not already provided by the caller (indicated by !is_nil()). + uuids::uuid Uuid; + /// Extra data to be used by the AssetList/Asset implementation. + uint64_t Payload; }; class Asset @@ -22,40 +26,15 @@ public: virtual ~Asset() = default; }; -class AssetCategory -{ -public: - virtual ~AssetCategory() = default; - - virtual void DiscoverFiles(const std::function& callback) const = 0; - - virtual Asset* CreateEmpty(const SavedAsset& diskForm) const = 0; - std::unique_ptr CreateEmptyUnique(const SavedAsset& diskForm) const; - virtual Asset* Load(const SavedAsset& diskForm) const = 0; - std::unique_ptr LoadUnique(const SavedAsset& diskForm) const; - - /// This should call ImGui::BeginTable() along with other accessories such as setting up the header row. - virtual void SetupDetailsTable(const char* tableId) const = 0; - virtual void DrawBigIcon(const SavedAsset& asset) const = 0; - virtual void DrawDetailsTableRow(const SavedAsset& asset) const = 0; - -protected: - /* Helper loader functions */ - - static void DiscoverFilesByExtension(const std::function& callback, const std::filesystem::path& containerDir, std::string_view extension); - static void DiscoverFilesByHeader(const std::function& callback, const std::filesystem::path& containerDir, const std::function& validater); -}; - class AssetList { private: - const AssetCategory* mLoader; tsl::array_map mAssets; tsl::array_map> mCache; int mCacheSizeLimit = 0; public: - AssetList(const AssetCategory& loader); + virtual ~AssetList() = default; // TODO support file watches void Reload(); @@ -63,42 +42,62 @@ public: const SavedAsset* FindByName(std::string_view name) const; const SavedAsset& Create(SavedAsset asset); std::unique_ptr CreateAndLoad(SavedAsset asset); - std::unique_ptr LoadFromDisk(std::string_view name) const; - bool Rename(std::string_view oldName, std::string_view newName); + /// Load the asset on disk by its name. + std::unique_ptr Load(std::string_view name) const; + /// Load the asset on disk by a reference to its SavedAsset instance. This function assumes that the given SavedAsset + /// is stored in AssetList, otherwise the behavior is undefined. + std::unique_ptr Load(const SavedAsset& asset) const; + const SavedAsset* Rename(std::string_view oldName, std::string_view newName); bool Remove(std::string_view name); int GetCacheSizeLimit() const; void SetCacheSizeLimit(int limit); - struct DrawState + struct ListState { const SavedAsset* SelectedAsset = nullptr; }; - void DrawBigIcons(DrawState& state); - void DrawDetails(DrawState& state); + void DrawBigIcons(ListState& state); + void DrawDetails(ListState& state); + +protected: + virtual void DiscoverFiles(const std::function& callback) const = 0; + + // Helper + void DiscoverFilesByExtension(const std::function& callback, const std::filesystem::path& containerDir, std::string_view extension) const; + void DiscoverFilesByHeader(const std::function& callback, const std::filesystem::path& containerDir, const std::function& validater) const; + + virtual void SaveEmptyInstance(const SavedAsset& asset) const = 0; + virtual Asset* CreateEmptyInstance(const SavedAsset& asset) const = 0; + + virtual Asset* LoadImpl(const SavedAsset& asset) const = 0; + + virtual std::string RetrieveNameFromFile(const std::filesystem::path& file) const = 0; + virtual uuids::uuid RetrieveUuidFromFile(const std::filesystem::path& file) const = 0; + virtual std::filesystem::path RetrievePathFromAsset(const SavedAsset& asset) const = 0; + + /// This should call ImGui::BeginTable() along with other accessories such as setting up the header row. + virtual void SetupDetailsTable(const char* tableId) const = 0; + virtual void DrawBigIcon(const SavedAsset& asset) const = 0; + virtual void DrawDetailsTableRow(const SavedAsset& asset) const = 0; }; -template -class TypedAssetList : public AssetList +template +class AssetListTyped : public AssetList { public: - using Asset = TAsset; - using AssetType = typename TAsset::CategoryType; - -public: - // Import constructor - using AssetList::AssetList; - - Asset* FindByName(std::string_view name) const + std::unique_ptr CreateAndLoad(SavedAsset asset) { - return static_cast(AssetList::FindByName(name)); + return std::unique_ptr(static_cast(AssetList::CreateAndLoad(asset).release())); } - std::unique_ptr Create(std::string_view name) + + std::unique_ptr Load(std::string_view name) const { - return std::unique_ptr(static_cast(AssetList::Create(name).release())); + return std::unique_ptr(static_cast(AssetList::Load(name).release())); } - std::unique_ptr LoadFromDisk(std::string_view name) const + + std::unique_ptr Load(const SavedAsset& asset) const { - return std::unique_ptr(static_cast(AssetList::LoadFromDisk(name))); + return std::unique_ptr(static_cast(AssetList::Load(asset).release())); } }; -- cgit v1.2.3-70-g09d2