Commit Graph

3925 Commits

Author SHA1 Message Date
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
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é 1c53aea4e2 Add missing 'const' qualifiers 2020-08-06 08:50:41 +02:00
Mael Rouxel-Labbé 2375fed008 Enhance example to use custom traits (and test array-based PS_to_PM/repair_PS) 2020-08-05 10:49:54 +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
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +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é 1d016ecc7e IO doc fixes 2020-07-28 15:38:19 +02:00
Mael Rouxel-Labbé 9d820d64cb Add more tests for repair_polygon_soup 2020-07-28 10:14:31 +02:00
Mael Rouxel-Labbé 5a6fc89495 Fix and simplify polygon soup repairing subfunction "simplify_polygon" 2020-07-28 09:56:02 +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 6553b0dfaa
Remove deleted example from CMakeLists.txt 2020-07-16 09:27:55 +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
Mael bbedb5e8b4
Fix name of property maps 2020-07-13 10:19:06 +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
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
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
Mael Rouxel-Labbé 594eb97a22 Doc improvements 2020-06-25 21:01:04 +02:00
Mael Rouxel-Labbé 0fc3841d38 Fix PMP appearing in PMP/doc/dependencies 2020-06-25 18:21:02 +02:00
Mael Rouxel-Labbé 2b18b8d8be Fix broken doc references 2020-06-25 15:17:44 +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
Laurent Rineau dad9db1094 Merge pull request #4774 from lrineau/CGAL-remove_cpp11-GF
Remove cpp11::(tuple|get)
2020-06-23 18:50:17 +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é 9cca59ba36 Actually use the new IO functions + some example improvements 2020-06-23 18:24:39 +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
Sébastien Loriot 035b8786b9 remove tws 2020-06-22 09:53:13 +02:00
Mael Rouxel-Labbé 52d50f7d79 Doc improvements 2020-06-21 13:30:53 +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
Sébastien Loriot ab12e31bec please doc 2020-06-17 08:33:50 +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 fd72d53d5f test do_not_modify 2020-06-16 16:15:09 +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
Maxime Gimeno 25c8313859 Replace IO functions in examples and fix Surface_mesh read_OFF() 2020-06-16 14:36:24 +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
Maxime Gimeno 7de5f28310 Fix pmp example about eigen 2020-06-12 09:41:02 +02:00
Mael Rouxel-Labbé e7fd86c2ef Add example of clipping w/ SI 2020-06-12 09:16:41 +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
Maxime Gimeno 3383282d06 Add test for PMP function 2020-06-11 16:05:55 +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
Maxime Gimeno fe7d6e53f8 WIP 2020-06-10 16:35:15 +02:00
Laurent Rineau 9b8ecd720b Merge pull request #4636 from sgiraudot/CMake-Third_party_imported_targets-GF
CMake: Use Imported Targets for 3rd Party Libs
2020-06-05 17:54:14 +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
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +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
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
Mael Rouxel-Labbé a574fa70c8 Add a test for which single-boundary stitching creates multiple smaller holes 2020-05-22 14:37:04 +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
Laurent Rineau 3b1cdf2956 Merge pull request #4711 from danston/Polygon_mesh_processing-fair_weights_bug_fix-danston
PMP fairing cotangent weights issue fix
2020-05-18 12:05:38 +02:00
Sébastien Loriot 2169dd52aa warnings + compilation fixes 2020-05-18 08:49:14 +02:00
Mael Rouxel-Labbé 9fa5132e8c Add news tests for PMP::stitch_borders 2020-05-15 20:23:23 +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
Mael Rouxel-Labbé 65e612d26a Do not use the deprecated API of copy_face_graph in stitching tests 2020-05-15 14:59:25 +02:00
Maxime Gimeno 20898e4b31 fix functions calls 2020-05-14 13:46:57 +02:00
Sébastien Loriot 84fe1d2af0 hide verbose/debug code 2020-05-13 09:16:50 +02:00
Mael Rouxel-Labbé faf265f055 Enhance tests 2020-05-12 19:24:48 +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
Sébastien Loriot 7c4586be1b Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-05-12 16:59:02 +02:00
Sébastien Loriot fb83386f44 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-05-12 16:58:32 +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
Maxime Gimeno 098cc6abde Fix a PMP example 2020-05-06 11:31:13 +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