Commit e05ae713 authored by Patrik Huber's avatar Patrik Huber

Renamed ibug2did.txt to ibug_to_sfm.txt

'did' was only really an external thing, so naming it "SFM" is more clear!

Renamed all references to "ibug2did" to "ibug_to_sfm".
parent 4c6eebec
...@@ -123,7 +123,7 @@ int main(int argc, char *argv[]) ...@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
"an input image") "an input image")
("landmarks,l", po::value<fs::path>(&landmarksfile)->required()->default_value("data/image_0010.pts"), ("landmarks,l", po::value<fs::path>(&landmarksfile)->required()->default_value("data/image_0010.pts"),
"2D landmarks for the image, in ibug .pts format") "2D landmarks for the image, in ibug .pts format")
("mapping,p", po::value<fs::path>(&mappingsfile)->required()->default_value("../share/ibug2did.txt"), ("mapping,p", po::value<fs::path>(&mappingsfile)->required()->default_value("../share/ibug_to_sfm.txt"),
"landmark identifier to model vertex number mapping") "landmark identifier to model vertex number mapping")
("output,o", po::value<fs::path>(&outputfile)->required()->default_value("out"), ("output,o", po::value<fs::path>(&outputfile)->required()->default_value("out"),
"basename for the output rendering and obj files") "basename for the output rendering and obj files")
......
...@@ -151,7 +151,7 @@ int main(int argc, char *argv[]) ...@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
"an input image") "an input image")
("landmarks,l", po::value<fs::path>(&landmarksfile)->required()->default_value("data/image_0010.pts"), ("landmarks,l", po::value<fs::path>(&landmarksfile)->required()->default_value("data/image_0010.pts"),
"2D landmarks for the image, in ibug .pts format") "2D landmarks for the image, in ibug .pts format")
("mapping,p", po::value<fs::path>(&mappingsfile)->required()->default_value("../share/ibug2did.txt"), ("mapping,p", po::value<fs::path>(&mappingsfile)->required()->default_value("../share/ibug_to_sfm.txt"),
"landmark identifier to model vertex number mapping") "landmark identifier to model vertex number mapping")
("model-contour,c", po::value<fs::path>(&contourfile)->required()->default_value("../share/model_contours.json"), ("model-contour,c", po::value<fs::path>(&contourfile)->required()->default_value("../share/model_contours.json"),
"file with model contour indices") "file with model contour indices")
......
...@@ -117,11 +117,11 @@ struct ModelContour ...@@ -117,11 +117,11 @@ struct ModelContour
* This class holds 2D image contour landmark information. More specifically, * This class holds 2D image contour landmark information. More specifically,
* it defines which 2D landmark IDs correspond to the right contour and which * it defines which 2D landmark IDs correspond to the right contour and which
* to the left. These definitions are loaded from a file, for example from * to the left. These definitions are loaded from a file, for example from
* the "contour_landmarks" part of share/ibug2did.txt. * the "contour_landmarks" part of share/ibug_to_sfm.txt.
* *
* Note: Better names could be ContourDefinition or ImageContourLandmarks, to * Note: Better names could be ContourDefinition or ImageContourLandmarks, to
* disambiguate 3D and 2D landmarks? * disambiguate 3D and 2D landmarks?
* Todo: I think this should go into the LandmarkMapper. Isn't it part of ibug2did.txt already? * Todo: I think this should go into the LandmarkMapper. Isn't it part of ibug_to_sfm.txt already?
*/ */
struct ContourLandmarks struct ContourLandmarks
{ {
...@@ -135,7 +135,7 @@ struct ContourLandmarks ...@@ -135,7 +135,7 @@ struct ContourLandmarks
/** /**
* Helper method to load contour landmarks from a text file with landmark * Helper method to load contour landmarks from a text file with landmark
* mappings, like ibug2did.txt. * mappings, like ibug_to_sfm.txt.
* *
* @param[in] filename Filename to a landmark-mapping file. * @param[in] filename Filename to a landmark-mapping file.
* @return A ContourLandmarks instance with loaded 2D contour landmarks. * @return A ContourLandmarks instance with loaded 2D contour landmarks.
......
...@@ -170,7 +170,7 @@ PYBIND11_PLUGIN(eos) { ...@@ -170,7 +170,7 @@ PYBIND11_PLUGIN(eos) {
; ;
py::class_<fitting::ContourLandmarks>(fitting_module, "ContourLandmarks", "Defines which 2D landmarks comprise the right and left face contour.") py::class_<fitting::ContourLandmarks>(fitting_module, "ContourLandmarks", "Defines which 2D landmarks comprise the right and left face contour.")
.def_static("load", &fitting::ContourLandmarks::load, "Helper method to load contour landmarks from a text file with landmark mappings, like ibug2did.txt.", py::arg("filename")) .def_static("load", &fitting::ContourLandmarks::load, "Helper method to load contour landmarks from a text file with landmark mappings, like ibug_to_sfm.txt.", py::arg("filename"))
; ;
py::class_<fitting::ModelContour>(fitting_module, "ModelContour", "Definition of the vertex indices that define the right and left model contour.") py::class_<fitting::ModelContour>(fitting_module, "ModelContour", "Definition of the vertex indices that define the right and left model contour.")
......
...@@ -3,7 +3,7 @@ eos: A lightweight header-only 3D Morphable Model fitting library in modern C++1 ...@@ -3,7 +3,7 @@ eos: A lightweight header-only 3D Morphable Model fitting library in modern C++1
Files in this directory: Files in this directory:
- ibug2did.txt: - ibug_to_sfm.txt:
Mappings from the popular ibug 68-point 2D facial landmarks markup to Mappings from the popular ibug 68-point 2D facial landmarks markup to
Surrey Face Model indices. Surrey Face Model indices.
...@@ -33,10 +33,10 @@ Files in this directory: ...@@ -33,10 +33,10 @@ Files in this directory:
model, if the points exist here. model, if the points exist here.
- reference_annotated.obj: - reference_annotated.obj:
Visualisation of the landmark points defined in the ibug2did.txt mapping file. Visualisation of the landmark points defined in the ibug_to_sfm.txt mapping file.
* Red: Annotated ibug points that are defined on the reference shape. * Red: Annotated ibug points that are defined on the reference shape.
* Green: Contour vertices from the file model_contours.json. * Green: Contour vertices from the file model_contours.json.
The file ibug2did.txt contains a few more mappings of landmarks that are not present The file ibug_to_sfm.txt contains a few more mappings of landmarks that are not present
in the reference, for example the middle-inner eyebrow points - they are not visualised. in the reference, for example the middle-inner eyebrow points - they are not visualised.
- reference_symmetry.txt: - reference_symmetry.txt:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment