diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-06 20:48:33 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-07 01:02:02 +0000 |
| commit | 2f8d7643d03f39fa848576692264d0fe3a37ed91 (patch) | |
| tree | f4578e2ce3020c04a206f9eb0bc02587de5b3d6a /assetFactory | |
| parent | Don't request a specific OpenGL version, just check we get something sufficie... (diff) | |
| download | ilt-2f8d7643d03f39fa848576692264d0fe3a37ed91.tar.bz2 ilt-2f8d7643d03f39fa848576692264d0fe3a37ed91.tar.xz ilt-2f8d7643d03f39fa848576692264d0fe3a37ed91.zip | |
Reformat with new clang-format
Diffstat (limited to 'assetFactory')
| -rw-r--r-- | assetFactory/assimp.cpp | 1 | ||||
| -rw-r--r-- | assetFactory/faceController.h | 3 | ||||
| -rw-r--r-- | assetFactory/mutation.cpp | 1 | ||||
| -rw-r--r-- | assetFactory/object.h | 1 | ||||
| -rw-r--r-- | assetFactory/style.cpp | 1 | ||||
| -rw-r--r-- | assetFactory/texturePacker.h | 2 | ||||
| -rw-r--r-- | assetFactory/use.cpp | 1 | ||||
| -rw-r--r-- | assetFactory/use.h | 1 |
8 files changed, 11 insertions, 0 deletions
diff --git a/assetFactory/assimp.cpp b/assetFactory/assimp.cpp index 9dc7842..bd5467b 100644 --- a/assetFactory/assimp.cpp +++ b/assetFactory/assimp.cpp @@ -30,6 +30,7 @@ operator!(const aiVector3t<T> & v) } using SceneCPtr = std::shared_ptr<const aiScene>; + class AssImpNode : public Shape { public: AssImpNode(SceneCPtr scene, const aiNode * node) : scene(std::move(scene)), node(node) { } diff --git a/assetFactory/faceController.h b/assetFactory/faceController.h index 0376241..fb89d25 100644 --- a/assetFactory/faceController.h +++ b/assetFactory/faceController.h @@ -18,12 +18,14 @@ public: private: friend Persistence::SelectionPtrBase<std::unique_ptr<Split>>; bool persist(Persistence::PersistenceStore & store) override; + std::string getId() const override { return {}; }; }; + using FaceControllers = std::map<std::string, std::unique_ptr<FaceController>>; using Splits = std::map<std::string, std::unique_ptr<Split>>; @@ -38,6 +40,7 @@ public: private: friend Persistence::SelectionPtrBase<std::unique_ptr<FaceController>>; bool persist(Persistence::PersistenceStore & store) override; + std::string getId() const override { diff --git a/assetFactory/mutation.cpp b/assetFactory/mutation.cpp index 9a6a988..c5c3f5b 100644 --- a/assetFactory/mutation.cpp +++ b/assetFactory/mutation.cpp @@ -27,6 +27,7 @@ Mutation::relativeLevelOfDetail() const { return std::max({scale.x, scale.y, scale.z}); } + bool Mutation::persist(Persistence::PersistenceStore & store) { diff --git a/assetFactory/object.h b/assetFactory/object.h index f47c512..77e1469 100644 --- a/assetFactory/object.h +++ b/assetFactory/object.h @@ -18,6 +18,7 @@ public: private: friend Persistence::SelectionPtrBase<std::shared_ptr<Object>>; bool persist(Persistence::PersistenceStore & store) override; + std::string getId() const override { diff --git a/assetFactory/style.cpp b/assetFactory/style.cpp index ea67fc2..81a5441 100644 --- a/assetFactory/style.cpp +++ b/assetFactory/style.cpp @@ -61,6 +61,7 @@ Style::persist(Persistence::PersistenceStore & store) struct ColourParser : public Persistence::SelectionV<ColourAlpha> { using Persistence::SelectionV<ColourAlpha>::SelectionV; using Persistence::SelectionV<ColourAlpha>::setValue; + void setValue(std::string && str) override { diff --git a/assetFactory/texturePacker.h b/assetFactory/texturePacker.h index a1b270b..93413eb 100644 --- a/assetFactory/texturePacker.h +++ b/assetFactory/texturePacker.h @@ -16,12 +16,14 @@ public: Position position; Size size; + bool operator<(const Area & other) const { return area(size) < area(other.size); } }; + using Image = Size; using Space = Area; using Positions = std::vector<Position>; diff --git a/assetFactory/use.cpp b/assetFactory/use.cpp index 5314321..0994c8c 100644 --- a/assetFactory/use.cpp +++ b/assetFactory/use.cpp @@ -35,6 +35,7 @@ Use::createMesh(ModelFactoryMesh & mesh, float levelOfDetailFactor) const struct Lookup : public Persistence::SelectionV<Shape::CPtr> { using Persistence::SelectionV<Shape::CPtr>::SelectionV; using Persistence::SelectionV<Shape::CPtr>::setValue; + void setValue(std::string && str) override { diff --git a/assetFactory/use.h b/assetFactory/use.h index a91685b..289bf6e 100644 --- a/assetFactory/use.h +++ b/assetFactory/use.h @@ -19,6 +19,7 @@ public: private: friend Persistence::SelectionPtrBase<std::shared_ptr<Use>>; bool persist(Persistence::PersistenceStore & store) override; + std::string getId() const override { |