Commit fb556283 authored by Patrik Huber's avatar Patrik Huber

Added a version parameter to the MorphableModel serialisation and uploaded the new model

Set version to 0.
parent 0ec2827e
...@@ -27,12 +27,14 @@ ...@@ -27,12 +27,14 @@
#include "eos/render/Mesh.hpp" #include "eos/render/Mesh.hpp"
#include "eos/morphablemodel/io/mat_cerealisation.hpp" #include "eos/morphablemodel/io/mat_cerealisation.hpp"
#include "cereal/cereal.hpp"
#include "cereal/access.hpp" #include "cereal/access.hpp"
#include "cereal/types/vector.hpp" #include "cereal/types/vector.hpp"
#include "cereal/archives/binary.hpp" #include "cereal/archives/binary.hpp"
#include <vector> #include <vector>
#include <array> #include <array>
#include <cstdint>
// Forward declaration of an internal function // Forward declaration of an internal function
namespace eos { namespace morphablemodel { namespace detail { namespace eos { namespace morphablemodel { namespace detail {
...@@ -221,7 +223,7 @@ private: ...@@ -221,7 +223,7 @@ private:
* @param[in] ar The archive to serialise to (or to serialise from). * @param[in] ar The archive to serialise to (or to serialise from).
*/ */
template<class Archive> template<class Archive>
void serialize(Archive& archive) void serialize(Archive& archive, const std::uint32_t version)
{ {
archive(shape_model, color_model, texture_coordinates); archive(shape_model, color_model, texture_coordinates);
}; };
...@@ -320,4 +322,6 @@ eos::render::Mesh sample_to_mesh(cv::Mat shape, cv::Mat color, std::vector<std:: ...@@ -320,4 +322,6 @@ eos::render::Mesh sample_to_mesh(cv::Mat shape, cv::Mat color, std::vector<std::
} /* namespace morphablemodel */ } /* namespace morphablemodel */
} /* namespace eos */ } /* namespace eos */
CEREAL_CLASS_VERSION(eos::morphablemodel::MorphableModel, 0);
#endif /* MORPHABLEMODEL_HPP_ */ #endif /* MORPHABLEMODEL_HPP_ */
No preview for this file type
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment