2d5678bc91
Merge pull request #5406 from gdamiand/gsoc2020-basic-viewer-jyang-gdamiand
2021-03-08 09:21:39 +01:00
c8aea1b2bf
Merge remote-tracking branch 'cgal/master'
2021-03-03 18:31:28 +01:00
1a799c533a
Merge pull request #5464 from mglisse/tri2
...
benchmark Delaunay 2d with NewKernel_d
2021-03-03 18:31:17 +01:00
f51ee121db
Merge branch '5.2.x-branch'
...
# Conflicts:
# Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt
# Bounding_volumes/test/Bounding_volumes/CMakeLists.txt
# Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
# Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
# Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt
# Ridges_3/examples/Ridges_3/CMakeLists.txt
# Shape_detection/examples/Shape_detection/CMakeLists.txt
2021-03-03 18:27:54 +01:00
f712a2a3a0
Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
...
Polyhedron demo: Fixes for 5.1
Conflicts:
Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_spheres.vert
Polyhedron/demo/Polyhedron/resources/shader_spheres.vert
2021-03-03 18:27:33 +01:00
3ab3b10d47
Merge pull request #5247 from MaelRL/SDG-Fix_doc-GF
...
Doc improvements for TDS-related classes
2021-03-03 17:38:18 +01:00
7b94457cb7
Merge pull request #5313 from maxGimeno/Surface_sweep-Fix_test_script-maxGimeno
...
Fix bash scripts for some tests
2021-03-03 17:35:44 +01:00
cb8e564ac7
Merge pull request #5349 from afabri/Polyline_simplification-simplify_overlaps-GF
...
2D Polyline simplification: Also simplify overlapping vertex sequences
2021-03-03 17:35:27 +01:00
f1e550fdd2
Merge pull request #5363 from sloriot/Kernel-Oriented_side_extra_operator
...
Add an extra operator to have an exact plane
2021-03-03 17:33:20 +01:00
e82018f68e
Merge pull request #5366 from sloriot/BGL-regul_fct_into_exp_ns
...
Move non-documented experimental function in experimental namespace
2021-03-03 17:33:17 +01:00
962f891702
Merge pull request #5367 from gdamiand/gsoc2020-Surface_mesh_topology-Simplicity-johnmave126
...
Surface Mesh Topology: Test Whether a Closed Curve is Homotopic to a Simple Cycle
2021-03-03 17:33:15 +01:00
fb00e173d6
Merge pull request #5405 from maxGimeno/PMP-Move_operations_for_collision_detector-maxGimeno
...
PMP Move assign for Rigid_triangle_mesh_collision_detection
2021-03-03 17:33:12 +01:00
2f1b1fee6f
Merge pull request #5419 from afabri/SDG-replace_enum-GF
...
SDG_Linf_2: Cast enum to fix warning
2021-03-03 17:33:10 +01:00
bcf3e18c69
Merge pull request #5420 from afabri/Kernel_d-equal_to-GF
...
Kernel_d: Deal with deprecated result_type
2021-03-03 17:33:07 +01:00
3621aaaf3e
Merge pull request #5426 from sgiraudot/PSP-RANSAC-Fix_warnings-GF
...
[PSP/RANSAC] Fix warnings
2021-03-03 17:33:05 +01:00
83244deabb
Merge pull request #5429 from sloriot/PMP-coref_face_patch_init
...
Corefine: always init faces of patches
2021-03-03 17:33:02 +01:00
b1d78a909f
Merge pull request #5433 from sloriot/CGAL-last_bind
...
Remove last bind
2021-03-03 17:32:59 +01:00
22b823f066
Merge pull request #5434 from maxGimeno/Doc-Dont_use_small_caps-maxGimeno
...
Doc: Don't use small caps
2021-03-03 17:32:57 +01:00
dcf9dfd0fe
Merge pull request #5435 from afabri/Intersect_3-fix_isocuboid_plane-GF
...
Intersect_3: Fix Iso_cuboid_3/Plane_3 and Tetrahedon_/Plane_3 intersection using PMP::clip internal function
# Conflicts:
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h
2021-03-03 17:30:04 +01:00
adc8d9b686
Merge pull request #5442 from MaelRL/PMP-stitch_borders_reintroduce_zipping-GF
...
Re-introduce some kind of zipping as a first step to boundary cycle stitching
2021-03-03 17:29:45 +01:00
efc45cb686
Merge pull request #5455 from GilesBathgate/performance-plane-assertions
...
Bypass coplanarity assertion for triangular facets.
2021-03-03 17:29:43 +01:00
0baa38fe31
Merge pull request #5465 from afabri/Distance_3-Tetrahedron_Point-GF
...
Distance_3: Add Point_3/Tetrahedron_3
2021-03-03 17:29:41 +01:00
38b45f79b1
Merge pull request #5468 from sloriot/CGAL-tiny_fixes
...
Mesh_3: various small bug-fixes
2021-03-03 17:29:37 +01:00
c99be40e7a
Merge pull request #5469 from afabri/Box_intersection_d-array-GF
...
Box_intersection_d: Replace built-in array with std::array
2021-03-03 17:29:35 +01:00
f29eb6d90b
Merge pull request #5470 from GilesBathgate/performance-remove-double-simplify
...
Explicitly call simplify after marking bounded volumes
2021-03-03 17:29:32 +01:00
44d36e534f
Merge pull request #5474 from danston/TBB-execution_failures-danston
...
Triangulation_3 and Mesh_3 Timeouts for parallel tests fix
2021-03-03 17:22:18 +01:00
8f9009e793
Merge pull request #5476 from sloriot/PMP-needle_caps_ecm_bug
...
PMP: Remove needles&caps fixes
2021-03-03 17:21:38 +01:00
ea7fa2dada
Merge pull request #5480 from afabri/Filtered_kernel-Document_functor_for_Envelope-GF
...
Kernel_23: Rename internal function and functor
2021-03-03 17:21:35 +01:00
c12d06a7bc
Merge pull request #5483 from danston/OTR-make_move_iterator_fix-danston
...
Kd_tree using vector constructor instead of insert
2021-03-03 17:21:33 +01:00
15263250a4
Merge pull request #5485 from danston/PMP-tbb_exception_fix-danston
...
Use TBB captured exception in PMP
2021-03-03 17:21:31 +01:00
05d0f01fc4
Merge pull request #5487 from sgiraudot/Shape_detection-Disable_long_tests-GF
...
Shape Detection: Disable expensive tests by default
2021-03-03 17:21:27 +01:00
8c3f5ccb93
Merge pull request #5496 from afabri/BGL_fix_hash_openmesh_edge-GF
...
Provide specialization of hash for the edge_descriptor we provide for OpenMesh
2021-03-03 17:21:25 +01:00
da74efdab4
Merge pull request #5497 from afabri/AOS-forcing_value-GF
...
AOS: Compare with nullptr to avoid warning
2021-03-03 17:21:23 +01:00
ab6145babc
Merge pull request #5501 from maxGimeno/CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.2-maxGimeno
...
CMake Fixes when CGAL_Core is disabled (5.2)
2021-03-03 17:20:55 +01:00
19e603fc5f
Merge pull request #5503 from maxGimeno/DIstance-Fix_with_LEDA-maxGimeno
...
Fix compare() with LEDA
2021-03-03 17:18:14 +01:00
fd353e84e9
Merge pull request #5509 from sloriot/PMP-coref_robust_side_of
...
Robustify internal side-of-triangle-mesh calls
2021-03-03 17:18:11 +01:00
665551f635
Merge branch '5.1.x-branch' into 5.2.x-branch
2021-03-03 17:14:39 +01:00
4e7c6ab208
Merge pull request #5313 from maxGimeno/Surface_sweep-Fix_test_script-maxGimeno
...
Fix bash scripts for some tests
2021-03-03 17:10:28 +01:00
d8c294e4e9
Merge pull request #5366 from sloriot/BGL-regul_fct_into_exp_ns
...
Move non-documented experimental function in experimental namespace
2021-03-03 17:10:25 +01:00
ecdfdc031f
Merge pull request #5419 from afabri/SDG-replace_enum-GF
...
SDG_Linf_2: Cast enum to fix warning
2021-03-03 17:10:23 +01:00
fa2e02ad12
Merge pull request #5420 from afabri/Kernel_d-equal_to-GF
...
Kernel_d: Deal with deprecated result_type
2021-03-03 17:10:20 +01:00
45373bef84
Merge pull request #5426 from sgiraudot/PSP-RANSAC-Fix_warnings-GF
...
[PSP/RANSAC] Fix warnings
2021-03-03 17:10:18 +01:00
325436540f
Merge pull request #5429 from sloriot/PMP-coref_face_patch_init
...
Corefine: always init faces of patches
2021-03-03 17:10:16 +01:00
6f8f36462f
Merge pull request #5433 from sloriot/CGAL-last_bind
...
Remove last bind
2021-03-03 17:10:13 +01:00
3c3dad3243
Merge pull request #5435 from afabri/Intersect_3-fix_isocuboid_plane-GF
...
Intersect_3: Fix Iso_cuboid_3/Plane_3 and Tetrahedon_/Plane_3 intersection
2021-03-03 16:56:31 +01:00
b5e6ef261f
Merge pull request #5442 from MaelRL/PMP-stitch_borders_reintroduce_zipping-GF
...
Re-introduce some kind of zipping as a first step to boundary cycle stitching
2021-03-03 16:39:54 +01:00
d4c331cd37
Merge pull request #5468 from sloriot/CGAL-tiny_fixes
...
Mesh_3: various small bug-fixes
2021-03-03 16:39:52 +01:00
a9ef9c5aeb
Merge pull request #5469 from afabri/Box_intersection_d-array-GF
...
Box_intersection_d: Replace built-in array with std::array
2021-03-03 16:39:49 +01:00
11e3c689ed
Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
...
Polyhedron demo: Fixes for 5.1
2021-03-03 16:39:47 +01:00
e8a1e05202
Merge pull request #5474 from danston/TBB-execution_failures-danston
...
Triangulation_3 and Mesh_3 Timeouts for parallel tests fix
2021-03-03 16:39:31 +01:00
Laurent Rineau