Commit Graph

3103 Commits

Author SHA1 Message Date
Laurent Rineau 6f8f790ae9 Merge pull request #5286 from janetournois/PMP-isotropic_remeshing_fix_is_corner-jtournois
PMP::isotropic_remeshing - fix is_corner(v)
2020-12-17 17:02:29 +01:00
Laurent Rineau f612716d34 Merge pull request #5263 from MaelRL/PMP-Fix_remove_degenerate_edges_mutated_loop-GF
Fix multiples calls to degenerate_edges() with an invalid input range
2020-12-16 17:47:50 +01:00
Jane Tournois 1afacb1d0b is_corner(v) should count both incoming and outgoing halfedges around v 2020-12-15 17:39:10 +01:00
Mael Rouxel-Labbé 136ddee8da Do not use the iterator after its deletion 2020-12-15 16:13:00 +01:00
Mael Rouxel-Labbé 818037a0ce Fix multiples calls to degenerate_edges() with an invalid input range 2020-12-10 17:34:55 +01:00
Laurent Rineau a2140d8263 Merge pull request #5228 from MaelRL/PMP-Add_missing_include_pm2ps-GF
PMP: Add missing header include (PM to PS)
2020-12-04 17:08:22 +01:00
Mael Rouxel-Labbé 47df5dc4df Add missing header include 2020-11-30 18:00:41 +01:00
Laurent Rineau b248867e91
Merge pull request #5141 from maxGimeno/Demo-Fix-clipping_plugin-maxGimeno 2020-11-09 17:10:24 +01:00
Laurent Rineau 4acca1e770 Merge pull request #4978 from janetournois/PMP-remesh_non_triangle_faces-jtournois
Polyhedron demo - remesh a non-triangle mesh
2020-11-04 20:46:15 +01:00
Laurent Rineau 3f5e9bad29 Merge pull request #5124 from sloriot/PMP-simplify_polyline
Add experimental non-documented function to simplify a 3D polyline
2020-11-04 20:45:59 +01:00
Laurent Rineau 4b51704368 Merge pull request #5134 from MaelRL/PMP-Fix_remove_locate_dead_forward_declaration-GF
PMP: Remove obsolete forward declaration with no body
2020-11-04 20:45:57 +01:00
Laurent Rineau c122a9b687 Merge pull request #5134 from MaelRL/PMP-Fix_remove_locate_dead_forward_declaration-GF
PMP: Remove obsolete forward declaration with no body
2020-11-04 20:44:21 +01:00
Maxime Gimeno 8b0ba4c786 Add a named_parameter to allow self-intersections for clip and split for planes and iso_cuboids 2020-11-04 10:21:55 +01:00
Maxime Gimeno 5ab80cd54f Fix c++17 warning 2020-11-03 14:58:56 +01:00
Mael c1c21ae110
Remove obsolete forward declaration with no body 2020-10-29 15:33:58 +01:00
Laurent Rineau 484824c3bb Merge pull request #5097 from janetournois/PMP-fix_isotropic_remeshing_with_dart-jtournois
PMP isotropic remeshing - fix collapsibilty check
2020-10-29 15:30:16 +01:00
Laurent Rineau 16480d4b81 Merge pull request #5122 from lrineau/PMP-fix_locate_with_AABB_tree__point-GF
Fix locate_with_AABB_tree(Point, ..._) with default point pmap
2020-10-29 15:30:09 +01:00
Laurent Rineau af29a4819a Merge pull request #5097 from janetournois/PMP-fix_isotropic_remeshing_with_dart-jtournois
PMP isotropic remeshing - fix collapsibilty check
2020-10-29 15:29:30 +01:00
Laurent Rineau 50116b5cd4 Merge pull request #5122 from lrineau/PMP-fix_locate_with_AABB_tree__point-GF
Fix locate_with_AABB_tree(Point, ..._) with default point pmap
2020-10-29 15:29:25 +01:00
Sébastien Loriot 61174c8359 fix for collinear cycle + update tests 2020-10-28 10:11:34 +01:00
Sébastien Loriot 7309b09169 add function to simplify a 3D polyline (closed or open) with approximation guarantees 2020-10-27 19:12:20 +01:00
Laurent Rineau e5f8d11df5 Fix locate_with_AABB_tree(Point, ..._) with default point pmap 2020-10-27 10:51:13 +01:00
Sébastien Loriot 3542b64fb3 do not modify input range 2020-10-26 16:39:59 +01:00
Sébastien Loriot 24324fe4a9 avoid copy when possible 2020-10-26 16:24:37 +01:00
Sébastien Loriot 6c966df862 fix return type 2020-10-26 14:29:21 +01:00
Jane Tournois cf0d4b0790 fix detection of dart is collapsibility check
collapsing a dart is allowed, collapsing an isolated constrained edge is not
2020-10-20 16:33:36 +02:00
Sebastien Loriot aea7a5f19a
Merge pull request #4923 from grassofsky/master
fix edge_to_faces key in Collect_face_bbox_per_edge_bbox
2020-10-20 13:36:07 +02:00
Jane Tournois de7b05c096 Merge remote-tracking branch 'cgal/master' into PMP-remesh_non_triangle_faces-jtournois
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
2020-10-19 12:10:52 +02:00
Laurent Rineau 5fa315bb57 Merge pull request #4729 from MaelRL/PMP-Local_stitch_borders-GF
PMP: Add local versions of `stitch_borders` and `stitch_boundary_cycles`
2020-10-16 13:43:13 +02:00
Laurent Rineau 3383291fd9 Merge pull request #5070 from MaelRL/PMP-Fix_dead_overload_repair_PS-GF
PMP: Remove overload of non-existent function
2020-10-16 13:42:55 +02:00
Laurent Rineau a6ab2dedfe Merge pull request #5070 from MaelRL/PMP-Fix_dead_overload_repair_PS-GF
PMP: Remove overload of non-existent function
2020-10-16 13:41:13 +02:00
Laurent Rineau f251ab88f4 Merge pull request #5070 from MaelRL/PMP-Fix_dead_overload_repair_PS-GF
PMP: Remove overload of non-existent function
2020-10-16 13:40:25 +02:00
Mael Rouxel-Labbé bdf2473338 Merge remote-tracking branch 'cgal/master' into PMP-Local_stitch_borders-GF 2020-10-09 18:01:09 +02:00
Laurent Rineau f33e1d22f3 Merge pull request #5048 from sloriot/PMP-repair_less_dep
Remove non-necessary include directives bringing new dependences
2020-10-09 17:45:20 +02:00
Laurent Rineau 38c8e40cbb Merge pull request #5012 from MaelRL/PMP-Repair_degeneracies_fixes-5.1-GF
PMP: Degeneracy removal fixes
2020-10-09 17:34:33 +02:00
Laurent Rineau 16f687feb6 Merge pull request #5045 from sloriot/PMP-ps_to_pm_missing_overload
Add missing overload
2020-10-09 17:34:31 +02:00
Laurent Rineau 1f67fcca37 Merge pull request #5051 from maxGimeno/CGAL-Fix_warnings_5_0-maxGimeno
Warnings fixes for 5.0
2020-10-09 17:34:29 +02:00
Laurent Rineau acb4f63842 Merge pull request #5051 from maxGimeno/CGAL-Fix_warnings_5_0-maxGimeno
Warnings fixes for 5.0
2020-10-09 17:11:57 +02:00
Laurent Rineau d075ef4fb3 Merge pull request #4712 from MaelRL/PMP-Clip_with_self_intersections-GF
PMP: Generalize some corefinement code
2020-10-09 17:10:50 +02:00
Mael Rouxel-Labbé 18149a2773 Remove overload of non-existent function 2020-10-09 17:06:06 +02:00
Laurent Rineau 40338b2a23 Merge pull request #5012 from MaelRL/PMP-Repair_degeneracies_fixes-5.1-GF
PMP: Degeneracy removal fixes
2020-10-09 16:50:29 +02:00
Laurent Rineau bc32dfcac3 Merge pull request #5045 from sloriot/PMP-ps_to_pm_missing_overload
Add missing overload
2020-10-09 16:50:22 +02:00
Laurent Rineau 07a37073d7 Merge pull request #5048 from sloriot/PMP-repair_less_dep
Remove non-necessary include directives bringing new dependences
2020-10-09 16:50:20 +02:00
Laurent Rineau 9b3e2f1c89 Merge pull request #5051 from maxGimeno/CGAL-Fix_warnings_5_0-maxGimeno
Warnings fixes for 5.0
2020-10-09 16:50:17 +02:00
Maxime Gimeno 125dfad64a Fix ref warnings in for 2020-10-05 11:34:04 +02:00
Mael 0cc1f01f82
Merge branch 'master' into PMP-Local_stitch_borders-GF 2020-10-02 15:39:05 +02:00
Sebastien Loriot 47d2189f8e
Merge pull request #3268 from afabri/PMP-visitor-GF
PMP::triangulate_faces() Add a visitor that allows to map each triangle to its original face
2020-10-02 15:26:05 +02:00
Sebastien Loriot 10ba34719e
Merge pull request #4728 from sloriot/PMP-cc_cleanup
Clean in connected components
2020-10-02 15:20:53 +02:00
Mael f7056ac961
Add missing includes 2020-10-02 14:47:51 +02:00
Sébastien Loriot 5fbe72c84a remove non-necessary include directives bringing new dependences 2020-10-02 09:11:02 +02:00
Sébastien Loriot f2c45716b9 add missing overload 2020-10-01 11:23:18 +02:00
Mael Rouxel-Labbé 4d4eef94a4 Enable different VPMs in PMP::clip 2020-09-28 15:49:24 +02:00
Laurent Rineau 9884b4597c Merge pull request #4994 from janetournois/PMP-isotropic_remeshing_allows_invalid_mesh-jtournois
PMP isotropic remeshing - test validity during remeshing only if input mesh was valid
2020-09-24 16:42:33 +02:00
Mael Rouxel-Labbé 1f4eca9746 Fix iterating and removing elements that might show up further in the loop 2020-09-22 16:58:23 +02:00
Mael Rouxel-Labbé b7b0d1f0fa Use FT instead of double 2020-09-22 16:58:01 +02:00
Mael Rouxel-Labbé 303ead8b28 Explicit initialization of sum to 0 to avoid NP with weird def-constr values
Looking at you, exact number types initializing stuff to 0.5
2020-09-22 16:57:35 +02:00
Mael Rouxel-Labbé 38218aca4f Fix deleting elements (degenerate faces) that might be further in the range 2020-09-22 15:28:40 +02:00
Mael Rouxel-Labbé 46630bdaad Merge remote-tracking branch 'cgal/master' into PMP-Clip_with_self_intersections-GF 2020-09-22 11:25:01 +02:00
Mael Rouxel-Labbé f39863e801 Merge remote-tracking branch 'cgal/master' into PMP-Local_stitch_borders-GF 2020-09-22 10:57:18 +02:00
Jane Tournois 16656872d0 rename graph_visitor to visitor 2020-09-18 14:20:46 +02:00
Laurent Rineau 5e532d9cf3
Merge branch 'master' into PMP-visitor-GF 2020-09-18 13:26:45 +02:00
Jane Tournois bfd4e9915f rename named parameter graph_visitor to visitor 2020-09-15 15:42:24 +02:00
Jane Tournois 4745308384 use graph_visitor instead of creating new triangulate_visitor 2020-09-15 14:38:29 +02:00
Jane Tournois 070fa52b6e use (removed?) input geom traits 2020-09-15 12:39:55 +02:00
Jane Tournois d000af1d54 apply doc reviews 2020-09-15 12:29:54 +02:00
Jane Tournois 747db7204e add CGAL_warning_msg and move debug code inside CGAL_assertion_code 2020-09-11 15:47:20 +02:00
Jane Tournois 2031009745 test validity during remeshing only if input mesh was valid
isotropic remeshing is a local process, so it does not need the mesh
to be globally valid (e.g. it is allowed to have isolated vertices)

