Conflicts:
Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp
There was also two "conceptual conflicts" that git-merge did not see,
in:
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt had to use qt5_wrap_ui instead
of qt4_wrap_ui (that lead to a CMake error), and the declaration of the plugin in
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
was not using the Qt5 way (that lead to a compilation error)
That is a followup of the following two commits. The "polyline CDT" has
been branched from CDT before those patches were in CGAL:
| commit 49404f75f5
| Author: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
| Date: Thu Jun 28 09:16:23 2012 +0000
|
| Improved patch
|
| The Constraint_hierarchy is now templated by T, an anonymous type (that is
| a Vertex_handle when the constraint hierarchy is used in Ct_plus_2), and a
| Compare operator, that have a comparison member function:
| bool operator()(T, T);
|
| In Ct_plus_2, the Compare operator passed to the Constraint_hierarchy
| compares the vertices with a Less_xy_2, implemented by Less_x_2, and
| Less_y_2.
|
| The test test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h has been
| tweaked, to check that the type T passed in the hierarchy no longer needs
| to have a point() member function, as it was before May 2010 (when GF has
| determinized the Cdt_plus_2 using too simple patch).
|
| Notes:
| r70132 branches/features/Triangulation_2_UseTraitsInHierarchy-GF
| commit 7cb640d05d
| Author: Andreas Fabri <Andreas.Fabri@geometryfactory.com>
| Date: Mon Jun 25 10:11:56 2012 +0000
|
| The Constraint_hierarchy_2 gets an additional LessXY_2 functor as template argument so that it no longer applies operator<(Point,Point)
|
| Notes:
| r70018 branches/features/Triangulation_2_UseTraitsInHierarchy-GF
to do so, use the Dispatch_output_iterator
- Constrained Voronoi diagram is now a class that has a pointer to a CDT
as member. We don't need an extra CDT anymore
- update examples
- also update the CDT 2 demo to see Voronoi cells, that are only valid when the
triangulation is Delaunay (constrained or not)
- in DT2, it returns the Voronoi cell as a Polygon_2
- in CDT2, it returns the - possibly clipped - "bounded Voronoi cell"
see Seidel1988 or http://hal.inria.fr/docs/00/54/68/79/PDF/centroidal-vd.pdf
also add an example that computes the full BVD
Laurent Rineau
Sébastien Loriot
Andreas Fabri
Jane Tournois