# Resolved conflicts:
#	include/eos/fitting/RenderingParameters.hpp
#	include/eos/fitting/contour_correspondence.hpp

It uses pose, shape, blendshapes and contour fitting.

It fits pose and shape, uses front-facing contour as well as occluding contour fitting. It can iterate (alternate) the pose and shape fitting.
A simpler overload exists with less parameters and reasonable defaults.

Also removed unnecessary model_points vector

The function was often already called with degrees, not radians, so this resulted in converting to degree twice. It didn't matter because only a comparison of <0 and >0 was done. But it's fixed and clearly documented now that the function expects the yaw angle in degrees.

This contains a NNLS solver, which we use to solve for the blendshape coefficients.

We have two of these functions now, one for glm::vec3 and one for cv::Vec3f. At some point, this needs clean-up!

This fixes ODR violations of the headers are used in multiple translation units.

Also removed a few unnecessary eos:: namespace qualifiers to have consistent style

Added a description of the file to share/readme

Using nanoflann's kd-tree for fast searching

Fixed previously uninitialised screen_width/height in constructor from ScaledOrthoProjectionParameters

These changes are for the closest edge fitting.