we keep the test in debug mode when the input is valid, that the mesh
remains valid anyhow
2020-09-11 14:50:14 +02:00
Jane Tournois 563f38a9cf Merge branch 'PMP-visitor-GF' into PMP-remesh_non_triangle_faces-jtournois 2020-09-11 08:34:49 +01:00
Jane Tournois 435df16eb7 add missing `after_subface_creations` 2020-09-11 09:33:32 +02:00
Jane Tournois 02bba362c2 Merge branch 'PMP-visitor-GF' into PMP-remesh_non_triangle_faces-jtournois 2020-09-10 13:58:12 +01:00
Jane Tournois be7d9d1728 doc fixes 2020-09-10 14:31:48 +02:00
Jane Tournois 0c39f355a5 small fixes in doc 2020-09-10 12:12:46 +02:00
Jane Tournois 39e75e7530 rename split_visitor to triangulate_visitor and add PMPTriangulateFaceVisitor 2020-09-10 12:06:10 +02:00
Jane Tournois 767ff1074c remove debug code 2020-09-08 22:10:57 +02:00
Jane Tournois 07c5387438 avoid uninitialized warning 2020-09-08 22:07:35 +02:00
Jane Tournois cba55b26b5 start doc 2020-09-08 22:05:45 +02:00
Jane Tournois 626ba2745c replace done() by end() to be consistent with start() 2020-09-08 21:42:00 +02:00
Jane Tournois 268c0eabee replace operator() with more explicit visit() function 2020-09-08 19:03:34 +02:00
Jane Tournois 5490227707 fix compilation after rebase 2020-09-08 18:45:30 +02:00
Andreas Fabri f2ff13d6c4 Add a visitor that allows to map each triangle to its original face
# Conflicts:
#	BGL/include/CGAL/boost/graph/named_params_helper.h
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example.cpp
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h
2020-09-08 15:17:18 +02:00
Mael Rouxel-Labbé 028b05275a Fix ambigious call 2020-09-08 10:29:38 +02:00
Jane Tournois 845f7222f4 only faces to be remeshed should be triangular, not all the input mesh
remove corresponding assertions
2020-09-04 11:36:59 +02:00
Sébastien Loriot 370d866250 typo 2020-08-20 05:58:03 +02:00
Sébastien Loriot c8b11162bf fix rebase issues 2020-08-19 16:40:37 +02:00
Sébastien Loriot b8efebd865 fix warning 2020-08-19 16:34:22 +02:00
Sébastien Loriot 85caca92aa remove unused variable 2020-08-18 08:27:18 +02:00
Sébastien Loriot 40f297e3e3 more conversion warnings
unsigned is hardcoded in boost
2020-08-17 17:10:12 +02:00
Sébastien Loriot 2aceb2eaf5 remove merge conflict trash 2020-08-17 08:49:05 +02:00
xiewei.zhong_CRI-WH cd76a4e152 fix space 2020-08-13 09:29:34 +08:00
xiewei.zhong_CRI-WH effe7d3a3c fix edge_to_faces key in Collect_face_bbox_per_edge_box 2020-08-13 09:18:05 +08:00
Sébastien Loriot 9e3345f68f Update from master 2020-08-12 16:05:45 +02:00
Sebastien Loriot 260aa765fb
Merge pull request #4902 from MaelRL/PMP-Fix_array_based_PS_to_PM-GF
PMP: Restore array-based soup to mesh conversion
2020-08-11 16:51:36 +02:00
Mael Rouxel-Labbé 2780fa09eb Restore PS_to_PM with array-based soups 2020-08-05 10:49:14 +02:00
Sébastien Loriot 715aa45a2b rephrase 2020-08-04 08:22:01 +02:00
Laurent Rineau ae0c9fbeac Merge pull request #4884 from MaelRL/PMP-fix_polygon_soup_simplification-GF
Fix and simplify polygon soup repairing subfunction "simplify_polygon"
2020-07-31 15:52:53 +02:00
Laurent Rineau 6411035d7f Merge pull request #4884 from MaelRL/PMP-fix_polygon_soup_simplification-GF
Fix and simplify polygon soup repairing subfunction "simplify_polygon"
2020-07-31 15:52:02 +02:00
Mael Rouxel-Labbé e85b5bfb40 Tiny doc fixes 2020-07-31 10:15:56 +02:00
Mael Rouxel-Labbé 0a4be6464d Merge remote-tracking branch 'cgal/master' into PMP-Local_stitch_borders-GF 2020-07-31 10:13:50 +02:00
Mael Rouxel-Labbé 5a6fc89495 Fix and simplify polygon soup repairing subfunction "simplify_polygon" 2020-07-28 09:56:02 +02:00
Laurent Rineau a84927d380 Merge pull request #4849 from MaelRL/PMP-No_caps_on_doc-GF
Use lower case for function documentation starting with a verb (BGL/PMP)

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
2020-07-23 17:15:44 +02:00