Commit Graph

3657 Commits

Author SHA1 Message Date
Andreas Fabri 041502a60c Move Envelope_filter to PMP 2020-11-05 08:43:33 +00: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
Andreas Fabri e1c1e1fbb6 capitalize file name in the #include (VC++ did not care) 2020-11-04 11:28:02 +00:00
Andreas Fabri 5ff48521d1 Use TLS; Fix SMS example 2020-11-04 09:53:38 +00: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
Andreas Fabri 80053c515f typos 2020-11-03 07:40:30 +00:00
Sébastien Loriot a49e2bc6cd remove tabs 2020-11-02 18:06:38 +01:00
Andreas Fabri 85bb0775e8 Improve documentation 2020-11-02 14:44:46 +00:00
Sébastien Loriot 0abbeb303f add missing typedef 2020-11-02 09:38:39 +01:00
Sébastien Loriot 15094cd679 the visitor can now track edge splits 2020-10-30 16:23:17 +01:00
Sébastien Loriot 7bcbf8fb7d update from master
merge branch into master
2020-10-30 14:04:44 +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
Andreas Fabri 56b461b2d4 Do not triangulate the prisms 2020-10-22 13:07:28 +01:00
Andreas Fabri d1a5e6c13b Add a figure 2020-10-22 13:00:01 +01:00
Dmitry Anisimov b64c9638b6 fixed docs + improved test (warning free now) + more precise computations inside tri with cdt 2020-10-21 11:55:58 +02:00
Andreas Fabri d4817f8671 Cite correctly and relicense as recommended at http://softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html 2020-10-21 08:13:40 +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
Sébastien Loriot 87b8f66e14 update from master 2020-10-20 09:19:13 +02:00
Andreas Fabri 9afd018ac5 rename types 2020-10-20 09:17:16 +02:00
Andreas Fabri 0b090cd05f move file 2020-10-20 09:17:16 +02:00
Andreas Fabri 89c9ed68b6 change namespace and add doc 2020-10-20 09:17:16 +02:00
Sébastien Loriot 6cf8c9da19 fix compilation 2020-10-20 09:17:16 +02:00
Andreas Fabri 54ca0c3b21 remove duplicate 2020-10-20 09:17:16 +02:00
Andreas Fabri c893cdbf09 Towards NP 2020-10-20 09:17:16 +02:00
Andreas Fabri 9da83edb10 Add a template constructor for a TriangleMesh 2020-10-20 09:17:16 +02:00
Andreas Fabri ef75dbb26d Deal with degenerate queries 2020-10-20 09:17:16 +02:00
Andreas Fabri f6d061d3d9 move helper functions into the Envelope class. They might become Small Features 2020-10-20 09:17:16 +02:00
Sébastien Loriot c9923364ae fix compilation issues with gcc 2020-10-20 09:17:16 +02:00
Andreas Fabri e12a4d83d7 Move intersection_point higher up to call it only once 2020-10-20 09:17:16 +02:00
Andreas Fabri 08635ec77a Move intersection_point higher up to call it only once 2020-10-20 09:17:16 +02:00
Andreas Fabri d2db2ac531 Put Envelope code in a header file in PMP 2020-10-20 09:17:16 +02:00
Dmitry Anisimov 4b69a7f351 better function description 2020-10-19 16:19:38 +02:00
Dmitry Anisimov 1f5bc1e3ee fixed description of the 2d CDT named parameter 2020-10-19 16:14:59 +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
Dmitry Anisimov 1333517747 fixed docs + max_sq_dist param changed to the dist param 2020-10-19 11:45:21 +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
Sébastien Loriot 82d561774b update header 2020-10-14 15:42:18 +02:00
Mael Rouxel-Labbé 630d9eb2f6 Various fixes in IO tests (BGL/PS/PMP/SS) 2020-10-13 18:15:34 +02:00
Mael Rouxel-Labbé bfe4bcff3b Fix assuming orient_PS returns `false` on failure (and not duplication) 2020-10-13 18:09:56 +02:00
Dmitry Anisimov ab9f76f2db fixed size_t warning 2020-10-13 17:48:06 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +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
Dmitry Anisimov b2494b1cc6 use bbox to define the default value for the param max sq dist 2020-10-07 16:47:39 +02:00
Dmitry Anisimov c5ac6f15c7 max squared distance added to np 2020-10-07 15:54:41 +02:00
Dmitry Anisimov 1988e8e4b6
Update Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-10-07 15:03:37 +02:00
Dmitry Anisimov 62cb8d3ed1
Update Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-10-07 15:03:19 +02:00
Dmitry Anisimov 003291f696
Update Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-10-07 15:02:57 +02:00
Dmitry Anisimov d5b24c4b05
Merge branch 'master' into Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2020-10-07 10:55:57 +02:00
Dmitry Anisimov 8f090ae812 fixed conversion warnings and added missing named parameters 2020-10-07 10:47:51 +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
Sébastien Loriot 68124448dc Merge branch 'PMP-corefine_non_manifold' into master 2020-09-30 13:59:30 +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é 4694a48913 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-09-22 11:35:25 +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
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Dmitry Anisimov 15282ab3fa barycenter changed to centroid from PCA with LGPL 2020-08-21 11:21:50 +02:00
Dmitry Anisimov 263ad6bc99 fixed ch3, inter3, otr2, psp, pmp, smsp, mesh3 + cleanup 2020-08-20 18:25:01 +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
Mael Rouxel-Labbé c14198a992 IO doc fixes 2020-08-04 17:55:21 +02:00
Mael Rouxel-Labbé 00ca0211e1 IO documentation fixes 2020-08-04 15:47:56 +02:00
Dmitry Anisimov 22c110e22a using traits functor for projection 2020-08-04 09:49:37 +02:00
Sébastien Loriot 715aa45a2b rephrase 2020-08-04 08:22:01 +02:00
Dmitry Anisimov ddf82f11d2 andreas review fixes 2020-08-03 18:32:42 +02:00
Dmitry Anisimov 3ae852b246 improved planarity test + normal estimation + new tests 2020-08-03 17:35:39 +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é 1d016ecc7e IO doc fixes 2020-07-28 15:38:19 +02:00
Mael Rouxel-Labbé 5a6fc89495 Fix and simplify polygon soup repairing subfunction "simplify_polygon" 2020-07-28 09:56:02 +02:00
Dmitry Anisimov 8bfdf2b9a2 positive avg normal + hole orientation (not finished) 2020-07-24 17:30:43 +02:00
Mael Rouxel-Labbé 0d66e19361 IO documentation fixes
See @sloriot's review:

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polgyon_soup_mesh_IO/2nd_round/Answer_to_review

