Commit Graph

5500 Commits

Author SHA1 Message Date
Sébastien Loriot f730ab30d8 move to out np 2023-03-31 14:39:33 +02:00
Sébastien Loriot cfa8c2954f document the property map version of parameters 2023-03-31 14:39:33 +02:00
Sébastien Loriot e316b3fb04 fix helper 2023-03-31 14:39:33 +02:00
Sébastien Loriot 39b84d0433 fix specialization 2023-03-31 14:39:33 +02:00
Sébastien Loriot 5e4e9a9001 fix warning 2023-03-31 14:39:33 +02:00
Sebastien Loriot a34ada1cfe Apply suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2023-03-31 14:39:33 +02:00
Sébastien Loriot 36e309e677 add example for almost coplanar remeshing 2023-03-31 14:39:33 +02:00
Sébastien Loriot c88b106640 typos. Thanks again Albert! 2023-03-31 14:39:33 +02:00
Sébastien Loriot 4a0671bd21 add user manual for decimate 2023-03-31 14:39:25 +02:00
Mael dce2d9b780
Merge branch 'master' into PMP-Triangulate_PS-GF 2023-03-31 13:21:44 +02:00
Laurent Rineau d3a91046a9 Merge pull request #7276 from afabri/PMP_smooth_scale-GF
PMP:  Add np for not scaling smoothed mesh
2023-03-30 18:04:34 +02:00
Mael Rouxel-Labbé c346b4a836 Avoid repetition 2023-03-29 15:46:42 +02:00
Mael Rouxel-Labbé 8a39016780 Visitor of triangulate_faces must be a visitor of HoleFilling too 2023-03-29 15:30:25 +02:00
Mael Rouxel-Labbé 5a47df6682 Doc fixes, thanks @albert-github 2023-03-29 15:29:10 +02:00
Mael Rouxel-Labbé 77062ed7c2 Move triangulate_polygons()'s default visitor out of internal namespace
so that it is documented
2023-03-29 12:07:57 +02:00
Mael Rouxel-Labbé 962269c03d Add see also's 2023-03-29 12:07:47 +02:00
Mael Rouxel-Labbé 9387f087e0 Refactor to properly forward NPs to triangulate_hole_polyline + other imprvmts 2023-03-29 11:53:27 +02:00
Mael Rouxel-Labbé 4a2d91e03b Document requirements on faces of triangulate_faces/triangulate_polygons 2023-03-29 10:11:04 +02:00
Mael Rouxel-Labbé 1365fac894 Move macro 2023-03-29 10:08:10 +02:00
Mael Rouxel-Labbé 4d03dbe076 Try-Catch the CDT constraint insertions 2023-03-28 22:42:40 +02:00
Mael Rouxel-Labbé f570e0ec2e Enhance tests 2023-03-28 16:53:08 +02:00
Mael Rouxel-Labbé c451b921ef Rename internal functions for consistency 2023-03-28 16:52:48 +02:00
Mael Rouxel-Labbé 123c2513fc Delegate construction of a 2D CDT to hole filling 2023-03-28 16:52:40 +02:00
Mael Rouxel-Labbé 6a0a0267bf Test triangulate_polygons() 2023-03-28 15:16:52 +02:00
Mael Rouxel-Labbé 7b375129fb Document triangulate_polygons() 2023-03-28 15:16:37 +02:00
Mael Rouxel-Labbé 4b2b996e08 Add visitor for triangulate_polygons() 2023-03-28 14:59:26 +02:00
Mael Rouxel-Labbé 51c1e21847 Change ITag to No intersections, and try{}catch() the CDT2 code 2023-03-28 14:58:39 +02:00
Mael Rouxel-Labbé 83e89d85a6 Fix typo 2023-03-28 14:58:22 +02:00
Sébastien Loriot 9166d28c97 do not test twice for self-intersections if there is none 2023-03-28 11:42:49 +02:00
Mael Rouxel-Labbé 20c2df0692 Add triangulate_PS prototype 2023-03-28 09:59:21 +02:00
Sébastien Loriot 21bc3d57c6 fix typo. Thanks Albert! 2023-03-20 13:22:08 +01:00
Sébastien Loriot d89f90055b add example in doc + rephrase 2023-03-20 11:57:40 +01:00
Laurent Rineau 2f0203be10 Merge pull request #7255 from lrineau/CGAL-rename_ctest_test_names-GF
CGAL CTest support: rename the test names

# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
2023-03-15 14:23:32 +01:00
albert-github 2d60f46985 issue #7231 Improvement of layout of refines relations.
- Adjusted cgalRefines according to reviews
- Implemented it in all files
2023-03-14 17:37:50 +01:00
Sébastien Loriot 4387ebecdb regroup the setting of face ids at one place
fix a bug when patch need another remeshing
2023-03-10 09:17:30 +01:00
Sébastien Loriot 33c868818f fix property map for region primitives 2023-03-07 17:55:28 +01:00
Sébastien Loriot d799f48887 remove warnings 2023-03-07 13:41:02 +01:00
Sébastien Loriot 648377f127 fix np name + plug region growing in decimation plugin + change cosinus sign in decimate + update doc 2023-03-02 19:08:10 +01:00
Sébastien Loriot f8cc9e6bd0 rename np 2023-03-02 14:49:17 +01:00
Sébastien Loriot b1d2744821 Merge branch 'master' into PMP-decimation 2023-03-02 14:24:27 +01:00
Laurent Rineau ea016d7f5b Merge pull request #6702 from soesau/Region_growing-revision-soesau
[Small Feature] Region growing revision soesau
2023-03-02 13:42:32 +01:00
Sébastien Loriot 12465a6c40 named parameter to pass normal of patches 2023-02-27 17:13:23 +01:00
Sébastien Loriot c21231cef8 early exit if CDT is not 2D 2023-02-27 15:50:42 +01:00
Sébastien Loriot c4f0456f3a add option in the other function too 2023-02-27 15:26:24 +01:00
Sébastien Loriot 52ff9c4e66 add an option to not triangulate patches 2023-02-27 15:16:13 +01:00
Sébastien Loriot 452c18710c add test for corner and face patch maps + fix not a corner value 2023-02-24 16:19:37 +01:00
Laurent Rineau 5a20fd8567 Merge pull request #7238 from albert-github/feature/bug_author_consistency
Making description of author(s)  of a package consistent
2023-02-24 16:14:43 +01:00
Laurent Rineau a38a3fc93f Merge pull request #7260 from afabri/CGAL-set_but_not_used-GF
Use CGAL_assertion_code()
2023-02-24 16:14:39 +01:00
Laurent Rineau 9a47215a84 Merge pull request #7265 from sloriot/PMP-orient_empty_mesh
Early exit if the mesh is empty
2023-02-24 16:14:34 +01:00
Laurent Rineau 8a3184a1a8 Merge branch '5.4.x-branch' into 5.5.x-branch 2023-02-24 16:13:44 +01:00
Sébastien Loriot c587df44a6 fix correspondance between faces 2023-02-24 14:45:01 +01:00
Sébastien Loriot c90d97635d first version of the demo plugin 2023-02-24 10:41:08 +01:00
Andreas Fabri 4a5ada051a Add to changes.md; Update @see in order to show to non-deprecated function 2023-02-23 11:35:12 +00:00
Mael Rouxel-Labbé f2cb368919 Add tests 2023-02-20 10:08:35 +01:00
Mael Rouxel-Labbé ee13f77810 Various improvements 2023-02-20 10:08:21 +01:00
Andreas Fabri 545009ab7c PMP: Add np for not scaling smoothed mesh 2023-02-19 21:25:25 +00:00
Sébastien Loriot 0c37af1be9 num_faces is not tight 2023-02-16 14:36:58 +01:00
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
Sébastien Loriot e559a238fd typos 2023-02-14 15:47:18 +01:00
Andreas Fabri 35df6522ba Fix some typos 2023-02-14 14:23:12 +00:00
Andreas Fabri 010293a872 Fix some typos 2023-02-14 14:17:04 +00:00
Sébastien Loriot e431c4e481 early exit if the mesh is empty 2023-02-14 14:16:22 +01:00
Sébastien Loriot fbe559adc9 Merge 'cgal/master' into PMP-decimation 2023-02-14 08:33:24 +01:00
Sébastien Loriot b7f7b434b0 more todo clean up 2023-02-14 08:26:40 +01:00
Sébastien Loriot be85f66ef4 remove TODOs 2023-02-14 08:04:02 +01:00
Sébastien Loriot 74b5d05698 fix test 2023-02-13 19:27:59 +01:00
Sébastien Loriot 8d951594b7 add visitor to clear output mesh if needed 2023-02-13 19:03:26 +01:00
Sébastien Loriot 88bb9570c0 implement API update 2023-02-10 16:09:44 +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 7e38151479 add documentation for remeshing functions + update API
code has not been updated yet
2023-02-09 16:31:00 +01:00
Andreas Fabri 3d379c3988 Use CGAL_USE() 2023-02-09 10:29:08 +00:00
Andreas Fabri ff61b977af Add fix in PMP::snap() 2023-02-09 10:01:06 +00: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 6df18b668c CGAL CTest support: rename the test names
Now that CTest test names can contain whitespace, we can have
better looking names. That is also more practicle because we can now
copy-paste the target name in `compilation of  <target_name>`.
2023-02-06 12:04:57 +01:00
albert-github 57e900b47c Making description of author(s) of a package consistent
- use `\cgalPckAuthor` in case of one author
- use of `\cgalPckAuthors` in case of multiple authors
- using in case of multiple authors always `, and `
- in the 1.9.6 `BaseDoxyfile.in` let the `\cgalPckAuthors` point to `\cgalPckAuthor` to get consistent output (not done for other versions as in the past the `ALIASES` could not call one another).
2023-02-02 18:40:44 +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
Sébastien Loriot 9e137bca24 Merge 'cgal/master' 2023-01-31 12:26:55 +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 6e7eda918c remove PCA version 2022-12-23 16:12:33 +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
Mael Rouxel-Labbé a2316e3f21 Minor improvements 2022-12-08 14:38:36 +01:00
Mael Rouxel-Labbé 28663265c6 Merge remote-tracking branch 'cgal/master' into PMP-snap_no_deg_faces_created 2022-12-08 14:35:48 +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
Laurent Rineau 041df61a70 Merge pull request #7074 from sloriot/PMP-compatible_orientation_missing_option
CGAL::PMP::compatible_orientations: add missing option
2022-12-05 12:22:09 +01:00
Laurent Rineau 17fd74e432 Merge pull request #7090 from afabri/PMP-assertion_bug-GF
Polygon Mesh Processing:  Fix CGAL_assertion_msg
2022-12-05 12:21:51 +01:00
Laurent Rineau 33cffd9c26 Merge pull request #7074 from sloriot/PMP-compatible_orientation_missing_option
CGAL::PMP::compatible_orientations: add missing option
2022-12-05 11:57:16 +01:00
Laurent Rineau ead1795d85 Merge pull request #7090 from afabri/PMP-assertion_bug-GF
Polygon Mesh Processing:  Fix CGAL_assertion_msg
2022-12-05 11:57:06 +01:00
Sébastien Loriot ffc20ffbd1 do not apply smoothing if the CC has some degenerate faces 2022-12-01 04:33:53 +01:00
albert-github f79d8bb542 Spelling corrections
After review
2022-11-30 10:31:13 +01:00
Andreas Fabri 2b26b8dd31 Don't use deprecated code in examples 2022-11-30 07:58:02 +00:00
Andreas Fabri a2e599b23d Fix typos 2022-11-29 16:55:43 +00:00
Andreas Fabri 63ffb5e82f Do the same for the other hole filling functions 2022-11-29 14:49:59 +00:00
Sébastien Loriot 352860ffa4 one solution for the return type 2022-11-29 14:24:11 +01:00
Andreas Fabri c07dc61b4f Use new version in test 2022-11-29 13:13:07 +00:00
Sébastien Loriot 8708d348dd remove extra _t 2022-11-29 13:58:40 +01:00
Andreas Fabri 7babddf443 PMP: Replace parameter with named parameter 2022-11-29 12:45:47 +00:00
Sébastien Loriot 128cc719fe missing } 2022-11-29 11:14:22 +01:00
Andreas Fabri 6572a8fb58 It's a warning not an assertion 2022-11-28 14:39:20 +00:00
Andreas Fabri 675d4a4eff Remove debug code 2022-11-28 14:22:42 +00:00
Andreas Fabri 0b56297ea2 Polygon Mesh Processing: Fix CGAL_assertion_msg 2022-11-28 14:05:59 +00:00
Laurent Rineau 6cff086454 Merge pull request #7067 from sloriot/PMP-clean_up_pmp_bo_params
Remove no longer needed function
2022-11-25 10:14:59 +01:00
Laurent Rineau 33a7ae51d4 Merge pull request #7068 from sloriot/PMP-repair_si_fix_include
Fix include
2022-11-25 10:14:57 +01:00
Mael 208a4c24a5
Absolve doc 2022-11-24 13:15:12 +01:00
Mael Rouxel-Labbé deb1533957 Improve documentation of PMP::compute_vertex_normal() 2022-11-23 20:16:17 +01:00
Sébastien Loriot 75e08a9736 typo 2022-11-23 18:36:43 +01:00
Sébastien Loriot 876e69aeb4 add missing option that make the function almost useless if not present 2022-11-23 18:18:09 +01:00
Sébastien Loriot 550d86cc0d update doc 2022-11-22 10:48:27 +01:00