Merge remote-tracking branch 'cgal/master' into Tet_remeshing-with_si…

…zing_field-jtournois # Conflicts: # Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h
CGAL · Nov 21, 2023 · 55780bf · 55780bf
2 parents ede299e + 5c62ae4
commit 55780bf
Show file tree

Hide file tree

Showing 99 changed files with 13,799 additions and 789 deletions.
diff --git a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
@@ -5,7 +5,7 @@
 
 #include <CGAL/config.h>
 
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <boost/property_map/vector_property_map.hpp>
 
 #include <CGAL/graph_traits_Arrangement_2.h>

diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp
@@ -5,7 +5,7 @@
 #include <CGAL/Arr_extended_dcel.h>
 #include <CGAL/Arrangement_2.h>
 
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include <CGAL/graph_traits_dual_arrangement_2.h>
 

diff --git a/BGL/examples/BGL_arrangement_2/primal.cpp b/BGL/examples/BGL_arrangement_2/primal.cpp
@@ -8,7 +8,7 @@
 #include <CGAL/graph_traits_Arrangement_2.h>
 #include <CGAL/Arr_vertex_index_map.h>
 
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include <CGAL/property_map.h>
 

diff --git a/BGL/examples/BGL_triangulation_2/dijkstra.cpp b/BGL/examples/BGL_triangulation_2/dijkstra.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <CGAL/boost/graph/graph_traits_Triangulation_2.h>
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include <fstream>
 

diff --git a/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp b/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp
@@ -4,7 +4,7 @@
 #include <CGAL/Triangulation_vertex_base_with_id_2.h>
 
 #include <CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h>
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include <fstream>
 

diff --git a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h b/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
diff --git a/Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h b/Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h
@@ -102,12 +102,14 @@ collinearC3(const FT &px, const FT &py, const FT &pz,
   FT dqx = qx-rx;
   FT dpy = py-ry;
   FT dqy = qy-ry;
-  if (sign_of_determinant(dpx, dqx, dpy, dqy) != ZERO)
+
+  auto is_zero = sign_of_determinant(dpx, dqx, dpy, dqy) == ZERO;
+  if (certainly_not(is_zero))
       return false;
   FT dpz = pz-rz;
   FT dqz = qz-rz;
-  return CGAL_AND( sign_of_determinant(dpx, dqx, dpz, dqz) == ZERO ,
-                   sign_of_determinant(dpy, dqy, dpz, dqz) == ZERO );
+      return is_zero & CGAL_AND( sign_of_determinant(dpx, dqx, dpz, dqz) == ZERO ,
+                                 sign_of_determinant(dpy, dqy, dpz, dqz) == ZERO );
 }
 
 template < class FT >

diff --git a/Documentation/doc/CMakeLists.txt b/Documentation/doc/CMakeLists.txt
@@ -263,7 +263,7 @@ set(CGAL_DOC_DXY_DIR "${CMAKE_BINARY_DIR}/doc_dxy")
 file(MAKE_DIRECTORY "${CGAL_DOC_DXY_DIR}")
 
 #Setting the resource directory depending on the version of doxygen
-set(CGAL_DOC_RESOURCE_DIR_DEFAULT "${CMAKE_CURRENT_LIST_DIR}/resources/1.9.6")
+set(CGAL_DOC_RESOURCE_DIR_DEFAULT "${CMAKE_CURRENT_LIST_DIR}/resources/1.10.0")
 
 #  first look if resources for the specific doxygen version is available, fallback
 #  on the default otherwise

diff --git a/Documentation/doc/biblio/cgal_manual.bib b/Documentation/doc/biblio/cgal_manual.bib
@@ -1341,6 +1341,29 @@ @article{cgal:lm-clscm-12
     year = {2012},
 }
 
+@article{cgal:lrtc-iccmps-20,
+  author = {Jacques-Olivier Lachaud and Pascal Romon and Boris Thibert and David Coeurjolly},
+  journal = {Computer Graphics Forum (Proceedings of Symposium on Geometry Processing)},
+  number = {5},
+  title = {Interpolated Corrected Curvature Measures for Polygonal Surfaces},
+  volume = {39},
+  month = aug,
+  year = {2020},
+  url = {https://doi.org/10.1111/cgf.14067},
+  doi = {10.1111/cgf.14067}
+}
+
+@article{cgal:lrt-ccm-22,
+  author = {Jacques-Olivier Lachaud and Pascal Romon and Boris Thibert},
+  journal = {Discrete & Computational Geometry},
+  title = {Corrected Curvature Measures},
+  volume = {68},
+  pages = {477-524},
+  month = jul,
+  year = {2022},
+  url = {https://doi.org/10.1007/s00454-022-00399-4}
+}
+
 @inproceedings{ cgal:lt-fmeps-98,
     author = "Peter Lindstrom and Greg Turk",
     title = "Fast and memory efficient polygonal simplification",
@@ -3083,6 +3106,16 @@ @article{ecvp-bhhhk-14
   bibsource = {dblp computer science bibliography, https://dblp.org/}
 }
 
+@inproceedings {dunyach2013curvRemesh,
+  booktitle = {Eurographics 2013 - Short Papers},
+  title = {{Adaptive Remeshing for Real-Time Mesh Deformation}},
+  author = {Dunyach, Marion and Vanderhaeghe, David and Barthe, Loïc and Botsch, Mario},
+  year = {2013},
+  publisher = {The Eurographics Association},
+  ISSN = {1017-4656},
+  DOI = {10.2312/conf/EG2013/short/029-032}
+}
+
 @book{botsch2010PMP,
   title={Polygon mesh processing},
   author={M. Botsch and L. Kobbelt and M. Pauly and P. Alliez and B. L{\'e}vy},