Commit Graph

5290 Commits

Author SHA1 Message Date
Sébastien Loriot 640910288b Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-16 14:18:17 +01:00
Laurent Rineau a5052f4cd8 Merge pull request #6835 from MaelRL/CGAL-Clean_CMakeLists.txt-GF
Some CMakeLists.txts cleaning
2023-02-16 10:52:29 +01:00
Laurent Rineau d33d71a4e0 Merge pull request #7125 from MaelRL/PMP-flip_criterion-GF
Modify flipping criteria in PMP::isotropic_remeshing and PMP::refine
2023-02-10 15:40:49 +01:00
Sébastien Loriot 6df265125a finish doc for PMP functions 2023-02-07 15:01:00 +01:00
Sébastien Loriot 9242a810c4 Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-07 11:31:55 +01:00
Sébastien Loriot dbccebf7df clean up doc and API of new property maps 2023-02-06 18:32:41 +01:00
Laurent Rineau 1e4165f1db Merge pull request #7184 from afabri/PMP-longest_border-GF
PMP: Make longest_border() extract_boundary_cycles() coherent
2023-02-02 10:58:25 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Laurent Rineau 5f8930db8c Merge branch '5.5.x-branch'
# Conflicts:
#	Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp
#	Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
#	Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
2023-01-27 21:16:14 +01:00
Laurent Rineau fc61b42864 Merge pull request #6858 from sloriot/Doc-exclude_internal
Ignore internal directories
2023-01-27 21:02:29 +01:00
Laurent Rineau 8a6b583780 Merge pull request #6880 from soesau/PMP-tests_only_for_epeck-soesau
Pmp tests only for epeck
2023-01-27 21:02:26 +01:00
Laurent Rineau 122141dda6 Merge pull request #7076 from MaelRL/PMP-Improve_normal_doc-GF
Improve documentation of PMP::compute_vertex_normal()
2023-01-27 21:02:24 +01:00
Laurent Rineau 36bc3d1154 Merge pull request #7126 from sloriot/PMP-repair_si_no_smooth_by_default
Make smooth an option that is OFF by default
2023-01-27 20:52:29 +01:00
Laurent Rineau 119cea4add Merge pull request #7127 from sloriot/PMP-cond_assert
Conditional assertions
2023-01-27 20:52:27 +01:00
Sébastien Loriot ee246c87c5 fix function name and add missing constructor 2023-01-25 17:08:27 +01:00
Andreas Fabri 35ffe120e1 fix merge conflict 2023-01-24 10:41:22 +00:00
Mael 86ec9ce186
Fix indentation 2023-01-20 22:28:05 +01:00
Sébastien Loriot cd76994056 rename property map and deprecated old name 2023-01-18 13:45:37 +01:00
Mael d67d7cd4b6
Remove extra `to_double` 2023-01-18 11:15:17 +01:00
Sebastien Loriot 343735b9d7
missing return 2023-01-17 09:58:38 +01:00
Sébastien Loriot 6a7bd8b0e3 fix angle return type 2023-01-16 19:47:25 +01:00
albert-github 9c2f8ff60e Spelling correction in respect to function / variable names
As indicated in #7041 (Spelling corrections) theer were still some open corrections in respect to variables / functions, these have been addressed heer.
2023-01-13 18:51:28 +01:00
Andreas Fabri 7305e1bb38 Fix typo (thank you Albert) 2023-01-12 17:29:30 +00:00
Andreas Fabri c8b8792275 PMP: Guarantee that the longest_border() halfedge is among extract_boundary_cycles() 2023-01-12 17:01:19 +00:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Mael Rouxel-Labbé 5e101566fb Remove obsolete typedefs 2023-01-02 10:34:27 +01:00
Sébastien Loriot 898142d739 wrong type 2022-12-22 09:49:35 +01:00
Sébastien Loriot f993ad50c9 conditions of inconsistenit_classification() also apply to assertions 2022-12-19 17:43:12 +01:00
Sébastien Loriot f372bbe7c2 make smooth an option that is OFF by default 2022-12-19 14:35:16 +01:00
Mael Rouxel-Labbé 70efea3bcb Tiny code modernization 2022-12-16 16:28:53 +01:00
Mael Rouxel-Labbé 92bd00f612 Change PMP::refine() is_flippable criterion
The current criterion is some kind of Delaunay ball, which might work OK
for flat regions, but can produce super thin wedges (see issue:
https://github.com/CGAL/cgal/issues/6982) when the mesh is not flat.

The criterion used instead is the one used in PMP::isotropic_remeshing
and PMP::remove_almost_degenerate_faces(), which is the typical angle-based
surface Delaunay criterion.
2022-12-16 16:26:43 +01:00
Mael Rouxel-Labbé 52fc2ffdd4 Change criterion used in "should_flip"
The criterion that takes the scalar_product of the cross products
is maybe adapted to minimize the curvature when triangulating faces,
but should_flip() is used in PMP::isotropic_remeshing, (soon) PMP::refine(),
and PMP::remove_almost_degenerate_faces(). These algorithms aim to
produce well-shaped elements. The criterion is not adapted to these
algorithms: for example, on a flat mesh the scalar product is meaningless
so it will pick the diagonal which maximizes the product of the lengths
and product of sines, but this might create very anisotropic elements
since the sine of obtuse angles is still positive.

The "new" criterion is simply the criterion used in mesh smoothing
and the typical Delaunay criterion for surfaces.
2022-12-16 16:21:46 +01:00
Mael Rouxel-Labbé a798fb6803 Minor example improvements 2022-12-16 16:20:25 +01:00
Laurent Rineau f1e1878b8d
Merge pull request #7094 from afabri/PMP_named_parameters-GF
PMP: Replace parameter with named parameter
2022-12-16 10:52:17 +01:00
Sébastien Loriot 069e43a5da remove specific internal exclude list (covered with the general one) 2022-12-15 10:20:45 +01:00
Laurent Rineau c419f52799 Merge pull request #7103 from sloriot/PMP-repair_si_conditional_smoothing
Do not apply smoothing if the CC has some degenerate faces
2022-12-14 10:39:48 +01:00
Laurent Rineau f3e0f45054 Merge pull request #7108 from afabri/PMP-Envelope_warning-GF
PMP: Fix for a -Wmaybe-uninitialized
2022-12-14 10:39:45 +01:00
Laurent Rineau 46b1d230f5 Merge pull request #7103 from sloriot/PMP-repair_si_conditional_smoothing
Do not apply smoothing if the CC has some degenerate faces
2022-12-14 10:18:21 +01:00
Laurent Rineau 2b71438c04 Merge pull request #7108 from afabri/PMP-Envelope_warning-GF
PMP: Fix for a -Wmaybe-uninitialized
2022-12-14 10:18:19 +01:00
Andreas Fabri 39ebebdb5b merge master 2022-12-08 16:49:09 +00:00
Sebastien Loriot f5c41bd712
Merge pull request #7022 from MaelRL/Weights-v2.0-GF-master
Weights fixes (master)
2022-12-08 15:22:19 +01:00
Sebastien Loriot b9a87af07e
Merge pull request #7023 from MaelRL/Weights-v2.0-GF-5.5.x
Weights fixes (5.5.x)
2022-12-08 15:21:58 +01:00
Sebastien Loriot fa72ad2ad0
Merge pull request #6977 from MaelRL/Weights-v2.0-GF
Weights fixes (5.4.x)
2022-12-08 15:21:43 +01:00
Andreas Fabri 9159816fb4 PMP: Fix for a -Wmaybe-uninitialized 2022-12-07 08:02:35 +00:00
Mael 0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113 2022-12-06 22:21:06 +01:00
Mael db81e4a3fb
Further clarify doc 2022-12-06 22:13:05 +01:00
Andreas Fabri 1adb13edc8 Do not use deprecated functions 2022-12-06 12:34:26 +00:00
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01:00
Laurent Rineau 90f6546d77 Merge pull request #7069 from sloriot/PMP-split_repair_5.5
Split repair
2022-12-05 13:50:25 +01:00
Laurent Rineau 42c8c4f9e1 Merge pull request #7070 from sloriot/PMP-split_repair
Split repair (master version)
2022-12-05 12:23:19 +01:00