summaryrefslogtreecommitdiff
path: root/assetFactory
diff options
context:
space:
mode:
Diffstat (limited to 'assetFactory')
-rw-r--r--assetFactory/assetFactory.cpp11
-rw-r--r--assetFactory/assetFactory.h18
-rw-r--r--assetFactory/faceController.cpp10
-rw-r--r--assetFactory/faceController.h14
-rw-r--r--assetFactory/factoryMesh.cpp7
-rw-r--r--assetFactory/factoryMesh.h6
-rw-r--r--assetFactory/use.cpp5
-rw-r--r--assetFactory/use.h2
8 files changed, 64 insertions, 9 deletions
diff --git a/assetFactory/assetFactory.cpp b/assetFactory/assetFactory.cpp
index 470eacf..564ea28 100644
--- a/assetFactory/assetFactory.cpp
+++ b/assetFactory/assetFactory.cpp
@@ -27,5 +27,14 @@ bool
AssetFactory::persist(Persistence::PersistenceStore & store)
{
using MapObjects = Persistence::MapByMember<Shapes, std::shared_ptr<Object>>;
- return STORE_TYPE && STORE_NAME_HELPER("object", shapes, MapObjects);
+ using MapAssets = Persistence::MapByMember<Assets>;
+ return STORE_TYPE && STORE_NAME_HELPER("object", shapes, MapObjects)
+ && STORE_NAME_HELPER("asset", assets, MapAssets);
+}
+
+bool
+Asset::persist(Persistence::PersistenceStore & store)
+{
+ return STORE_TYPE && STORE_MEMBER(id) && STORE_MEMBER(name)
+ && STORE_NAME_HELPER("mesh", meshes, Persistence::Appender<FactoryMesh::Collection>);
}
diff --git a/assetFactory/assetFactory.h b/assetFactory/assetFactory.h
index 5cf90dd..9d79827 100644
--- a/assetFactory/assetFactory.h
+++ b/assetFactory/assetFactory.h
@@ -1,17 +1,33 @@
#pragma once
+#include "factoryMesh.h"
#include "persistence.h"
#include "shape.h"
#include <filesystem>
+#include <stdTypeDefs.hpp>
+
+class Asset : public Persistence::Persistable, public StdTypeDefs<Asset> {
+public:
+ std::string id;
+ std::string name;
+
+ FactoryMesh::Collection meshes;
+
+private:
+ friend Persistence::SelectionPtrBase<std::shared_ptr<Asset>, true>;
+ bool persist(Persistence::PersistenceStore & store) override;
+};
class AssetFactory : public Persistence::Persistable {
public:
- using Shapes = std::map<std::string, Shape::CPtr, std::less<>>;
+ using Shapes = std::map<std::string, Shape::Ptr, std::less<>>;
+ using Assets = std::map<std::string, Asset::Ptr, std::less<>>;
AssetFactory();
[[nodiscard]] static std::shared_ptr<AssetFactory> loadXML(const std::filesystem::path &);
Shapes shapes;
+ Assets assets;
private:
friend Persistence::SelectionPtrBase<std::shared_ptr<AssetFactory>, true>;
diff --git a/assetFactory/faceController.cpp b/assetFactory/faceController.cpp
index 7ec7820..499f7e4 100644
--- a/assetFactory/faceController.cpp
+++ b/assetFactory/faceController.cpp
@@ -52,10 +52,18 @@ FaceController::apply(ModelFactoryMesh & mesh, const std::string & name, Shape::
}
}
for (const auto & [name, faceController] : faceControllers) {
- faceController.apply(mesh, name, newFaces);
+ faceController->apply(mesh, name, newFaces);
}
faces.merge(std::move(newFaces));
}
}
}
}
+
+bool
+FaceController::persist(Persistence::PersistenceStore & store)
+{
+ return STORE_TYPE && STORE_MEMBER(id) && STORE_MEMBER(colour) && STORE_MEMBER(type) && STORE_MEMBER(smooth)
+ && STORE_MEMBER(scale) && STORE_MEMBER(position) && STORE_MEMBER(rotation)
+ && STORE_NAME_HELPER("face", faceControllers, Persistence::MapByMember<FaceControllers>);
+}
diff --git a/assetFactory/faceController.h b/assetFactory/faceController.h
index 9974caf..296210d 100644
--- a/assetFactory/faceController.h
+++ b/assetFactory/faceController.h
@@ -2,13 +2,14 @@
#include "modelFactoryMesh_fwd.h"
#include "mutation.h"
+#include "persistence.h"
#include "shape.h"
#include <map>
#include <string>
-class FaceController : public Mutation {
+class FaceController : public Mutation, public Persistence::Persistable {
public:
- using FaceControllers = std::map<std::string, FaceController>;
+ using FaceControllers = std::map<std::string, std::unique_ptr<FaceController>>;
void apply(ModelFactoryMesh & mesh, const std::string & name, Shape::CreatedFaces & faces) const;
@@ -17,4 +18,13 @@ public:
std::string type;
bool smooth {false};
FaceControllers faceControllers;
+
+private:
+ friend Persistence::SelectionPtrBase<std::unique_ptr<FaceController>, false>;
+ bool persist(Persistence::PersistenceStore & store) override;
+ std::string
+ getId() const override
+ {
+ return {};
+ };
};
diff --git a/assetFactory/factoryMesh.cpp b/assetFactory/factoryMesh.cpp
index baa031d..0fb72ad 100644
--- a/assetFactory/factoryMesh.cpp
+++ b/assetFactory/factoryMesh.cpp
@@ -29,3 +29,10 @@ FactoryMesh::createMesh() const
}
return std::make_shared<Mesh>(vertices, vectorOfN(vertices.size()));
}
+
+bool
+FactoryMesh::persist(Persistence::PersistenceStore & store)
+{
+ return STORE_TYPE && STORE_MEMBER(id) && STORE_MEMBER(size)
+ && STORE_NAME_HELPER("use", uses, Persistence::Appender<Use::Collection>);
+}
diff --git a/assetFactory/factoryMesh.h b/assetFactory/factoryMesh.h
index f850893..4b6d3e5 100644
--- a/assetFactory/factoryMesh.h
+++ b/assetFactory/factoryMesh.h
@@ -4,11 +4,15 @@
#include "stdTypeDefs.hpp"
#include "use.h"
-class FactoryMesh : public StdTypeDefs<FactoryMesh> {
+class FactoryMesh : public Persistence::Persistable, public StdTypeDefs<FactoryMesh> {
public:
Mesh::Ptr createMesh() const;
std::string id;
glm::vec3 size;
Use::Collection uses;
+
+private:
+ friend Persistence::SelectionPtrBase<std::shared_ptr<FactoryMesh>, true>;
+ bool persist(Persistence::PersistenceStore & store) override;
};
diff --git a/assetFactory/use.cpp b/assetFactory/use.cpp
index 3b574c3..1f28332 100644
--- a/assetFactory/use.cpp
+++ b/assetFactory/use.cpp
@@ -6,7 +6,7 @@ Use::createMesh(ModelFactoryMesh & mesh, const Mutation::Matrix & mutation) cons
{
auto faces = type->createMesh(mesh, mutation * getMatrix());
for (const auto & [name, faceController] : faceControllers) {
- faceController.apply(mesh, name, faces);
+ faceController->apply(mesh, name, faces);
}
return faces;
}
@@ -27,5 +27,6 @@ bool
Use::persist(Persistence::PersistenceStore & store)
{
return STORE_TYPE && STORE_HELPER(type, Lookup) && STORE_MEMBER(position) && STORE_MEMBER(scale)
- && STORE_MEMBER(rotation);
+ && STORE_MEMBER(rotation) && STORE_MEMBER(colour)
+ && STORE_NAME_HELPER("face", faceControllers, Persistence::MapByMember<FaceControllers>);
}
diff --git a/assetFactory/use.h b/assetFactory/use.h
index 96f07f6..853af23 100644
--- a/assetFactory/use.h
+++ b/assetFactory/use.h
@@ -8,7 +8,7 @@
class Use : public StdTypeDefs<Use>, public Mutation, public Persistence::Persistable {
public:
- using FaceControllers = std::map<std::string, FaceController>;
+ using FaceControllers = std::map<std::string, std::unique_ptr<FaceController>>;
Shape::CreatedFaces createMesh(ModelFactoryMesh & mesh, const Mutation::Matrix & mutation) const;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 14:31:47 +0000