diff --git a/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2.h b/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2.h index bde7a2e30af..b8566fe2d64 100644 --- a/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2.h +++ b/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2.h @@ -92,7 +92,7 @@ namespace Barycentric_coordinates { const PointRange& polygon, const PointRange& seeds, OutIterator c_begin, - const GeomTraits& /* traits */, // TODO: we should involve it in the code! + const GeomTraits& traits, const typename GeomTraits::FT max_edge_length = typename GeomTraits::FT(1) / typename GeomTraits::FT(100)) { @@ -102,10 +102,11 @@ namespace Barycentric_coordinates { Harmonic_coordinates_2; using FT = typename GeomTraits::FT; - Domain domain(polygon); + Domain domain(polygon, traits); domain.create(max_edge_length, seeds); - Harmonic_coordinates_2 harmonic_coordinates_2(polygon, domain); + Harmonic_coordinates_2 harmonic_coordinates_2( + polygon, domain, traits); harmonic_coordinates_2.compute(); std::vector coordinates; diff --git a/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/description.txt b/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/description.txt index dbbbb323268..5a9bf042b94 100644 --- a/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/description.txt +++ b/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/description.txt @@ -1 +1 @@ -Generalized Barycentric Coordinates for 2D polygons and 3D polyhedra. +Generalized Barycentric Coordinates for planar simple polygons. diff --git a/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/long_description.txt b/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/long_description.txt index 3171d01c069..ce2bf5badde 100644 --- a/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/long_description.txt +++ b/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/long_description.txt @@ -1,4 +1,4 @@ This package offers an efficient and robust implementation of various -Generalized Barycentric Coordinates defined for 2D polygons and 3D polyhedra. +Generalized Barycentric Coordinates defined for planar simple polygons. If coordinates with respect to multivariate scattered 2D points are required, please refer to Natural Neighbor Coordinates from the package 2D and Surface Function Interpolation. diff --git a/Barycentric_coordinates_2/todo.md b/Barycentric_coordinates_2/todo.md index acc86aecb28..601e61189b5 100644 --- a/Barycentric_coordinates_2/todo.md +++ b/Barycentric_coordinates_2/todo.md @@ -6,8 +6,6 @@ * Why the 2D mesher does not generate boundary points exactly on the polygon boundary but only with the precision 10^-5? * Should we remove tables? Are not they redundant? -* Add 3D coordinates. * Merge this package with the natural neighbor coordinates package. * Improve the solver interface and make it a parameter for the harmonic coordinates class. * Add a demo with visualization of the coordinate functions. -* Rename examples and tests to keep track of 2D and 3D versions. \ No newline at end of file diff --git a/Documentation/doc/biblio/cgal_manual.bib b/Documentation/doc/biblio/cgal_manual.bib index 8c8addd0084..090950901b0 100644 --- a/Documentation/doc/biblio/cgal_manual.bib +++ b/Documentation/doc/biblio/cgal_manual.bib @@ -2847,6 +2847,22 @@ ADDRESS = "Saarbr{\"u}cken, Germany" url = {https://igl.ethz.ch/projects/ARAP/} } +@book{cgal:bc:hs-gbcicg-17, + Author = {K. Hormann and N. Sukumar}, + Publisher = {Taylor \& Fancis, {CRC} Press}, + Title = {Generalized Barycentric Coordinates in Computer Graphics and Computational Mechanics}, + Year = {2017} +} + +@article{cgal:bc:jmdgs-hcfca-07, + Author = {P. Joshi and M. Meyer and T. DeRose and B. Green and T. Sanocki}, + Journal = {ACM Transactions on Graphics}, + Number = {3}, + Title = {Harmonic Coordinates for Character Articulation}, + Volume = {26}, + Year = {2007} +} + @book{cgal:bc:m-dbc-27, Address = {Leipzig}, Author = {A. F. M{\"o}bius},