summaryrefslogtreecommitdiff
path: root/assetFactory
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2023-03-04 14:27:23 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2023-03-04 14:27:23 +0000
commit54ddcd3da0916b6a46f5fcf3f33ff0fbffe375ce (patch)
treea1a46ac32486375a7b2636e467779916d28c8c4c /assetFactory
parentAdd Asset helpers to construct OpenGL ready meshes from Asset Factory meshes ... (diff)
downloadilt-54ddcd3da0916b6a46f5fcf3f33ff0fbffe375ce.tar.bz2
ilt-54ddcd3da0916b6a46f5fcf3f33ff0fbffe375ce.tar.xz
ilt-54ddcd3da0916b6a46f5fcf3f33ff0fbffe375ce.zip
Support and load factory asset directly into a RailVehicleClass instance
Diffstat (limited to 'assetFactory')
-rw-r--r--assetFactory/asset.cpp3
-rw-r--r--assetFactory/asset.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/assetFactory/asset.cpp b/assetFactory/asset.cpp
index 659a950..3ab2f1c 100644
--- a/assetFactory/asset.cpp
+++ b/assetFactory/asset.cpp
@@ -3,8 +3,7 @@
bool
Asset::persist(Persistence::PersistenceStore & store)
{
- return STORE_MEMBER(id) && STORE_MEMBER(name)
- && STORE_NAME_HELPER("mesh", meshes, Persistence::Appender<FactoryMesh::Collection>);
+ return STORE_MEMBER(id) && STORE_MEMBER(name);
}
Asset::MeshConstruct::MeshConstruct(Mesh::Ptr & m) :
diff --git a/assetFactory/asset.h b/assetFactory/asset.h
index 8dd1ecb..e3318e4 100644
--- a/assetFactory/asset.h
+++ b/assetFactory/asset.h
@@ -9,8 +9,6 @@ public:
std::string id;
std::string name;
- FactoryMesh::Collection meshes;
-
protected:
struct MeshConstruct : public Persistence::SelectionPtrBase<FactoryMesh::Ptr> {
using Persistence::SelectionPtrBase<FactoryMesh::Ptr>::setValue;