Merge branch 'devel'
# Resolved conflicts: # include/eos/fitting/RenderingParameters.hpp # include/eos/fitting/contour_correspondence.hpp
Showing
- .gitmodules 6 additions, 0 deletions.gitmodules
- 3rdparty/eigen3-nnls 1 addition, 0 deletions3rdparty/eigen3-nnls
- 3rdparty/nanoflann 1 addition, 0 deletions3rdparty/nanoflann
- CMakeLists.txt 6 additions, 0 deletionsCMakeLists.txt
- examples/CMakeLists.txt 6 additions, 1 deletionexamples/CMakeLists.txt
- examples/fit-model-ceres.cpp 8 additions, 12 deletionsexamples/fit-model-ceres.cpp
- examples/fit-model-simple.cpp 219 additions, 0 deletionsexamples/fit-model-simple.cpp
- examples/fit-model.cpp 65 additions, 38 deletionsexamples/fit-model.cpp
- include/eos/fitting/RenderingParameters.hpp 19 additions, 6 deletionsinclude/eos/fitting/RenderingParameters.hpp
- include/eos/fitting/blendshape_fitting.hpp 93 additions, 4 deletionsinclude/eos/fitting/blendshape_fitting.hpp
- include/eos/fitting/closest_edge_fitting.hpp 398 additions, 0 deletionsinclude/eos/fitting/closest_edge_fitting.hpp
- include/eos/fitting/contour_correspondence.hpp 29 additions, 26 deletionsinclude/eos/fitting/contour_correspondence.hpp
- include/eos/fitting/fitting.hpp 228 additions, 4 deletionsinclude/eos/fitting/fitting.hpp
- include/eos/morphablemodel/EdgeTopology.hpp 110 additions, 0 deletionsinclude/eos/morphablemodel/EdgeTopology.hpp
- include/eos/render/utils.hpp 21 additions, 0 deletionsinclude/eos/render/utils.hpp
- share/readme.txt 4 additions, 0 deletionsshare/readme.txt
- share/sfm_3448_edge_topology.json 81480 additions, 0 deletionsshare/sfm_3448_edge_topology.json
- utils/CMakeLists.txt 5 additions, 0 deletionsutils/CMakeLists.txt
- utils/edgestruct-csv-to-json.cpp 104 additions, 0 deletionsutils/edgestruct-csv-to-json.cpp
Loading
Please register or sign in to comment