Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
eos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Richard Torenvliet
eos
Commits
fb556283
Commit
fb556283
authored
Aug 11, 2015
by
Patrik Huber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added a version parameter to the MorphableModel serialisation and uploaded the new model
Set version to 0.
parent
0ec2827e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
include/eos/morphablemodel/MorphableModel.hpp
include/eos/morphablemodel/MorphableModel.hpp
+5
-1
share/sfm_shape_3448.bin
share/sfm_shape_3448.bin
+0
-0
No files found.
include/eos/morphablemodel/MorphableModel.hpp
View file @
fb556283
...
@@ -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_ */
share/sfm_shape_3448.bin
View file @
fb556283
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment