From bdee9dd0c92865e0cec2f4bbf170959df282a930 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Fri, 11 Jun 2021 22:19:23 -0700 Subject: More UI polishing and fix asset saving/reloading --- core/src/Model/Assets.hpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'core/src/Model/Assets.hpp') diff --git a/core/src/Model/Assets.hpp b/core/src/Model/Assets.hpp index adde97b..9fd781f 100644 --- a/core/src/Model/Assets.hpp +++ b/core/src/Model/Assets.hpp @@ -1,8 +1,7 @@ #pragma once #include "Utils/UUID.hpp" - -#include "Assets.hpp" +#include "cplt_fwd.hpp" #include #include @@ -42,9 +41,11 @@ private: std::unique_ptr mPrivate; public: - AssetList(); + AssetList(Project& project); virtual ~AssetList(); + Project& GetConnectedProject() const; + // TODO support file watches void Reload(); @@ -99,6 +100,8 @@ template class AssetListTyped : public AssetList { public: + using AssetList::AssetList; + std::unique_ptr CreateAndLoad(SavedAsset asset) { return std::unique_ptr(static_cast(AssetList::CreateAndLoad(asset).release())); -- cgit v1.2.3-70-g09d2