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
405eecfd
Commit
405eecfd
authored
Aug 21, 2016
by
Patrik Huber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add CEREAL_NVP to the model and blendshape serialisation
parent
a9196f1f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
include/eos/morphablemodel/Blendshape.hpp
include/eos/morphablemodel/Blendshape.hpp
+1
-1
include/eos/morphablemodel/MorphableModel.hpp
include/eos/morphablemodel/MorphableModel.hpp
+1
-1
include/eos/morphablemodel/PcaModel.hpp
include/eos/morphablemodel/PcaModel.hpp
+2
-2
No files found.
include/eos/morphablemodel/Blendshape.hpp
View file @
405eecfd
...
@@ -55,7 +55,7 @@ struct Blendshape
...
@@ -55,7 +55,7 @@ struct Blendshape
template
<
class
Archive
>
template
<
class
Archive
>
void
serialize
(
Archive
&
archive
)
void
serialize
(
Archive
&
archive
)
{
{
archive
(
name
,
deformation
);
archive
(
CEREAL_NVP
(
name
),
CEREAL_NVP
(
deformation
)
);
};
};
};
};
...
...
include/eos/morphablemodel/MorphableModel.hpp
View file @
405eecfd
...
@@ -253,7 +253,7 @@ private:
...
@@ -253,7 +253,7 @@ private:
template
<
class
Archive
>
template
<
class
Archive
>
void
serialize
(
Archive
&
archive
,
const
std
::
uint32_t
version
)
void
serialize
(
Archive
&
archive
,
const
std
::
uint32_t
version
)
{
{
archive
(
shape_model
,
color_model
,
texture_coordinates
);
archive
(
CEREAL_NVP
(
shape_model
),
CEREAL_NVP
(
color_model
),
CEREAL_NVP
(
texture_coordinates
)
);
};
};
};
};
...
...
include/eos/morphablemodel/PcaModel.hpp
View file @
405eecfd
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
namespace
eos
{
namespace
eos
{
namespace
morphablemodel
{
namespace
morphablemodel
{
// Forward declarations of free functions
// Forward declarations of free functions
:
cv
::
Mat
normalise_pca_basis
(
cv
::
Mat
unnormalised_basis
,
cv
::
Mat
eigenvalues
);
cv
::
Mat
normalise_pca_basis
(
cv
::
Mat
unnormalised_basis
,
cv
::
Mat
eigenvalues
);
cv
::
Mat
unnormalise_pca_basis
(
cv
::
Mat
normalised_basis
,
cv
::
Mat
eigenvalues
);
cv
::
Mat
unnormalise_pca_basis
(
cv
::
Mat
normalised_basis
,
cv
::
Mat
eigenvalues
);
...
@@ -265,7 +265,7 @@ private:
...
@@ -265,7 +265,7 @@ private:
template
<
class
Archive
>
template
<
class
Archive
>
void
serialize
(
Archive
&
archive
)
void
serialize
(
Archive
&
archive
)
{
{
archive
(
mean
,
normalised_pca_basis
,
unnormalised_pca_basis
,
eigenvalues
,
triangle_list
);
archive
(
CEREAL_NVP
(
mean
),
CEREAL_NVP
(
normalised_pca_basis
),
CEREAL_NVP
(
unnormalised_pca_basis
),
CEREAL_NVP
(
eigenvalues
),
CEREAL_NVP
(
triangle_list
)
);
// Note: If the files are too big, We could split this in save/load, only
// Note: If the files are too big, We could split this in save/load, only
// store one of the bases, and calculate the other one when loading.
// store one of the bases, and calculate the other one when loading.
};
};
...
...
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