Commit Graph

5007 Commits

Author SHA1 Message Date
Sébastien Loriot e6961ef94c factorize qem metric and non qem metric impl 2025-02-10 21:33:46 +01:00
Sébastien Loriot 328230c40e warnings and TODOs 2025-02-10 19:50:43 +01:00
Sebastien Valette 634df03161 optimization : skip testing edges when their respective clusters have not been modified recently 2025-02-10 17:35:21 +01:00
Sebastien Valette ec2a1a2f88 removed trailing spaces 2025-02-10 17:04:17 +01:00
Sebastien Valette 36b3532565 rename variable 2025-02-10 17:01:18 +01:00
Sebastien Valette b48d66fd0a reset cluster stats
lazy energy computations
2025-02-10 16:54:51 +01:00
Sebastien Valette 78bb2abf69 optim : lazy computations 2025-02-10 15:31:09 +01:00
Sébastien Loriot 65755d8717 topological test to avoid disconnected clusters 2025-02-10 12:53:26 +01:00
Sebastien Valette c7e06de161 cleanup 2025-02-10 12:52:38 +01:00
Sebastien Valette 5039ab66bd use temporary clusters 2025-02-10 12:46:51 +01:00
Sebastien Valette a5bd577da1 let algorithm converge by itself 2025-02-10 10:48:54 +01:00
Sebastien Valette b7f515923c fix qem metric 2025-02-10 10:33:17 +01:00
Mael Rouxel-Labbé 07d7615d91 Require a FaceGraph for boundary checks 2025-02-06 10:16:10 +01:00
Sébastien Loriot 5b4b19a1c8 add cut_with_plane and new clip method 2025-01-28 14:54:27 +01:00
Sébastien Loriot 107f3696dc boost::tie -> std::tie 2025-01-24 14:20:00 +01:00
Sebastien Loriot db45571323
refactor: remove duplicate header file inclusion (#8692)
## Summary of Changes

remove duplicate header file inclusion

## Release Management

* Affected package(s): Polygon_mesh_processing
2025-01-22 10:46:18 +01:00
Sébastien Loriot 6d20c44ccf Merge remote-tracking branch 'cgal/6.0.x-branch' 2025-01-17 18:52:55 +01:00
zfb132 d5d01a4d32
refactor: remove duplicate header file inclusion 2025-01-15 23:34:10 +08:00
Jane Tournois 8e0ebb9a39 update status of border edges when removing a (degenerate) border face 2025-01-10 13:42:33 +00:00
Mael Rouxel-Labbé c418aea7c2 Document PMP/curvature.h 2025-01-10 13:11:21 +01:00
Mael Rouxel-Labbé db297d7eff Handle boundary vertices in angle_sum 2025-01-10 13:10:33 +01:00
Mael Rouxel-Labbé 26005e59f3 Fix compilation 2025-01-10 13:10:16 +01:00
Mael Rouxel-Labbé 6d68861f1e Move PMP/curvature.h outside of 'internal' 2025-01-10 11:40:50 +01:00
Mael Rouxel-Labbé d7791980d1 Move separator 2025-01-10 11:40:10 +01:00
albert-github f5ec9b05b7 Spelling correction
Spelling correction

Note: we also have a similar spelling error in:
```
Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/mcf_scale_invariance.cpp:104:  output.open("correspondance.cgal");
Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/MCF_Skeleton_example.cpp:68:  output.open("correspondance-poly.polylines.txt");
Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/MCF_Skeleton_LCC_example.cpp:66:  output.open("correspondance-lcc.polylines.txt");
Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/MCF_Skeleton_om_example.cpp:75:  output.open("correspondance-sm.polylines.txt");
Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/MCF_Skeleton_sm_example.cpp:67:  output.open("correspondance-sm.polylines.txt");
Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/simple_mcfskel_example.cpp:72:  output.open("correspondance-poly.polylines.txt");
Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/simple_mcfskel_LCC_example.cpp:72:  output.open("correspondance-lcc.polylines.txt");
Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/simple_mcfskel_sm_example.cpp:51:  output.open("correspondance-sm.polylines.txt");
```
but as this in filenames I didn't change it.
2024-12-23 15:23:47 +01:00
Sébastien Loriot f5f5dc7244 Merge remote-tracking branch 'cgal/6.0.x-branch' into HEAD 2024-12-23 09:40:20 +01:00
Sébastien Loriot cb3e182284 Merge remote-tracking branch 'cgal/5.6.x-branch' into HEAD 2024-12-23 09:38:35 +01:00
Sebastien Loriot 06fa730c75
Flip it if you can't collapse it (#8609)
if a needle is also a cap, it will be handled as a needle only. But if
we can't collapse the edge, a flip will not be tried. Try the flip too.

Note that this will slow down the method as the status of a triangle is
tested twice.

Fix #8605
2024-12-23 09:34:33 +01:00
Sebastien Loriot b55bdc0103
Fix link to replacement function (#8657)
## Release Management

* Affected package(s): `Polygon_mesh_processing`
* Issue(s) solved (if any): -
* Feature/Small Feature (if any): -
* License and copyright ownership: no change
2024-12-23 09:33:22 +01:00
Sébastien Loriot 8bc0b888b8 clean up patch and make filling lazy 2024-12-18 11:42:10 +01:00
Sébastien Loriot a6f7b3c163 WIP handle nested coplanar CC 2024-12-18 11:37:14 +01:00
Sébastien Loriot b32558b87e Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-12-16 11:47:34 +01:00
Mael Rouxel-Labbé 4efaa1e9cb Fix link to replacement function 2024-12-13 11:57:30 +01:00
Mael Rouxel-Labbé 373ad84461 Improve discrete curvature implementation 2024-12-10 21:17:36 +01:00
Sébastien Loriot 078053314e Merge remote-tracking branch 'cgal/6.0.x-branch' in master 2024-12-10 16:33:32 +01:00
Sébastien Loriot 3fa3568e6b Merge remote-tracking branch 'cgal/5.6.x-branch' into cgal/6.0.x-branch 2024-12-10 16:32:33 +01:00
Sebastien Loriot 289a8bda49
`PMP::isotropic_remeshing()` - fix relaxation of constrained vertices (#8604)
## Summary of Changes

Constrained vertices, and constrained edges were not properly protected
during the smoothing step.

## Release Management

* Affected package(s): PMP
* Issue(s) solved (if any): fix #8388
* License and copyright ownership: unchanged
2024-12-10 16:30:25 +01:00
Sébastien Loriot 0737a8f99b do not put all the faces of the mesh in the hash map 2024-12-10 15:58:53 +01:00
Sébastien Loriot c3e4e32fb7 factorize cap checks 2024-12-10 15:37:53 +01:00
Sébastien Loriot 116c0ec5d9 only use one container for the next loop
--> make the output of the function idempotent
2024-12-10 15:18:24 +01:00
Mael Rouxel-Labbé b24e6509fe Merge remote-tracking branch 'cgal/master' into PMP-add_discrete_curvature 2024-12-09 11:40:20 +01:00
Mael Rouxel-Labbé e8602e1f4e Use modern typedefs 2024-12-07 23:50:02 +01:00
Mael Rouxel-Labbé 25cd25c477 Tiny indentation fix 2024-12-07 23:49:55 +01:00
Mael Rouxel-Labbé a0e319e67b Re-attach convenience overloads to their respective main function 2024-12-07 23:43:07 +01:00
Mael Rouxel-Labbé f2299f844f Use plural for the all-vertices function 2024-12-07 23:42:49 +01:00
Mael Rouxel-Labbé 693fd25174 Use a capital 'G' 2024-12-07 23:42:31 +01:00
Mael Rouxel-Labbé 0fe940555d Fix namespace 2024-12-07 23:41:38 +01:00
Mael Rouxel-Labbé eb668da9ea Misc cleaning 2024-12-07 23:34:23 +01:00
Mael Rouxel-Labbé fda7b1ae6a Avoid a lot of useless shape predicate calls
Here are some changes:
- Avoid a lot of redundant calls of is_it_a_needle / is_it_a_cap
  - Do not test for cap-ness if it's already a needle
  - Do not fill both ranges at the beginning, but fill
    with everything: on the first round, needle-ness will
    be tested, and the exit towards cap-ness will happen
  - Wait for a needle to no longer be a needle, or not be
    treatable to actually test cap-ness
- When the mesh is modified, do not test everything immediately,
  just put them in the queue of the next iteration

Result: Fewer calls to shape predicates

- master -
needle calls = 828 668
cap calls = 803 330

- PR -
needle calls = 803 554
cap calls = 795 317

Should be fewer but two effects are balacing each other for the calls:
- much fewer calls to shape predicates (is_it_a_needle, is_it_a_cap)
  by not calling until absolutely necessary (but still checking at pop time).
- when we modify the mesh, I no longer fill the CURRENT cap and needle
  ranges, but the next ones. The point is to really prioritize all caps
  BEFORE treating needles, whereas otherwise we would treat some needles
  at the current iteration while there are still caps to treat.
So there are more iterations which add more useless calls (see below)
2024-12-07 23:31:57 +01:00
Mael Rouxel-Labbé a4cb48a145 Fix never trying again a user-rejected cap 2024-12-07 23:29:04 +01:00
Mael Rouxel-Labbé eb5ff9b33e Fix collect_badly_shaped_triangles not actually filling both ranges 2024-12-07 23:28:20 +01:00
Sébastien Loriot cac285d097 no need to redo new node propagation if it was already been done once 2024-12-06 17:19:01 +01:00
Sébastien Loriot 0b3c27e584 swap the parameters also here 2024-11-21 09:04:17 +01:00
Sébastien Loriot 41d37ac2a9 split badly shaped triangle check and delay the check calls 2024-11-20 09:40:13 +01:00
Sébastien Loriot b60b203c56 add missing cap collection in case of non-collapsed edge 2024-11-20 09:11:48 +01:00
Jane Tournois 21e1ff113a vertex is constrained if NOT allowed to move 2024-11-18 16:17:19 +01:00
Sébastien Loriot c9c1770c18 in case an edge is both a cap and a needle but that is not collapsable try to flip 2024-11-14 11:54:48 +01:00
albert-github 1320a1d497 Spelling correction
Spelling correction
2024-11-14 10:22:43 +01:00
Jane Tournois 7462b70bec remove unused 2024-11-12 14:01:30 +01:00
Jane Tournois b8165f62de add is_move_allowed(v) and use it in tangential_relaxation_impl() 2024-11-08 16:57:42 +01:00
Jane Tournois ec1d43afbe add constrained vertices to pmap 2024-11-08 16:11:11 +01:00
Andreas Fabri fcf062bf48 PMP: Initialize to avoid warning 2024-11-08 10:13:26 +00:00
Sébastien Loriot e045c48992 warnings and questions 2024-10-21 22:22:05 +02:00
Sébastien Loriot 89331d157d init dynamic maps using new API 2024-10-21 22:21:53 +02:00
Sébastien Loriot 07963c31a7 fix copy/paste error: put hedges in the right container 2024-10-21 22:06:26 +02:00
Andreas Fabri 0afe4f09e9 Change output file names; Fix dependency 2024-10-18 14:28:17 +01:00
Sébastien Loriot 619875392c Merge branch 'gsoc2023' into master 2024-10-18 14:33:31 +02:00
Sven Oesau a06002ab2b Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-10-14 14:42:46 +02:00
albert-github dd02af92a2 issue #8515 Spelling mistakes found checking `en-GB` to `en-US`
Spelling corrections, `en-GB` -> `en-US`
2024-10-05 11:28:29 +02:00
Laurent Rineau e1c1582c08 Merge pull request #8210 from janetournois/PMP-allow_move_example-jtournois
PMP isotropic_remeshing - add example using `allow_move_functor`

# Conflicts:
#	Polygon_mesh_processing/doc/Polygon_mesh_processing/examples.txt
2024-09-27 11:49:59 +02:00
Jane Tournois eabb4dc756 remove border degenerate faces, fixed 2024-08-26 10:21:41 +02:00
Jane Tournois c7ce0e43b8 remove boundary degenerate faces 2024-08-26 10:06:08 +02:00
Sébastien Loriot 152fd4d74e do no flip if creating a degenerate face 2024-08-20 17:25:32 +02:00
Sébastien Loriot 2577ecea27 fix initialization
bug introduced #7712
2024-07-05 13:01:45 +02:00
Mael Rouxel-Labbé 67aba3fefe Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-06-20 10:18:49 +02:00
Laurent Rineau a800918665 Merge pull request #8276 from sloriot/PMP-split_visitor_fwd
Forward the visitor for split
2024-06-13 12:48:47 +02:00
Laurent Rineau 6f4b598b6a Merge pull request #8278 from albert-github/feature/bug_spell_20240511
Spelling correction
2024-06-13 12:48:43 +02:00
Laurent Rineau 212a323e4d Merge pull request #8276 from sloriot/PMP-split_visitor_fwd
Forward the visitor for split
2024-06-13 12:48:22 +02:00
Laurent Rineau ff6e9d262b Merge pull request #8272 from sloriot/PMP-coref_use_size_type
Fix iteration on dynamic bit set
2024-06-12 10:06:06 +02:00
albert-github c35a0a7f11 Spelling correction
Spelling correction due to updated dictionary.
(dictionary was updated after the previous spelling correction :-( )
2024-06-11 10:12:12 +02:00
Sébastien Loriot 4cd04080b3 forward the visitor 2024-06-11 09:08:33 +02:00
Sébastien Loriot 174a1d68e0 avoid potentially infinite loop 2024-06-10 15:07:25 +02:00
albert-github 36c8b7589d Spelling corrections
Last batch (for now) of spelling corrections in doxygen and normal comments
2024-05-31 19:05:34 +02:00
Sébastien Loriot 279ddde799 more to core 2024-05-24 17:03:18 +02:00
Jane Tournois de9eccf316 functor is not unary! 2024-05-17 15:41:29 +02:00
Laurent Rineau 022b19d3ca Merge pull request #8057 from sloriot/AABB_tree-2d_and_3d
Updating the AABB-tree to work in both 2D and 3D
2024-05-15 16:12:19 +02:00
Laurent Rineau 0dcb83bff8 Merge pull request #8142 from sloriot/PMP-coref_nm_out
Add extra parameters to the corefinement visitor to handle non-manifold output
2024-05-15 16:12:16 +02:00
Laurent Rineau 02ad5d6003 Merge pull request #8150 from janetournois/PMP-isotropic_remeshing_with_allow_move_functor-jtournois
PMP::isotropic_remeshing() - add NP `allow move functor`
2024-05-15 16:12:14 +02:00
Laurent Rineau f260a22a64 Merge pull request #8160 from sloriot/PMP-coref_with_less_bbox
PMP corefinement: only allocate necessary bboxes
2024-05-15 16:12:09 +02:00
Laurent Rineau 87fe13fcf6 Merge pull request #8168 from sloriot/PMP-remesh_doc
Update parameter description
2024-05-15 16:12:07 +02:00
Laurent Rineau 76809fa947 Merge pull request #8178 from sloriot/PMP-shorten_params
Rename parameters
2024-05-15 16:06:06 +02:00
Sébastien Loriot 6291a4f62d also rename input nps 2024-05-06 09:50:18 +02:00
Sébastien Loriot 1be3e1d3f2 shorten parameters for better doc readibility 2024-05-02 14:36:18 +02:00
Sébastien Loriot 4525eeb988 do not modify the map if not the default one 2024-04-25 19:29:48 +02:00
Sébastien Loriot be81f15b95 update description: it is also an input parameter 2024-04-25 18:35:25 +02:00
Sébastien Loriot 05c0625bce only allocate necessary bboxes 2024-04-24 21:27:29 +02:00
Laurent Rineau c4165fe5f9 Merge pull request #7439 from MaelRL/PMP-Remove_degen_faces-no-clear-GF
Introduce remove_all_elements(Graph)
2024-04-22 14:54:18 +02:00
Laurent Rineau 3e3eed7f05 Merge pull request #8129 from sloriot/PMP-deterministic_triangulate_faces
Make triangulate_faces deterministic
2024-04-22 14:54:08 +02:00
Sven Oesau ffba6279c9 Merge remote-tracking branch 'cgal/master' into AABB_tree-2d_and_3d 2024-04-19 08:47:54 +02:00
Jane Tournois 96d8e1a5f6 document NP allow_move_functor 2024-04-18 13:01:07 +02:00
Jane Tournois 9a27b92a7d NP allow_move_functor from tangential_relaxation to isotropic_remeshing
this NP exists in tangential_relaxation() and we want to be able to
use it in the relaxation step, from the named parameters of isotropic_remeshing()
2024-04-18 12:50:20 +02:00
Sébastien Loriot bf6af35d42 address review comments 2024-04-15 18:34:45 +02:00
Sébastien Loriot 05f4cf6106 add doc and make implementation generic 2024-04-15 17:32:22 +02:00
Sven Oesau d9cd44e30c AABBGeomTraits -> AABBGeomTraits_3 2024-04-15 11:59:00 +02:00
Sébastien Loriot 0e06536bf1 use a template parameter for the id in the triangle 2024-04-15 09:23:51 +02:00
Sébastien Loriot 04a58f9e53 prevent isolated vertices in the soup 2024-04-15 09:23:51 +02:00
Sébastien Loriot 3fbd0fd886 handle several operations 2024-04-15 09:23:37 +02:00
Sébastien Loriot 5583f42fce do no unmark edges as the soup does not need them + allow several operations 2024-04-15 09:23:12 +02:00
Sébastien Loriot 9d6c4dcd8a handle existing vertices that are intersection points 2024-04-15 09:23:12 +02:00
Sébastien Loriot 13e2adf130 First draft of using a visitor to extract non-manifold soups 2024-04-15 09:23:12 +02:00
Sébastien Loriot 147b313cc8 also apply deterministic fix to polygon soup function 2024-04-11 09:36:16 +02:00
Sébastien Loriot ebe6d6719c precompute vectors 2024-04-11 08:55:10 +02:00
Laurent Rineau 49ca51275a
Fix typos (#8118) 2024-04-08 16:10:23 +02:00
Sébastien Loriot 16782d1e8b do not depend on vertex order when opposite angles are identical 2024-04-08 15:46:48 +02:00
Laurent Rineau 4677ece3da Merge pull request #7712 from sloriot/BGL-dynamic_with_default
Adding a default to dynamic property maps
2024-04-05 14:25:20 +02:00
Laurent Rineau 708711e7a7 Merge pull request #8018 from janetournois/PMP-add_bbox_to_face_graph-jtournois
New function `PMP::add_bbox(face_graph)` that adds bbox to face graph
2024-04-05 14:25:17 +02:00
Sébastien Loriot 68bc4a4bbc typos 2024-04-03 15:59:34 +02:00
Andreas Fabri caa8aaaa21 merge master 2024-04-03 14:09:39 +01:00
hoskillua 3bd0a7c92f QEM Minimization (still a bit buggy) 2024-03-28 17:55:12 +02:00
hoskillua 4130a35462 renaming a variable 2024-03-28 11:51:57 +02:00
hoskillua 916e5f55c5 Making PostProcessing QEM Optional (np) 2024-03-28 11:45:44 +02:00
Sébastien Loriot 5254404517 Merge remote-tracking branch 'cgal/master' into HEAD 2024-03-27 22:25:41 +01:00
hoskillua 9a292fa04f Merge branch 'gsoc2023' of https://github.com/hoskillua/cgal into gsoc2023 2024-03-27 20:07:22 +02:00
Sébastien Loriot ad926fe662 remove tabs 2024-03-27 19:00:12 +01:00
Sébastien Loriot 83f06b5461 remove unused file 2024-03-27 18:54:33 +01:00
Sébastien Loriot 97102e32f7 add license file 2024-03-27 18:47:18 +01:00
Sébastien Loriot e417a32a9f doc improvements 2024-03-27 18:36:34 +01:00
hoskillua 6e145b23d6 double -> typename GT::FT 2024-03-27 14:33:28 +02:00
hoskillua 9c6aa8c04f Optimizing Cluster Rep-Points with Qem (PostProcessing) 2024-03-27 13:15:47 +02:00
Sébastien Loriot a34120d817 fix warning 2024-03-27 08:21:34 +01:00
Sven Oesau f0d32fe869
Merge branch 'master' into AABB_tree-2d_and_3d 2024-03-26 16:03:19 +01:00
Sven Oesau 65be6133d8 removing deprecated AABB types 2024-03-26 15:56:45 +01:00
Sébastien Loriot 37b16ab656 fix warnings 2024-03-25 16:32:44 +01:00
Sébastien Loriot 8b649551be fix compilation issues
mostly due to change of function name
2024-03-25 16:30:50 +01:00
Sébastien Loriot 38339b7e4e Merge remote-tracking branch 'cgal/master' into HEAD 2024-03-25 16:14:08 +01:00
Sébastien Loriot baf084950b use default value for dynamic maps 2024-03-25 11:05:55 +01:00
Sébastien Loriot 12c80ac512 Merge remote-tracking branch 'cgal/master' into HEAD 2024-03-25 10:21:41 +01:00
Laurent Rineau 7a17b47d9f Merge pull request #8052 from afabri/Polygon-exact_area-GF
Polygon: Avoid stackoverflow when summing exact numbers

# Conflicts:
#	Polygon/include/CGAL/Polygon_2_algorithms.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
2024-03-22 09:18:07 +01:00
Laurent Rineau 9f96166d44 Merge branch '5.5.x-branch' into 5.6.x-branch
# Conflicts:
#	Polygon/include/CGAL/Polygon_2_algorithms.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
2024-03-22 09:09:57 +01:00
Sébastien Loriot b855194fba add missing include directive 2024-03-15 09:20:44 +01:00
Mael Rouxel-Labbé c984e0e08a Fix using the mesh point when the SotM is built from a tree 2024-03-14 11:05:23 +01:00
Sébastien Loriot f34745c4d8 use a functor for collapsing the DAG to not depend on Filtered_kernel
nor inclusion order
2024-03-14 10:02:30 +01:00
Andreas Fabri 19725c0b08 Fix PMP testsuite 2024-03-08 08:40:02 +00:00
Jane Tournois f786b86432 Merge remote-tracking branch 'cgal/master' into PMP-add_bbox_to_face_graph-jtournois 2024-03-06 16:04:58 +00:00
Jane Tournois bb2335a86e early exit already is in Bbox_3::scale() so we can remove this condition 2024-03-06 14:50:32 +01:00
Jane Tournois 15310c93ef copy_face_graph is not needed anymore 2024-03-06 14:48:31 +01:00
Jane Tournois ff3db1e0d7
doc suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2024-03-06 11:11:27 +01:00
Jane Tournois 78872aca27 move NP do_not_triangulate to make_hexahedron(isocuboid)
and fix nb of faces of hexahedron from 8 to 6
2024-03-05 13:38:14 +00:00
Andreas Fabri b70a736083 Replace deprecated classes 2024-03-05 07:20:28 +00:00
Andreas Fabri eb49100a96 Replace deprecated classes 2024-03-05 07:08:51 +00:00