Commit Graph

3852 Commits

Author SHA1 Message Date
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
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
Sébastien Loriot 035b8786b9 remove tws 2020-06-22 09:53:13 +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
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
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
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
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é 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
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
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
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
Sébastien Loriot 0c85cbfcf4 simplify example 2020-05-05 12:16:14 +02:00
Sébastien Loriot 12eb23c495 add more debug 2020-05-05 11:57:09 +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
Maxime Gimeno d7a18b913d More errors and warnigns 2020-04-23 09:30:28 +02:00
Maxime Gimeno 8da84d4748 More errors and warnigns 2020-04-23 09:27:54 +02:00
Maxime Gimeno c74bca8d65 More errors and warnigns 2020-04-23 09:27:26 +02:00
Sébastien Loriot 0c98cd8eee fix no-thread 2020-04-22 16:53:36 +02:00
Maxime Gimeno 97d2eaebd9 more fixes 2020-04-22 11:03:38 +02:00
Maxime Gimeno 6a51a30828 more fixes 2020-04-22 11:02:47 +02:00
Maxime Gimeno 9bf61b7977 more fixes 2020-04-22 11:02:16 +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
Simon Giraudot 1dd6a665a1 Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-04-20 09:09:32 +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 a860a7ea5a
Merge pull request #4404 from MaelRL/CGAL-Optimal_bounding_box-GF
New Package: Optimal Bounding Box
2020-04-16 18:10:58 +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
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Sébastien Loriot 5b8f369992 only works on triangle meshes 2020-04-14 17:23:29 +02:00
Sébastien Loriot c559af48eb use non deprecated API 2020-04-14 16:02:24 +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
Mael Rouxel-Labbé c16c1a7ea3 Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-04-10 16:10:11 +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é 16092f53d6 Update doc about NPs 2020-04-05 17:56:11 +02:00
Mael Rouxel-Labbé 9c5b85fdcd Fix macro in PMP/NP.txt 2020-04-05 15:34:41 +02:00
Mael Rouxel-Labbé fc79510388 Regroup NP aliases into the base doxyfile.in 2020-04-04 17:26:32 +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 5fd10e6f66 fix bad renaming 2020-04-02 15:17:25 +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 9d138a788d
Fix compilation 2020-04-02 13:14:07 +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 Rouxel-Labbé 28500eae87 Remove undocumented examples using experimental functions!!!!! 2020-03-30 17:24:52 +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
Mael Rouxel-Labbé 538834acb0 New macros for revamped NPs 2020-03-27 22:20:17 +01:00
Mael Rouxel-Labbé aac2efe8c7 Add some code to create collapsible named parameters 2020-03-27 20:23:40 +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
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 35b83deffd Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:16:25 +01:00