Commit Graph

5434 Commits

Author SHA1 Message Date
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
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
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
Sébastien Loriot 1520ac93e4 Merge branch 'sloriot/PMP-split_repair_5.5' into master 2022-11-22 10:38:00 +01:00
Sébastien Loriot 5a992f60a4 split repair 2022-11-22 10:31:34 +01:00
Sébastien Loriot 718214bf4f fix include 2022-11-21 19:26:35 +01:00
Sébastien Loriot fd00ce2d02 seems that the no_parameter function is no longer needed 2022-11-21 16:02:04 +01:00
albert-github 781f9a2943 spelling corrections
After review:
- outputhing -> outputting
- neighbour -> neighbor
2022-11-17 10:25:10 +01:00
albert-github 01a7852f70 Merge branch 'master' into feature/bug_documentation_spell_20221113
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Synchronize with master
2022-11-16 13:58:05 +01:00
albert-github eed54a0ae5 spelling corrections
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
2022-11-15 18:45:39 +01:00
Laurent Rineau 04c51a1034 Merge pull request #7034 from sloriot/PMP-coref_open_mesh_case_fix
Fix inconsistency check
2022-11-15 17:01:26 +01:00
Laurent Rineau 868793754b Merge pull request #7034 from sloriot/PMP-coref_open_mesh_case_fix
Fix inconsistency check
2022-11-15 17:00:45 +01:00
Laurent Rineau 48811a4622 Merge pull request #7034 from sloriot/PMP-coref_open_mesh_case_fix
Fix inconsistency check
2022-11-15 16:59:27 +01:00
albert-github 3674c937f7 spelling corrections
Some spelling corrections (Directories starting with `M`-` N`),
some backward work
some forward work
2022-11-15 15:21:01 +01:00
albert-github 45478184de spelling corrections
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
Sébastien Loriot cd4de51a40 fix inconsistency check 2022-11-09 18:17:31 +01:00
Mael 8ff15b25a0
reparation -> repairing 2022-11-09 15:44:10 +01:00
Andreas Fabri 07c60df0ce Polygon_mesh_processing: reparation -> repairing 2022-11-09 10:00:54 +00:00
Mael Rouxel-Labbé 83b0b0bdef Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master 2022-11-07 14:23:29 +01:00
Mael Rouxel-Labbé 7564b761ac Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x 2022-11-07 14:11:10 +01:00
Sven Oesau 47babfefae reverted exclusion of some tests 2022-11-07 10:38:49 +01:00
Laurent Rineau 987391d8ee Merge pull request #6930 from MaelRL/BGL-Use_is_valid_descriptor-GF
BGL graph validity improvements
2022-11-07 10:08:34 +01:00
Laurent Rineau 5239daab19
Merge pull request #7010 from afabri/PMP-BGL-shrunk-GF 2022-11-04 10:27:19 +01:00
Andreas Fabri f605c347ae Fixed typo: shrinked -> shrunk 2022-11-04 10:01:53 +01:00
Sébastien Loriot 2c66c24165 handle meshes with non-manifold vertices with shared interface 2022-11-03 15:33:21 +01:00
Laurent Rineau 8e8153c0ac Merge pull request #6871 from afabri/CGAL_assertions-GF
CGAL: No longer per package assertions
2022-11-03 09:44:48 +01:00
Laurent Rineau 56453b7e9f Merge pull request #6953 from afabri/CGAL-Wunused-but-set-variable-GF
Address -Wunused-but-set-variable
2022-11-03 09:44:45 +01:00
Sébastien Loriot 0cac6a9da8 Merge remote-tracking branch 'sloriot/PMP-decimation' into PMP-decimation 2022-10-25 14:55:57 +02:00
Sébastien Loriot 98e774241b update test 2022-10-21 14:28:12 +02:00
Sébastien Loriot 890c6eed06 fix copy/paste error of indices + conditional update of corner list 2022-10-21 14:04:19 +02:00
Mael Rouxel-Labbé 91336eb213 Use modern C++ 2022-10-20 17:28:00 +02:00
Mael Rouxel-Labbé 19f847a74b Fix API of cotan functor in shape smoothing 2022-10-20 17:27:39 +02:00
Mael Rouxel-Labbé 6cd5c24f70 Pass traits to the secure Vor-weighted cotan functor 2022-10-20 17:27:26 +02:00
Mael Rouxel-Labbé 9ab7e1ed7f Misc minor code cleaning 2022-10-20 17:21:43 +02:00
Sébastien Loriot 11f6941e98 handle duplicated vertices in input meshes 2022-10-20 14:05:43 +02:00
Sébastien Loriot c4f6912e47 use correct API 2022-10-19 13:55:19 +02:00
Sébastien Loriot 36c16eeedf fix function names in the visitor 2022-10-17 15:39:01 +02:00
Andreas Fabri c04dceb71d Merge master 2022-10-14 14:40:58 +01:00
Andreas Fabri fb1b02eb94 PMP 2022-10-14 10:29:45 +01:00
Sébastien Loriot a4bd963c9b copy/paste error 2022-10-13 19:06:56 +02:00
Laurent Rineau 90e2a876e2 Merge pull request #6931 from MaelRL/PMP-remove_degen_fix_bad_removal-GF
Purge to-be-border halfedges from edges-to-collapse sets
2022-10-13 15:17:41 +02:00
Laurent Rineau b232f4bcfd Merge pull request #6942 from sloriot/CGAL-header_clean_up
Clean up in headers
2022-10-13 15:17:39 +02:00
Laurent Rineau 2b5b4be5d4 Merge pull request #6931 from MaelRL/PMP-remove_degen_fix_bad_removal-GF
Purge to-be-border halfedges from edges-to-collapse sets
2022-10-13 15:15:19 +02:00
Andreas Fabri 683805c34a Isotropic remeshing 2022-10-13 08:06:30 +01:00
Andreas Fabri 32efdd9110 isotropic remeshing 2022-10-13 07:34:43 +01:00
Sébastien Loriot e27a7f40c9 handle vertices with the same corner id while allowing non-manifold vertices within a patch 2022-10-12 12:55:47 +02:00
Andreas Fabri 341e1167a8 isotropic remeshing 2022-10-12 09:59:35 +01:00
Andreas Fabri 3e90f9ccf7 mesh_smoothing 2022-10-12 09:28:02 +01:00
Andreas Fabri 9bd49632cd repair_self_intersections 2022-10-12 08:54:56 +01:00
Andreas Fabri c8df65ebf9 repair_degeneracies 2022-10-12 08:11:12 +01:00
Sébastien Loriot 623a5e0814 we must invalidate face_boundaries to take corner changes into account 2022-10-10 16:44:46 +02:00
Sébastien Loriot 276ddda24c handle failure in remeshing of patches with multiple meshes 2022-10-07 18:28:58 +02:00
Sébastien Loriot 24aa3200c3 allow patch remeshing to fail
in such a case, neighbor patches with an interface that changed are
then marked to be processed again
2022-10-07 17:56:41 +02:00
Sébastien Loriot e8c5de51b7 remove useless header to directly include the right file 2022-10-06 15:40:05 +02:00
Mael Rouxel-Labbé 60d50a8b57 Fix not purging to-be-border halfedges from edges-to-collapse sets 2022-10-04 22:57:37 +02:00
Mael Rouxel-Labbé 34ea88c73d Use is_valid_*_descriptor 2022-10-04 22:22:40 +02:00
Mael Rouxel-Labbé 60ecc51ba7 Code cleaning (no real changes) 2022-10-04 20:43:31 +02:00
Laurent Rineau 6538a18044 Merge pull request #6844 from MaelRL/PMP-Complete_array_based_repair_PS-GF
Complete array-based polygon soup repair
2022-10-04 13:53:24 +02:00
Laurent Rineau af3945337b Merge pull request #6845 from sloriot/PMP-coref_open_mesh_case
PMP corefinement: Handle inconsistency with open mesh as input
2022-10-04 13:53:21 +02:00
Laurent Rineau f0b4b38b9a Merge pull request #6867 from sloriot/PMP-collision_detection_copy
Add default copy constructor and operator=
2022-10-04 13:52:53 +02:00