Commit Graph

1019 Commits

Author SHA1 Message Date
Simon Giraudot 1b900e8b86 Update with reviews 2020-01-15 12:46:53 +01:00
Simon Giraudot 475e9fdec6 Update with reviews 2019-07-25 09:16:16 +02:00
Simon Giraudot c06c778ca9 Move MaxFlow back to segmentation and fix documentation 2019-07-23 09:21:20 +02:00
Simon Giraudot 497c121e55 Finalize API of alpha expansion + doc 2019-07-23 08:43:17 +02:00
Sébastien Loriot c411ae69d0 Merge pull request #2951 from kkatrio/PMP-smoothing-kkatrio
PMP: Mesh and shape smoothing
2019-07-18 16:49:05 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF
PMP: Add locate.h and rewrite Triangulation_2 graph traits
2019-07-18 16:40:49 +02:00
Mael 47c247ae72
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-10 15:36:25 +02:00
Mael Rouxel-Labbé a4fc736001 Merge branch 'BGL-Tiny_is_valid_fix-GF' into BGL-Tiny_is_valid_fix-GF-5.0 2019-07-04 14:00:30 +02:00
Mael Rouxel-Labbé 43a08f5303 Give in to the 'goto' censorship bureau's pressures 2019-07-04 13:47:57 +02:00
Mael Rouxel-Labbé 2592d6b0bd Fix is_valid_pm verbosity
Some error messages were not printed. Some messages were printed too much
(since as soon as 'valid' was wrong, everything below was printed, even
if the test was not actually failing).
2019-07-04 09:04:28 +02:00
Mael Rouxel-Labbé 0d1759e996 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-06-20 15:02:32 +02:00
Mael Rouxel-Labbé 7a5486962d Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-20 14:49:25 +02:00
Mael Rouxel-Labbé 77711e4e71 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-06-19 11:34:48 +02:00
Mael Rouxel-Labbé 22bd8a943b Merge smooth_areas and smooth_angles, rework AABB tree, document everything 2019-06-18 16:02:42 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Mael Rouxel-Labbé 19de8eda04 Merge branch 'PMP-Generalize_keep_largest_CC-GF-old' into PMP-Generalize_keep_largest_CC-GF 2019-06-17 15:18:33 +02:00
Laurent Rineau be0d07d150 Merge pull request #3979 from afabri/CGAL-null_ptr-GF
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Laurent Rineau 96912aaa20 Merge branch 'releases/CGAL-4.14-branch' 2019-06-17 13:53:42 +02:00
Laurent Rineau 377d707dfe Merge pull request #3996 from sloriot/BGL-split_fix_fct_pos
Put declaration before the call to the function
2019-06-17 13:51:31 +02:00
Sébastien Loriot d6fe7d485a add declaration before usage 2019-06-13 07:44:58 +02:00
Mael Rouxel-Labbé 6c4d873338 Get rid of the explicit curvature flow smoothing scheme
It's just worse all the time anyway
2019-06-07 10:27:21 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Mael Rouxel-Labbé 6e3f2c3510 Factorize smoothers and clean obsolete code 2019-05-29 15:59:50 +02:00
Mael Rouxel-Labbé ea7885e348 Add new named parameter: use_safety_constraints
Used in PMP::smooth_areas() / PMP::smooth_angles()
2019-05-24 13:32:18 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Mael Rouxel-Labbé a120290675 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-05-15 14:31:00 +02:00
Mael c53e7e2c68
Merge branch 'master' into PMP-Locate-GF 2019-05-15 07:59:52 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau 423c4fbd11 Merge pull request #3266 from MaelRL/PMP-Snap_boundary-GF
PMP: boundary snapping
2019-05-14 16:48:00 +02:00
Laurent Rineau fee84ae228 Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
2019-05-14 16:44:02 +02:00
Laurent Rineau b7bb3f74ac Merge pull request #3858 from MaelRL/BGL-Fix_is_valid_polygon_mesh-GF
BGL: Fix is_valid_polygon_mesh not breaking away from potential infinite loops
2019-05-14 16:26:19 +02:00
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Laurent Rineau d5b2621076 Merge pull request #3858 from MaelRL/BGL-Fix_is_valid_polygon_mesh-GF
BGL: Fix is_valid_polygon_mesh not breaking away from potential infinite loops
2019-05-14 16:15:29 +02:00
Mael Rouxel-Labbé 0528592011 Fix cyclical header dependencies 2019-05-10 12:41:01 +02:00
Mael Rouxel-Labbé 1e9ca61fba Doc fixes 2019-05-10 11:45:49 +02:00
Mael Rouxel-Labbé 408ebbb784 Dependency fixes 2019-05-10 11:44:58 +02:00
Mael Rouxel-Labbé 75f9c7798e Add a forward declaration 2019-05-09 08:06:10 +02:00
Mael Rouxel-Labbé d4ad35b136 Resolve conflicts between 4.13 branch and master 2019-05-09 07:56:38 +02:00
Mael Rouxel-Labbé 9664d8f774 Whether coordinate snapping is used or not is now a named parameter 2019-05-08 18:20:32 +02:00
Mael Rouxel-Labbé f14f9ce447 Move some functions from PMP to BGL 2019-05-08 16:05:26 +02:00
Mael Rouxel-Labbé 9e8524c29e Rename BGL/polyhedra.h to BGL/generators.h 2019-05-08 15:16:25 +02:00
Mael Rouxel-Labbé 1e21492b9e Extract polyhedron genetion functions from helpers.h into a new header 2019-05-08 14:37:03 +02:00
Laurent Rineau 130c766d1e Merge branch 'releases/CGAL-4.14-branch' into Mesh_3-stop_during_protection-lrineau 2019-05-06 16:21:52 +02:00
Mael 21ebdb737c
Merge branch 'master' into PMP-Snap_boundary-GF 2019-05-06 15:53:56 +02:00
Laurent Rineau d466ea50cd Merge pull request #3884 from MaelRL/BGL-Fix_FFG_master-GF
BGL: Fix `Face_filtered_graph`'s `is_selection_valid()` (5.0)
2019-05-06 15:30:33 +02:00
Laurent Rineau c9beac61ca Merge pull request #3862 from MaelRL/BGL-Fix_is_valid_selection-GF
BGL: Fix `Face_filtered_graph`'s `is_selection_valid()`
2019-05-06 15:02:10 +02:00
Mael Rouxel-Labbé af142c7416 Add new named parameter: face_size_map
Used to pass custom maps to keep_large(st)_CCs
2019-05-06 09:00:09 +02:00
Laurent Rineau 8648a72655 Add new Boost Parameter `nonlinear_growth_of_balls` 2019-05-03 15:49:49 +02:00
Mael Rouxel-Labbé ccf98605ab Fix Face_filtered_graph::is_selection_valid() (master) 2019-04-26 09:20:36 +02:00
Sébastien Loriot 564a6c72f4 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-23 10:46:32 +02:00