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
cee22f28
Commit
cee22f28
authored
Nov 27, 2016
by
Patrik Huber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed missing lambda, changed dist_thresh to 180 for the occluding landmark fitting
parent
e885b1b3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
include/eos/fitting/fitting.hpp
include/eos/fitting/fitting.hpp
+2
-2
No files found.
include/eos/fitting/fitting.hpp
View file @
cee22f28
...
...
@@ -331,7 +331,7 @@ std::pair<render::Mesh, fitting::RenderingParameters> fit_shape_and_pose(const m
auto
contour_landmarks_
=
core
::
filter
(
landmarks
,
contour_landmarks
.
right_contour
);
std
::
for_each
(
begin
(
contour_landmarks_
),
end
(
contour_landmarks_
),
[
&
occluding_contour_landmarks
](
auto
&&
lm
)
{
occluding_contour_landmarks
.
push_back
({
lm
.
coordinates
[
0
],
lm
.
coordinates
[
1
]
});
});
}
auto
edge_correspondences
=
fitting
::
find_occluding_edge_correspondences
(
current_mesh
,
edge_topology
,
rendering_params
,
occluding_contour_landmarks
);
auto
edge_correspondences
=
fitting
::
find_occluding_edge_correspondences
(
current_mesh
,
edge_topology
,
rendering_params
,
occluding_contour_landmarks
,
180.0
f
);
image_points
=
fitting
::
concat
(
image_points
,
edge_correspondences
.
first
);
vertex_indices
=
fitting
::
concat
(
vertex_indices
,
edge_correspondences
.
second
);
...
...
@@ -350,7 +350,7 @@ std::pair<render::Mesh, fitting::RenderingParameters> fit_shape_and_pose(const m
// Estimate the PCA shape coefficients with the current blendshape coefficients:
Mat
mean_plus_blendshapes
=
morphable_model
.
get_shape_model
().
get_mean
()
+
blendshapes_as_basis
*
Mat
(
blendshape_coefficients
);
pca_shape_coefficients
=
fitting
::
fit_shape_to_landmarks_linear
(
morphable_model
,
affine_from_ortho
,
image_points
,
vertex_indices
,
mean_plus_blendshapes
,
3.0
f
);
pca_shape_coefficients
=
fitting
::
fit_shape_to_landmarks_linear
(
morphable_model
,
affine_from_ortho
,
image_points
,
vertex_indices
,
mean_plus_blendshapes
,
lambda
);
// Estimate the blendshape coefficients with the current PCA model estimate:
current_pca_shape
=
morphable_model
.
get_shape_model
().
draw_sample
(
pca_shape_coefficients
);
...
...
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