summaryrefslogtreecommitdiff
path: root/assetFactory/assetFactory.cpp
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2025-03-28 19:04:21 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2025-03-28 19:04:21 +0000
commit508ffe80c9991cc76f4fa37dd2fa21746abe3a89 (patch)
treefe5ca4a08a246191432c304708ce76fe1c3905d6 /assetFactory/assetFactory.cpp
parentCreate the last group in jsonParse.ll (diff)
parentFix check for bulk removal (diff)
downloadilt-508ffe80c9991cc76f4fa37dd2fa21746abe3a89.tar.bz2
ilt-508ffe80c9991cc76f4fa37dd2fa21746abe3a89.tar.xz
ilt-508ffe80c9991cc76f4fa37dd2fa21746abe3a89.zip
Merge remote-tracking branch 'origin/ptrs'HEADmain
Diffstat (limited to 'assetFactory/assetFactory.cpp')
-rw-r--r--assetFactory/assetFactory.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/assetFactory/assetFactory.cpp b/assetFactory/assetFactory.cpp
index 176e1f5..426fecc 100644
--- a/assetFactory/assetFactory.cpp
+++ b/assetFactory/assetFactory.cpp
@@ -5,6 +5,7 @@
#include "filesystem.h"
#include "gfx/image.h"
#include "gfx/models/texture.h"
+#include "gfx/renderable.h"
#include "object.h"
#include "plane.h"
#include "saxParse-persistence.h"
@@ -146,7 +147,7 @@ bool
AssetFactory::persist(Persistence::PersistenceStore & store)
{
using MapObjects = Persistence::MapByMember<Shapes, std::shared_ptr<Object>>;
- using MapAssets = Persistence::MapByMember<Assets>;
+ using MapAssets = Persistence::MapByMember<Assets, Asset::Ptr>;
using MapTextureFragments = Persistence::MapByMember<TextureFragments>;
using MapAssImp = Persistence::MapByMember<AssImps, std::shared_ptr<AssImp>, &AssImp::path>;
return STORE_TYPE && STORE_NAME_HELPER("object", shapes, MapObjects)