(+ some commits before and after this one)
2020-07-24 17:06:00 +02:00
Mael Rouxel-Labbé 6acac6907a Add a note about letter case in generic I/O functions 2020-07-24 09:23:54 +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
Laurent Rineau 1641310e87 Missing #include 2020-07-21 15:22:32 +02:00
Mael Rouxel-Labbé ebd65c9637 Use lower case for function doc starting with a verb (BGL/PMP) 2020-07-20 11:47:30 +02:00
Mael Rouxel-Labbé b08e1e0d8c Hide CGAL_DEPRECATED from the doc 2020-07-20 09:57:47 +02:00
Mael Rouxel-Labbé 6d6d959d4d Enhance doc for generic I/O functions 2020-07-17 13:37:37 +02:00
Mael Rouxel-Labbé 93f1cd99ca Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-07-16 09:53:31 +02:00
Mael Rouxel-Labbé d567a0d9d0 Fix doc warnings 2020-07-16 09:52:32 +02:00
Mael 88b4b8dfcf
Use lowercase in functions doc 2020-07-15 12:04:24 +02:00
Mael Rouxel-Labbé 4231bc8a83 Misc I/O doc enhancements 2020-07-13 14:17:50 +02:00
Dmitry Anisimov d3dd4ad0ac missing line 2020-07-07 11:31:18 +02:00
Dmitry Anisimov 979e1d01a7 multiple fixes 2020-07-06 17:58:53 +02:00
Dmitry Anisimov 4fb546925d cleanup + warnings fix 2020-07-06 16:22:46 +02:00
Mael Rouxel-Labbé 7e2e9d849a Remove experimental code related to clipping self-intersecting meshes
See functionality added in https://github.com/CGAL/cgal/pull/4790 instead.

Keeping it in a commit instead of filtering the branch to keep the code
in history.
2020-07-03 15:02:00 +02:00
Mael Rouxel-Labbé b3958c9c1d Minor doc fixes 2020-07-03 14:27:24 +02:00
Mael Rouxel-Labbé 8393b20366 Keep a call to the global version of PMP::connected_components
See comment for justification
2020-07-03 12:10:30 +02:00
Mael Rouxel-Labbé e16ef7d2f5 Merge remote-tracking branch 'cgal/master' into PMP-Local_stitch_borders-GF 2020-07-03 09:54:56 +02:00
Maxime Gimeno 16cf756894 fixes and clean-up 2020-07-02 12:29:01 +02:00
Sébastien Loriot d4122d945a better include the new header :( 2020-07-02 10:36:29 +02:00
Sébastien Loriot 1246e9e375 add a generic clip version that handles self-intersections 2020-07-01 21:04:52 +02:00
Sébastien Loriot d64faf3199 add non-documented operator to do queries using points from another kernel 2020-07-01 21:03:55 +02:00
Sébastien Loriot 3b2da649b8 remove useless test (done in the main call) 2020-07-01 21:03:31 +02:00
Sébastien Loriot fd875cf71a add do_no_modify option to split 2020-07-01 16:20:24 +02:00
Maxime Gimeno f6bfc69162 add missing reserve() using interanl helpers 2020-07-01 15:47:06 +02:00
Laurent Rineau b8ac296757 Merge pull request #4791 from MaelRL/PMP-Fix_remove_SI_hole_filling_non_simple_border-GF
PMP: remove_self_intersections() fixes
2020-06-30 16:38:08 +02:00
Maxime Gimeno 9625ed881a add NPs and tests 2020-06-29 11:51:54 +02:00
Maxime Gimeno b91ba7f6c8 Add a check for validity to the polygon_mesh function 2020-06-29 11:32:11 +02:00
Mael Rouxel-Labbé 3280b9b087 Use new IO functions 2020-06-26 17:06:42 +02:00
Mael Rouxel-Labbé ae4c2aaa9e IO doc fixes 2020-06-26 16:08:02 +02:00
Maxime Gimeno 5c8b239876 WIP fixes for triangulate_hole_polygon_mesh 2020-06-26 14:21:29 +02:00
Maxime Gimeno e592ed1784 Fix constraints 2020-06-26 11:45:26 +02:00
Maxime Gimeno 2b4dd26d22 use indices for constraints 2020-06-26 10:47:13 +02:00
Mael Rouxel-Labbé 594eb97a22 Doc improvements 2020-06-25 21:01:04 +02:00
Maxime Gimeno 4921230f45 WIP hole_filling_polyline_with_cdt 2020-06-25 15:19:18 +02:00
Mael Rouxel-Labbé 26355e2e32 Uniformize capital / third person usage of \brief 2020-06-25 15:13:47 +02:00
Mael Rouxel-Labbé d5d8cca92b Various IO compilation fixes 2020-06-25 12:02:01 +02:00
Mael Rouxel-Labbé fe309c6e52 Fix namespace 2020-06-23 18:26:15 +02:00
Mael Rouxel-Labbé 4bb218aea2 Move up the clear(g) for clarity
The clear is there because BGL::read_pm might partially fill the mesh
while failing
2020-06-23 18:25:32 +02:00
Mael Rouxel-Labbé 0790dc623d Fix PMP IO + doc 2020-06-22 19:49:35 +02:00
Mael Rouxel-Labbé 6c90bc2220 Update dependencies 2020-06-22 18:35:13 +02:00
Mael Rouxel-Labbé a91b750dd5 Fix doc link 2020-06-18 18:50:16 +02:00
Mael Rouxel-Labbé 6f8a895671 Merge remote-tracking branch 'mine/CGAL-Improve_NP_doc_presentation-GF' into CGAL_IO-maxGimeno 2020-06-18 15:21:27 +02:00
Mael Rouxel-Labbé 26eb7903aa Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-06-18 12:46:46 +02:00
Maxime Gimeno ea53a8d70d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-06-17 14:25:21 +02:00
Sebastien Loriot 802fa469d5
Apply suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2020-06-17 08:10:32 +02:00
Mael Rouxel-Labbé e720e6d585 Avoid bad (self-intersecting) patches even in the last case
Usually worsens the result without any benefit
2020-06-16 16:41:49 +02:00
Mael Rouxel-Labbé 5b9a3f8dd8 Also count unsolved cases 2020-06-16 16:40:46 +02:00
Mael Rouxel-Labbé e66bdf0029 Don't attempt to hole fill if the border is not simple 2020-06-16 16:40:14 +02:00
Mael Rouxel-Labbé f216f00dda Add is_simple_3(HalfedgeRange) 2020-06-16 16:39:07 +02:00
Sébastien Loriot b9a12bf901 update doc 2020-06-16 16:36:10 +02:00
Sébastien Loriot 5059191534 remove tabs + update doc 2020-06-16 16:30:02 +02:00
Sébastien Loriot 9eb7a9da85 avoid filling the maps 2020-06-16 15:25:42 +02:00
Sébastien Loriot e43221ae8b add an option to not refine one of the two meshes 2020-06-16 15:15:48 +02:00
Laurent Rineau 7e12992ee0 Missing #include 2020-06-15 17:12:04 +02:00
Sébastien Loriot 784d0cddcd also add non-manifold border faces 2020-06-12 13:30:21 +02:00
Mael Rouxel-Labbé 00d2537975 Don't abuse Surface_mesh property maps 2020-06-12 10:37:34 +02:00
Mael Rouxel-Labbé 8ce1a9c7da Duplicate possible non-manifold vertices in the input 2020-06-12 09:15:52 +02:00
Mael Rouxel-Labbé 593e8c9d5a Debug code (mostly tmp) 2020-06-12 09:15:37 +02:00
Mael Rouxel-Labbé b56583bfd6 Merge remote-tracking branch 'cgal/master' into PMP-Clip_with_self_intersections-GF 2020-06-11 13:39:25 +02:00
Dmitry Anisimov 3e7e281f28 is_simple_2 can be omitted when using triangulate_face_with_cdt 2020-06-09 12:21:00 +02:00
Dmitry Anisimov 7ac04fd907 checking the hole simplicity with the extended triangulation projection traits 2020-06-08 14:21:12 +02:00
Maxime Gimeno 45343e39a0 Protect std::max 2020-06-04 09:55:23 +02:00
Mael Rouxel-Labbé 071565467d Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-06-03 19:01:46 +02:00
Maxime Gimeno 05c36b37ec clean-up 2020-06-03 17:13:39 +02:00
Maxime Gimeno 75f3a67790 Replace parallel_for by parallel_reduce in haudorff 2020-05-29 15:26:34 +02:00
Dmitry Anisimov 8bfc91ff13 Merge branch 'Polygon_mesh_processing-triangulate_hole_with_cdt2-danston' of github.com:danston/cgal into Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2020-05-27 10:34:48 +02:00
Dmitry Anisimov 552d4fbbae added hole planarity check 2020-05-26 16:18:33 +02:00
Mael Rouxel-Labbé 27d4c76da3 Remove unused parameter 2020-05-26 15:52:09 +02:00
Sébastien Loriot 7e21188463 comment unused variable
@MaelRL was it expected?
2020-05-26 15:23:03 +02:00
Sébastien Loriot b444d7ad0d remove unused overload 2020-05-26 15:22:43 +02:00
Mael Rouxel-Labbé 808c93c0fa Fix enforcing that VPM reference types must be equal, value types are sufficient 2020-05-26 10:14:06 +02:00
Mael Rouxel-Labbé 0c1ec4b2c3 Use a dynamic pmap rather than get(face_patch_id(), mesh) to keep backward compatibility
A proper fix would be to have a pmap(Polyhedron (without features), face_patch_id) that
creates a dynamic pmap, but...
2020-05-26 10:12:54 +02:00
Mael Rouxel-Labbé f9ad4adfda Use BGL API 2020-05-26 10:12:32 +02:00
Mael Rouxel-Labbé ae3e3b044d Fix add_new_node overloads not being properly templated
since VPM1 might be different from VPM2 and add_new_node will be called
sometimes with VPM1/VPM2 and sometimes with VPM2/VPM1
2020-05-26 09:40:15 +02:00
Dmitry Anisimov 94e4ad5353 refactoring maxime's solution 2020-05-25 19:48:26 +02:00
Mael Rouxel-Labbé 24e99636f4 Fix reordered CC IDs usage 2020-05-25 13:18:47 +02:00
Mael Rouxel-Labbé 8b825eaaf9 Fix improper VPM forwarding 2020-05-25 13:14:01 +02:00
Mael Rouxel-Labbé 580a1efd5c Remove trailing whitespace / tabs 2020-05-22 15:31:50 +02:00
Mael Rouxel-Labbé fb8463f470 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-05-22 15:17:56 +02:00
Mael Rouxel-Labbé 0d52df5a25 Fix warnings 2020-05-22 15:13:38 +02:00
Mael Rouxel-Labbé dafca93a82 Fix degenerate case 2020-05-22 14:39:47 +02:00
Mael Rouxel-Labbé f3e3ffeeb4 Improve comments 2020-05-22 14:39:36 +02:00
Laurent Rineau af456548af Merge pull request #4471 from MaelRL/PMP-Halfedge_comparer_for_stitch_borders-GF
PMP: Enable enforcing which edge is kept during stitching
2020-05-18 12:25:01 +02:00
Laurent Rineau b67186eca9 Merge pull request #4719 from sloriot/PMP-remove_si_is_too_verbose
Hide verbose/debug code
2020-05-18 12:24:19 +02:00
Laurent Rineau 86ae4be3ce Merge pull request #4711 from danston/Polygon_mesh_processing-fair_weights_bug_fix-danston
PMP fairing cotangent weights issue fix
2020-05-18 12:22:21 +02:00
Laurent Rineau f031adde59 Merge pull request #4711 from danston/Polygon_mesh_processing-fair_weights_bug_fix-danston
PMP fairing cotangent weights issue fix
2020-05-18 12:07:17 +02:00
Sébastien Loriot 2169dd52aa warnings + compilation fixes 2020-05-18 08:49:14 +02:00
Mael Rouxel-Labbé 5106db47b6 Add local stitching 2020-05-15 20:22:10 +02:00
Sébastien Loriot fbd9628307 add a static bool map and use it when possible
also remove Static_property_map that is a duplicate of Constant_property_map
2020-05-15 18:27:33 +02:00
Sébastien Loriot 577ea40394 add the possibility to not remove some vertices when removing connected components 2020-05-15 18:07:30 +02:00
Sébastien Loriot 094bfe35a3 do not iterate on a container while removing elements 2020-05-15 18:05:57 +02:00
Sébastien Loriot 9f0ebc705b set the initial size of the internal vector when using vector_property_map 2020-05-15 18:03:40 +02:00
Sébastien Loriot 84fe1d2af0 hide verbose/debug code 2020-05-13 09:16:50 +02:00
Mael Rouxel-Labbé baad9c9cb2 Fix only marking the first halfedge of a pair as unstitchable
This was ok when the first halfedge was always the one being kept,
but with the addition of the halfedge_keeper mechanism, both halfedges
must be marked.
2020-05-12 19:23:26 +02:00
Mael Rouxel-Labbé 96f259e306 Const correctness 2020-05-12 19:23:20 +02:00
Mael Rouxel-Labbé 3e321f3c84 Simplify call to PMP::connected_components 2020-05-12 19:22:24 +02:00
Mael Rouxel-Labbé 4b9f7fe425 Merge remote-tracking branch 'cgal/master' into PMP-Halfedge_comparer_for_stitch_borders-GF 2020-05-12 19:19:41 +02:00
Sebastien Loriot 254f654ff5
Merge pull request #4702 from sloriot/PMP-simplify_example
Simplify example
2020-05-12 16:56:14 +02:00
Maxime Gimeno 6122f27aac fix doc. 2020-05-12 15:35:29 +02:00
Mael Rouxel-Labbé 038869cab9 Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-05-12 15:12:21 +02:00
Mael Rouxel-Labbé d44adea081 Fix variable name 2020-05-12 15:11:07 +02:00
Maxime Gimeno ebe0a568a3 Add a read function in PMP for polygon_meshs 2020-05-12 13:52:46 +02:00
Mael Rouxel-Labbé ef22a4d035 Add a NP to call experimental clip_w/_self_intersections from PMP::clip 2020-05-11 19:03:35 +02:00
Mael Rouxel-Labbé d556bd0474 Minor bug fixes 2020-05-11 18:39:59 +02:00
Mael Rouxel-Labbé a620191023 Improve NP usage in clipping with self intersections 2020-05-11 17:30:37 +02:00
Mael Rouxel-Labbé 091d1ec195 Clarify variable names to avoid confusion between f from tmf and faces 2020-05-11 17:29:24 +02:00
Mael Rouxel-Labbé fa2f730832 Add experimental clipping with allowed self-intersections in input 2020-05-08 16:57:54 +02:00
Mael Rouxel-Labbé 1c5acc018a Enable PMP::Corefinement to work with VPMs of different types
Same value_type is still a precondition, though.
2020-05-08 13:45:35 +02:00
Mael Rouxel-Labbé b8e3a565e6 Fix incorrect NP for clipping output 2020-05-08 13:28:34 +02:00
Dmitry Anisimov 1056c9b428 removed trailing whitespaces 2020-05-08 11:52:53 +02:00
Dmitry Anisimov 89dc46fbac fairing bug with cotangent weights fix for the issue #4706 2020-05-07 20:03:21 +02:00
Sebastien Loriot c67ef14d3c
Merge pull request #4675 from sloriot/AABB_tree-cpp11DCL
Make the kd-tree build really lazy and fix thread safety of builds
2020-05-05 14:27:57 +02:00
Sébastien Loriot 12eb23c495 add more debug 2020-05-05 11:57:09 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Sébastien Loriot f0c8dcb0ef copy-paste error: call lock only once 2020-04-23 17:16:43 +02:00
Sébastien Loriot 9fbb6e84e0 remove useless use of the atomic variable 2020-04-23 16:51:30 +02:00
Sébastien Loriot 0c98cd8eee fix no-thread 2020-04-22 16:53:36 +02:00
Sébastien Loriot 969fe84181 use threadsafe lazy construction of the tree
use c++11 memory model to fix the Double-Checked Locking
2020-04-22 11:00:49 +02:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Maxime Gimeno 50766d9d03 Fixes for min/max 2020-04-21 11:52:56 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Sébastien Loriot c253679b2d unify np sentence 2020-04-18 16:27:58 +02:00
Sébastien Loriot 3b52dfd7de Merge remote-tracking branch 'cgal/master' 2020-04-18 14:47:28 +02:00
Sebastien Loriot 7a8fcde1bf
Merge pull request #4650 from sloriot/PMP-outward_oriented_doc
Fix is_outward_oriented doc
2020-04-16 16:40:43 +02:00
Sébastien Loriot a8f9858099 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-16 16:29:55 +02:00
Sebastien Loriot fb7d41a008
Merge pull request #4579 from sloriot/BGL-copy_face_graph_nm_vertices
Handle non-manifold vertices in copy_face_graph
2020-04-16 16:23:02 +02:00
Sébastien Loriot 5b8f369992 only works on triangle meshes 2020-04-14 17:23:29 +02:00
Mael Rouxel-Labbé 0435e0f49b Fix dead ref 2020-04-13 13:14:09 +02:00
Mael Rouxel-Labbé 48bd92b4dd Proof read all NP changes 2020-04-13 13:03:05 +02:00
Mael Rouxel-Labbé 8b212e8d5e Update some documentation to new NP 2020-04-12 20:46:43 +02:00
Mael Rouxel-Labbé 2337716bcd Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-04-12 20:46:35 +02:00
Sebastien Loriot 4cc75de998
Merge pull request #4595 from maxGimeno/PMP-Split-cc-enhancement-maxGimeno
PMP: Add a named_parameter to split_connected_components()
2020-04-06 15:31:59 +02:00
Mael Rouxel-Labbé 80f6f659f3 Update to new named parameters macros 2020-04-05 17:56:50 +02:00
Mael Rouxel-Labbé a1b0abfb08 Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-04-04 15:40:38 +02:00
Sébastien Loriot 950ce31a0c Merge pull request #4180 from maxGimeno/Doc_enhancements_and_clarifications-GF
PMP: Add a function to sample a triangle soup.
2020-04-02 14:10:42 +02:00
Sébastien Loriot d17219f1c2 Merge pull request #4603 from MaelRL/PMP-Fix_snap_default_tolerance_map_construction-GF
PMP: Fix copy-paste error leading to wrong dynamic pmap sizes
2020-04-02 13:57:09 +02:00
Sébastien Loriot 34299f037c Merge pull request #4140 from MaelRL/PMP-Make_remove_self_intersections_local-GF
PMP: Self-intersection local removal
2020-04-02 13:55:49 +02:00
Mael 507d6d17b5
Fix type 2020-04-02 10:18:06 +02:00
Maxime Gimeno fbc731b909 Fix PidMap value type 2020-04-02 10:00:33 +02:00
Mael 1fed67416b
Fix conversion warning 2020-04-01 15:25:52 +02:00
Mael Rouxel-Labbé 489869c543 Uniformize file names (repair_*) 2020-03-31 17:49:29 +02:00
Maxime Gimeno 213908af73 remove trailing whitespaces 2020-03-31 17:05:26 +02:00
Maxime Gimeno 6fce467f0c remove whitespaces 2020-03-31 17:02:02 +02:00
Mael Rouxel-Labbé 62040bafb5 Fix copy-paste error leading to wrong dynamic pmap sizes 2020-03-31 10:22:35 +02:00
Mael c766178456
Merge branch 'master' into PMP-Make_remove_self_intersections_local-GF 2020-03-30 09:44:36 +02:00
Mael Rouxel-Labbé e7d52999a8 Update PMP NPs to new macros 2020-03-29 17:16:50 +02:00
Mael Rouxel-Labbé 497f703077 Use new NP macros in PMP::clip.h 2020-03-27 22:20:33 +01:00
Sébastien Loriot dd8e02b7a8 fix macro name 2020-03-27 19:13:35 +01:00
Maxime Gimeno 9689a1c1a3 Merge remote-tracking branch 'cgal/master' into Doc_enhancements_and_clarifications-GF 2020-03-27 16:16:47 +01:00
Maxime Gimeno 5ff8d88151 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-27 16:15:38 +01:00
Maxime Gimeno b13e863065 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-27 16:12:19 +01:00
Sébastien Loriot 26962ace1c Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-27 16:06:59 +01:00
Maxime Gimeno 4e6fb685c6 Merge remote-tracking branch 'mine/CGAL_IO-maxGimeno' into HEAD 2020-03-27 11:11:10 +01:00
Maxime Gimeno 9c0648a004 Merge tag 'master_before_no_tws_nor_tabs' into CGAL_IO-maxGimeno 2020-03-27 11:05:43 +01:00
Sébastien Loriot ba42fcb6ca Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:36:40 +01:00
Sébastien Loriot d1c1ca2399 Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:19:39 +01:00
Sébastien Loriot e6e9e23fdd extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:40:08 +01:00
Sébastien Loriot 95e2f8055f Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:39:47 +01:00
Sébastien Loriot 92f5f0242e Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:04:33 +01:00
Sébastien Loriot 754699b33d extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:59:49 +01:00
Sébastien Loriot 4c094fd3c2 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:59:19 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Sébastien Loriot 5aa25a5f8e handle already updated links 2020-03-25 11:48:08 +01:00
Sébastien Loriot 9a3285be73 fix patch dumping 2020-03-25 11:46:05 +01:00
Sébastien Loriot ea80a641ec check init only if writable 2020-03-24 14:30:57 +01:00
Sébastien Loriot 9c0e99ab51 input must be triangulated 2020-03-24 14:29:45 +01:00
Maxime Gimeno 5762211d39 add split iso_cuboid 2020-03-24 10:05:29 +01:00
Sébastien Loriot ed5c6f1a1b change a test into a precondition 2020-03-24 09:41:00 +01:00
Maxime Gimeno c3bcf9cbfe Changes after review 2020-03-23 16:11:08 +01:00
Maxime Gimeno bc956295da Add face_patch_map as NP to split_connected_components() to allow giving an existing map to the function and avoid having to recompute it. 2020-03-23 13:24:21 +01:00
Mael Rouxel-Labbé af1c69354b Merge remote-tracking branch 'cgal/master' into PMP-Make_remove_self_intersections_local-GF 2020-03-20 15:44:51 +01:00
Maxime Gimeno 9ecbd05a4c update fimap + default concurrency tag 2020-03-20 14:01:40 +01:00
Mael de563e9844
Merge branch 'master' into PMP-new_functions-GF 2020-03-20 08:48:39 +01:00
Sébastien Loriot 954d23a64c Merge pull request #4418 from sloriot/PMP-soup_to_mesh_add_vpm
PMP: Add `point_map` and `vertex_point_map` to `polygon_soup_to_polygon_mesh`
2020-03-19 16:22:58 +01:00
Mael 38abfdfa1f
Tiny clarification 2020-03-18 08:51:09 +01:00
Mael 5bf302092d
Update comments 2020-03-18 08:49:05 +01:00
Sébastien Loriot 8eeee9c9a8 Update from master after default initialized index maps
Merge-commit + default map fixes
2020-03-18 08:10:54 +01:00
Mael Rouxel-Labbé 72bfe2c96d Use the new index map BGL API 2020-03-17 20:29:48 +01:00
Mael Rouxel-Labbé d84bf86b61 Clean indentation (no other changes) 2020-03-17 20:19:46 +01:00
Mael Rouxel-Labbé c95082deca Fix doc of NP face_index_map 2020-03-17 20:13:18 +01:00
Mael Rouxel-Labbé 44f683db8e Fix bad merge resolution 2020-03-17 20:07:28 +01:00
Mael Rouxel-Labbé 618a72b739 Merge remote-tracking branch 'cgal/master' into PMP-soup_to_mesh_add_vpm 2020-03-17 20:00:31 +01:00
Mael 8ee3ec8f7b
Merge branch 'master' into PMP-Add_split_to_clip-GF 2020-03-17 19:47:28 +01:00
Sebastien Loriot 1454b9903c
Merge pull request #4209 from maxGimeno/PMP-Default_pmap-maxGimeno
PMP: Default Property_maps for Index_maps
2020-03-17 18:27:55 +01:00
Sébastien Loriot ed2067f461 using new API 2020-03-17 17:08:32 +01:00
Sébastien Loriot e437fe049a fix link 2020-03-17 16:04:38 +01:00
Sébastien Loriot dc85217d5a fixes after @afabri's review 2020-03-17 15:49:46 +01:00
Sébastien Loriot d8e2691bfa typo 2020-03-17 11:10:21 +01:00
Sébastien Loriot b032917945 more doc 2020-03-17 11:09:08 +01:00
Sébastien Loriot 440f9f1e77 remove todo that it does not worth implement 2020-03-17 10:49:33 +01:00
Sébastien Loriot b26905f2e6 doc requirement on vpm 2020-03-17 10:31:51 +01:00
Sébastien Loriot 6b8f85495f remove extra spaces 2020-03-17 10:24:57 +01:00
Sébastien Loriot 8d00b92bba add precondition 2020-03-17 10:20:04 +01:00
Sébastien Loriot e9c9359f9a fix indentation 2020-03-17 10:19:34 +01:00
Sébastien Loriot d44dad60c2 still collect faces if cc_handled as it is used to set the volume id 2020-03-17 09:50:52 +01:00
Mael Rouxel-Labbé c33e8b60d7 Merge remote-tracking branch 'maxgimeno/PMP-Default_pmap-maxGimeno' into CGAL_IO-maxGimeno 2020-03-17 09:33:19 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Sébastien Loriot 32813dc976 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-16 16:32:47 +01:00
Sebastien Loriot fc14d200ff
Merge pull request #4578 from sloriot/PMP-doc_clip_default
PMP: Document default values in clip()
2020-03-16 16:30:53 +01:00
Sébastien Loriot cf99ea072d Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-16 16:19:38 +01:00
Maxime Gimeno 701a7f6774 Doc fixes and cpp11 2020-03-16 12:08:49 +01:00
Mael Rouxel-Labbé 9f909ce0da Also allow arrays to be used in PM_to_PS 2020-03-14 21:59:02 +01:00
Mael Rouxel-Labbé c56c0a604d Clarify description of function parameter 2020-03-13 10:40:16 +01:00
Sébastien Loriot 3d66c590bd doc default values 2020-03-13 05:18:05 +01:00
Maxime Gimeno 2424d54e30 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-12 12:10:44 +01:00
Maxime Gimeno fcf6245e48 Fix some doc 2020-03-12 12:09:15 +01:00
Maxime Gimeno fe4fd26735 Fix doc 2020-03-12 09:18:05 +01:00
Sébastien Loriot 2280bea679 add missing inline 2020-03-10 10:57:52 +01:00
Mael Rouxel-Labbé 63e1a33a4f Add missing #include 2020-03-10 09:07:23 +01:00
Mael Rouxel-Labbé e8757d451a Clarify doc of PMP::clip
The face_index_map must be writable or stay well-initialized throughout
creation and deletion of faces.
2020-03-09 10:02:44 +01:00
Mael Rouxel-Labbé 645d81d298 Clean documentation
These mentions can be regrouped in the namedparameters.txt file
2020-03-09 09:59:41 +01:00
Mael Rouxel-Labbé 54b5f74edd Remove obsolete call dispatcher mechanism
Which also was kinda broken: if a face index map was actually passed as
named parameter, it would be ignored.
2020-03-09 09:57:13 +01:00
Mael Rouxel-Labbé d7f24b98e8 Correctly initialize face index maps in coref/autoref 2020-03-09 09:56:55 +01:00
Mael Rouxel-Labbé 84186fc78f Allow face index maps of different type in Face_graph_output_builder
+ don't take references to property maps
2020-03-09 09:55:58 +01:00
Mael Rouxel-Labbé 9d5ce20393 Clean doc 2020-03-06 18:16:37 +01:00
Mael Rouxel-Labbé 38da5ae2c4 Rename 'faces' parameter to avoid conflict with function 'faces(FaceGraph)' 2020-03-06 15:30:39 +01:00
Mael Rouxel-Labbé ad62f89a20 Use the new index map initializer functions and fix doc 2020-03-06 15:25:38 +01:00
Mael Rouxel-Labbé 798a476d63 Merge branch 'PMP-Default_pmap-maxGimeno-old' into PMP-Default_pmap-maxGimeno 2020-03-06 13:20:00 +01:00
Mael Rouxel-Labbé 3d7b084c66 Merge branch 'PMP-Fix_merge_duplicated_vertices-GF-old' into PMP-Fix_merge_duplicated_vertices-GF 2020-03-06 12:59:36 +01:00
Mael Rouxel-Labbé 285829361b Merge branch 'PMP-Halfedge_comparer_for_stitch_borders-GF-old' into PMP-Halfedge_comparer_for_stitch_borders-GF 2020-03-06 12:41:13 +01:00
Mael 150d6cbe44 Uniformize todos 2020-03-06 12:18:32 +01:00
Mael Rouxel-Labbé 8d4313f7a8 Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2020-03-06 12:13:30 +01:00
Mael Rouxel-Labbé 0133e9f2f9 Merge branch 'PMP-soup_to_mesh_add_vpm-old' into PMP-soup_to_mesh_add_vpm 2020-03-06 11:41:31 +01:00
Mael Rouxel-Labbé 4a77f29804 Replace index map validity runtime check with an assertion 2020-03-05 17:02:25 +01:00
Mael Rouxel-Labbé 96b6cd002b Remove obsolete call to index map initializations
These maps are obtained using get_initialized_face_index_map(g, np)
2020-03-05 15:32:02 +01:00
Laurent Rineau 79699f9fc2 Merge pull request #4259 from MaelRL/PMP-Snapping_improvements-GF
PMP: Improvements for snapping
2020-03-05 15:06:46 +01:00
Jane Tournois 21ee697498 merge both `if` conditions 2020-03-05 15:02:55 +01:00
Laurent Rineau b281902cf9 Merge pull request #4551 from MaelRL/CGAL-Fix_todo_doc_warning-GF
PMP: Fix doxygen warnings
2020-03-05 14:52:03 +01:00
Jane Tournois dd2c0e4e89 consider surface patches border halfedges as PATCH_BORDERS
surface patch borders should be considered similarly to constrained edges,
so that they still represent the same polyline after remeshing
+ it is what is documented
2020-03-05 12:27:20 +01:00
Mael Rouxel-Labbé 14582b1be9 Fix compilation (wrong mesh type) 2020-03-05 11:42:54 +01:00
Mael Rouxel-Labbé ca68f22f8d Update usage of internal index map initializer to new API 2020-03-04 14:20:56 +01:00
Mael Rouxel-Labbé 432d5c724a Improve usages of get_initialized_xxx_index_map 2020-03-04 13:37:09 +01:00
Mael Rouxel-Labbé 889108e253 Update get_initialize_xxx_index_map usages to new API 2020-03-04 12:58:42 +01:00
Mael Rouxel-Labbé c4ea4d9d99 More doc fixes 2020-03-02 13:35:43 +01:00
Mael Rouxel-Labbé d5892508c3 Store the squared lengths, avoid sqrt calls 2020-03-02 13:33:43 +01:00
Mael Rouxel-Labbé 05703c10b9 Fix somes issues in the doc of PMP::distance.h 2020-03-02 12:43:09 +01:00
Mael Rouxel-Labbé 8ed12b7ec0 Add undocumented template parameters 2020-03-02 12:13:15 +01:00
Mael Rouxel-Labbé 83dbc1345f Use const& to points 2020-03-02 12:13:02 +01:00
Mael Rouxel-Labbé b57a1d7378 Replace BOOST_FOREACH by modern for loop 2020-03-02 12:12:30 +01:00
Mael Rouxel-Labbé 7ffb30838d Uniformize member names 2020-03-02 12:11:48 +01:00
Mael Rouxel-Labbé d1da11a502 Avoid some copies of named parameters 2020-03-02 12:10:35 +01:00
Mael Rouxel-Labbé 1c3e412cfd Rename template parameter for clarity 2020-03-02 11:44:21 +01:00
Mael Rouxel-Labbé a17d6a853e Fix includes 2020-03-02 11:42:54 +01:00
Mael Rouxel-Labbé 6b58618ba6 Clean code (indentation, trailing whitespace etc.) 2020-03-02 11:42:36 +01:00
Mael Rouxel-Labbé 71f2474944 Fix leftover '///' that ought to be '//'
Causes issues with Doxygen
2020-03-02 09:42:54 +01:00
Mael Rouxel-Labbé c6fa8c03b5 Uniformize todos 2020-03-02 09:42:35 +01:00
Mael 6b147c89a0
Fix doc 2020-02-28 13:59:42 +01:00
Mael 733fd95df7
Misc cleaning 2020-02-28 13:58:19 +01:00
Mael Rouxel-Labbé badbee5c31 Minor doc fixes 2020-02-28 13:27:44 +01:00
Mael Rouxel-Labbé 994b4858b2 Doc fixes 2020-02-28 12:56:38 +01:00
Mael Rouxel-Labbé 26463ded7a Update NPs using default constructed default values to new API
+ misc cleaning
2020-02-28 11:55:17 +01:00
Mael Rouxel-Labbé 09cb327ac3 Use dummy initialization to silence a warning 2020-02-27 09:19:49 +01:00
Mael Rouxel-Labbé f9c6cea0fd Hide debug code behind macros 2020-02-25 15:30:11 +01:00
Mael Rouxel-Labbé 0c77ffe593 Fix includes 2020-02-25 15:29:56 +01:00
Sébastien Loriot 03bf465cb7 use predicates 2020-02-25 15:28:15 +01:00
Mael Rouxel-Labbé 916573af3d Fix and enhance merge_duplicate_vertices_in_boundary_cycles
Bug fix: improper check of overlapping intervals
Enhancement: don't throw everything as soon as there is a pair
             of intervals that are incompatible, only remove
	     one of the intervals (taken arbitrarily as the widest)
2020-02-25 15:21:19 +01:00
Maxime Gimeno 9a454ca7e2 Changes after review 2020-02-21 11:43:08 +01:00
Maxime Gimeno 077a129216 Merge remote-tracking branch 'cgal/master' into PMP-Default_pmap-maxGimeno 2020-02-21 10:34:14 +01:00
Mael Rouxel-Labbé 636665a96c Fix types 2020-02-20 12:14:27 +01:00
Mael Rouxel-Labbé 9c51e3fba7 Add polygon_mesh_to_polygon_soup() 2020-02-20 11:14:06 +01:00
Mael Rouxel-Labbé ec6a4dbd17 Fix documentation 2020-02-20 11:13:18 +01:00
Mael Rouxel-Labbé 554be421d9 Add convience overloads for PS_to_PM_converter (no property maps passed) 2020-02-20 11:12:40 +01:00
Mael Rouxel-Labbé 21763ff4bf Fix unused typedef warning 2020-02-20 11:11:32 +01:00
Mael Rouxel-Labbé 5db42d1e8b Fix order of template parameters 2020-02-19 18:24:31 +01:00
Mael Rouxel-Labbé 51f4831d1f Add point_map and vertex_point_map NP to PMP::PS_to_PM 2020-02-19 18:01:45 +01:00
Mael Rouxel-Labbé 832090c249 Merge branch 'PMP-soup_to_mesh_add_vpm-old' into PMP-soup_to_mesh_add_vpm 2020-02-19 17:28:54 +01:00
Mael Rouxel-Labbé 35eaa07bde Misc cleaning 2020-02-19 16:49:11 +01:00
Mael Rouxel-Labbé 1a4858a6fa Fix includes 2020-02-19 16:37:32 +01:00
Mael Rouxel-Labbé 374870a6cb Misc minor fixes 2020-02-19 16:07:55 +01:00
Maxime Gimeno 5538786eff Merge remote-tracking branch 'cgal/master' into PMP-Default_pmap-maxGimeno 2020-02-14 15:00:54 +01:00
Laurent Rineau 034bc95674 Merge pull request #4506 from sloriot/PMP-clip_better_doc
Improve clip doc and tests
2020-02-14 14:46:32 +01:00
Laurent Rineau b7c237515a Merge pull request #4524 from sloriot/PMP-inplace_bo_fix
Handle the case of interior vertex
2020-02-14 14:46:19 +01:00
Laurent Rineau 31416b1cf2 Merge pull request #4506 from sloriot/PMP-clip_better_doc
Improve clip doc and tests
2020-02-14 14:45:55 +01:00
Laurent Rineau a98583f1ec Merge pull request #4506 from sloriot/PMP-clip_better_doc
Improve clip doc and tests
2020-02-14 14:39:19 +01:00
Laurent Rineau 16e7715c31 Merge pull request #4524 from sloriot/PMP-inplace_bo_fix
Handle the case of interior vertex
2020-02-14 14:39:05 +01:00
Maxime Gimeno 249eb85060 fixes 2020-02-14 14:25:28 +01:00
Maxime Gimeno b55239023d Doc fixes 2020-02-14 09:09:53 +01:00
Maxime Gimeno 1179b0a934 Fixes after review 2020-02-13 16:11:53 +01:00
Maxime Gimeno 201932abfb Merge remote-tracking branch 'cgal/master' into Doc_enhancements_and_clarifications-GF 2020-02-13 15:05:38 +01:00
Sébastien Loriot 3501af6c61 handle the case of interior vertex
The vertex becomes interior after the stitch of the patch
while being the endpoint of a polyline to be removed

fix patch introduced in 6e31445f62
2020-02-13 14:38:19 +01:00
Maxime Gimeno 6db578509d add np to bbox() 2020-02-11 14:47:46 +01:00
Maxime Gimeno e9864cf874 Fixes after review 2020-02-11 14:13:56 +01:00
Maxime Gimeno 0378d7825f Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-02-10 15:53:05 +01:00
Maxime Gimeno f60d8d24ec more fixes after review 2020-02-10 14:41:05 +01:00
Maxime Gimeno 4716359ca6 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-02-10 14:29:56 +01:00
Maxime Gimeno e3ace2289d First batch of fixes after review 2020-02-10 14:28:45 +01:00
Mael Rouxel-Labbé cb3e5cd83c Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2020-02-07 17:09:59 +01:00
Mael bb4247e143
Merge branch 'master' into PMP-Snapping_improvements-GF 2020-02-07 16:31:28 +01:00
Laurent Rineau 49a06e9201 Merge pull request #4362 from afabri/Box_intersection_d-accelerate-GF
PMP::self_intersections: Add Concurrency
2020-02-07 16:25:06 +01:00
Laurent Rineau 0fd7bbc4ff Merge pull request #4364 from afabri/CGAL-Parallel_if_available_tag
CGAL:: Add Parallel_if_available_tag
2020-02-07 16:25:03 +01:00
Laurent Rineau 21570cde72 Merge pull request #4416 from sloriot/PMP-clip_box
Add clipping overload to a iso-cuboid
2020-02-07 16:24:57 +01:00
Laurent Rineau 36cb11d01b Merge pull request #4417 from sloriot/PMP-cc_remove_boost_call
Remove call to boost in PMP::connected_components
2020-02-07 16:24:55 +01:00
Laurent Rineau c490d01e7f Merge pull request #4489 from MaelRL/PMP-Relax_assertion_in_compute_normal-GF
PMP: Fixes for compute_normals
2020-02-07 16:24:36 +01:00
Mael Rouxel-Labbé 84215c95c4 Merge branch 'Box_intersection_d-accelerate-GF-old' into Box_intersection_d-accelerate-GF 2020-02-07 11:03:07 +01:00
Mael Rouxel-Labbé b7d2646421 Fix sanity check not failing on self-intersections 2020-02-06 17:14:29 +01:00
Mael Rouxel-Labbé 29ddd67b8d Clean temp code 2020-02-06 17:14:16 +01:00
Mael Rouxel-Labbé f1969fc5b8 Remove unused debug functions 2020-02-06 16:18:42 +01:00
Mael Rouxel-Labbé 0ddf33c9df Use PM_to_PS in the demo 2020-02-06 16:15:15 +01:00
Mael Rouxel-Labbé 035536527c Misc cleaning 2020-02-06 15:49:33 +01:00
Mael Rouxel-Labbé 5202712322 Fix polygon soup initialization 2020-02-06 15:49:00 +01:00
Mael Rouxel-Labbé 3f32279011 More null angle handling in smoothing 2020-02-06 15:48:22 +01:00
Mael Rouxel-Labbé 19c7ea8f30 Remove non-existent header 2020-02-06 12:06:54 +01:00
Mael Rouxel-Labbé c2baf0a2ae Add missing ';' 2020-02-06 12:02:41 +01:00
Sébastien Loriot 23f66eeed3 splitter vpm is not needed to duplicate halfedge in tm 2020-02-06 11:48:46 +01:00
Mael Rouxel-Labbé 239d4479fa Try to work around stretched faces giving 0 angle in smoothing 2020-02-06 09:56:22 +01:00
Mael Rouxel-Labbé af075b2033 Remove assertion that can be triggered by numerical errors 2020-02-06 09:55:10 +01:00
Mael Rouxel-Labbé f33618e5e8 Uniformize macros 2020-02-06 09:54:35 +01:00
Sébastien Loriot ccfd82bfb9 improve doc and test 2020-02-05 19:09:08 +01:00
Mael dca752395e
Remove assertion 2020-02-05 18:28:08 +01:00
Mael Rouxel-Labbé e72756eb0a Mini code cleaning 2020-02-05 18:11:26 +01:00
Mael Rouxel-Labbé 0bd5511803 Add some more verbosity 2020-02-05 18:11:10 +01:00
Mael Rouxel-Labbé fb92ab7171 Do smoothing on an extracted mesh instead of the main mesh
The point is to avoid having to restore the initial mesh which is costly
and also difficult if the initial patch has non-manifoldness.
2020-02-05 18:09:51 +01:00
Mael Rouxel-Labbé bd31fb8672 Fix compilation of polygon_mesh_to_PS 2020-02-05 18:08:54 +01:00
Mael Rouxel-Labbé a2bdfd57c9 Never allow degenerate faces to be created in smoothing
Regardless of whether "safe moves only" is being used or not.

Degenerate faces are annoying because the normal is undefined (null_vector)
and then things get tricky.

The hope is that if a move would create a degenerate face, we can
just not move it, and hope that the degenerate face would not appear
on the next move.
2020-02-05 18:08:25 +01:00
Mael Rouxel-Labbé 238e18f002 Add polygon_mesh_to_polygon_soup (undocumented) 2020-02-05 15:32:22 +01:00
Mael Rouxel-Labbé 677ea630f8 Don't flip anything in weird situations 2020-02-05 11:32:40 +01:00
Mael Rouxel-Labbé 8773cee832 Minor code improvements 2020-02-05 10:54:11 +01:00
Mael Rouxel-Labbé 0c05fc6e80 More fixes for normal computations of meshes with degenerate faces 2020-02-04 16:02:03 +01:00
Mael Rouxel-Labbé bbdc79f9b8 More fixes for normal computations of meshes with degenerate faces 2020-02-04 15:56:55 +01:00
Mael Rouxel-Labbé 33766800b6 Fix some corner cases with the new compute normals and degenerate faces 2020-02-04 14:29:08 +01:00
Mael Rouxel-Labbé eec9b0b227 Fix corner case in sin weight normal computations 2020-02-04 14:29:03 +01:00
Mael Rouxel-Labbé 1a3f0cf982 Fix corner case in sin weight normal computations 2020-02-03 18:24:08 +01:00
Mael Rouxel-Labbé 81f04ac2d9 Move remove_self_intersections to PMP::experimental 2020-02-03 18:12:45 +01:00
Mael Rouxel-Labbé 6339e80f71 Remove Hausdorff checks, properly pass parameters, polish 2020-02-03 18:12:15 +01:00
Mael Rouxel-Labbé 38367410c3 Fix some corner cases with the new compute normals and degenerate faces 2020-02-03 18:10:41 +01:00
Mael Rouxel-Labbé 1eb323fcbd Relax assertion due to numerical errors that can sneak in
Logically speaking, the vector nb is the bisector of ni and nj,
so ni.nb and nj.nb are positive by construction.
2020-02-03 17:40:38 +01:00
Mael e9ca254a31
Fix using old BGL API 2020-02-03 13:27:46 +01:00
Mael Rouxel-Labbé 32aa902bf5 Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2020-02-03 13:05:52 +01:00
Mael 2632f96002
Fix value type 2020-02-03 12:11:41 +01:00
Mael 3f46d8cdd5
Merge branch 'master' into PMP-cc_remove_boost_call 2020-02-03 12:09:51 +01:00
Maxime Gimeno 13b2c0201e Merge remote-tracking branch 'cgal/master' into PMP-volume_segmentation 2020-01-31 15:05:51 +01:00
Maxime Gimeno 65ee6f8744 remove unused variables and typedefs 2020-01-31 09:38:58 +01:00
Maxime Gimeno a7527329ce More fixes 2020-01-30 17:03:37 +01:00
Mael 8f29c7cb63
Merge branch 'master' into CGAL-Parallel_if_available_tag 2020-01-29 16:42:54 +01:00
Laurent Rineau 5fc7b97e32 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:34:56 +01:00
Laurent Rineau 315a0b54d1 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:27:53 +01:00
Mael Rouxel-Labbé 7f6bf9b3cb Add skeletons for CGAL::read_PS, CGAL::read_PM, PMP::read_PM 2020-01-29 11:44:03 +01:00
Maxime Gimeno 6a7e89d3aa use make_range() 2020-01-28 14:43:29 +01:00
Maxime Gimeno 28fa68d4f8 more boost::choose_param 2020-01-28 13:52:02 +01:00
Maxime Gimeno 67a5b4d8c5 more clean-up after review 2020-01-28 13:42:46 +01:00
Maxime Gimeno fb898e4cfa fix license 2020-01-28 10:44:36 +01:00
Maxime Gimeno 438826380d Clean-up after review 2020-01-28 10:44:36 +01:00
Maxime Gimeno 82f0f86733 Fixes and example 2020-01-28 10:44:23 +01:00
Maxime Gimeno 19a77a50ef Finish doc 2020-01-28 10:41:52 +01:00
Maxime Gimeno c9b233903c Update licenses 2020-01-28 10:41:52 +01:00
Maxime Gimeno 1e4c694b06 Fix doc 2020-01-28 10:41:52 +01:00
Maxime Gimeno 8ca28b8398 Move soup orientation functions to a new header to avoid new unwanted dependencies 2020-01-28 10:41:52 +01:00
Sébastien Loriot 55194a70af TM->PM 2020-01-28 10:41:52 +01:00
Sébastien Loriot 1c48a0e05b remove useless condition from a previous test 2020-01-28 10:41:52 +01:00
Sébastien Loriot 8f28d04b9d cosmetic fixes 2020-01-28 10:41:52 +01:00
Sébastien Loriot 7e41a19d41 extend the code to handle more than cycles entirely matching 2020-01-28 10:41:52 +01:00