Commit Graph

4046 Commits

Author SHA1 Message Date
Sébastien Loriot 93855b1af1 Merge PMP-compare_faces_from_meshes-maxGimeno into gsoc2019-PMPHDist-martinskrodzki 2021-04-29 10:36:22 +02:00
Sébastien Loriot b4787adc19 allow difference mesh types 2021-04-29 10:35:26 +02:00
Dmitry Anisimov 1f114461c4 removed return with realizing triangles + added naive version of symmetric distance 2021-04-28 17:14:22 +02:00
Dmitry Anisimov 4db22ca4ae removed internal test code that did not prove to be useful 2021-04-28 16:55:15 +02:00
Dmitry Anisimov 5c3ae06de7 group traversal should be called only on TM2 2021-04-28 15:44:34 +02:00
Laurent Rineau ab887fd909 Merge pull request #5634 from sloriot/PMP-improve_conditionnal_code
Simplify conditional code
2021-04-28 15:24:05 +02:00
Laurent Rineau b775b04eb8 Merge pull request #5637 from sloriot/PMP-hole_filling_empty_range_warning
Fix use of empty range
2021-04-28 15:24:01 +02:00
Dmitry Anisimov b45de72547 tested bbox comparisons but I do not think we can use them so they are off 2021-04-28 15:23:35 +02:00
Laurent Rineau 795c931b55 Merge pull request #5637 from sloriot/PMP-hole_filling_empty_range_warning
Fix use of empty range
2021-04-28 15:22:41 +02:00
Dmitry Anisimov 4ce1370043 tested group traversal, its sequential version is slower due to more candidate triangles 2021-04-28 11:37:49 +02:00
Sébastien Loriot 1faa0e2992 replace internal use of boost::shared_ptr by std::shared_ptr 2021-04-28 10:55:26 +02:00
Sébastien Loriot c3e5294df3 add extra function for group traversal
not activate for now
2021-04-27 19:24:56 +02:00
Dmitry Anisimov a2f460c9d6 Merge branch 'master' into gsoc2019-PMPHDist-martinskrodzki 2021-04-27 18:37:32 +02:00
Dmitry Anisimov 85f88c218a added inexact check with distances + more precise realizing triangles 2021-04-27 18:25:58 +02:00
Dmitry Anisimov 860cad669a added tighter bounds, changed std min/max to CGAL one, added missing realizing triangles 2021-04-27 16:46:02 +02:00
Dmitry Anisimov 930d364c3f face to triangle map made global 2021-04-27 12:43:47 +02:00
Dmitry Anisimov 95ab1a57a0 tests moved to the test folder 2021-04-27 11:22:55 +02:00
Dmitry Anisimov 5e99e80134 refined and debugged aabb tree with priority traversal 2021-04-26 17:07:19 +02:00
Dmitry Anisimov 7b8deffb9e Merge remote-tracking branch 'maxGimeno/PMP-compare_faces_from_meshes-maxGimeno' into gsoc2019-PMPHDist-martinskrodzki 2021-04-26 15:23:04 +02:00
Dmitry Anisimov 4cf4e2c50a return a pair of realizing triangles, still to be discussed 2021-04-26 15:21:58 +02:00
Dmitry Anisimov 69c48308cc added test for realizing triangles, updated how the bounds are stored, removed useless types 2021-04-26 13:04:59 +02:00
Maxime Gimeno ce9bf321df use num_vertices() instead of vertices().size() (garbage probleme in SMesh) 2021-04-23 16:16:53 +02:00
Dmitry Anisimov f92e24f9c2 now we can return realizing triangles 2021-04-23 16:01:32 +02:00
Dmitry Anisimov 1b892e0558 subdivision tested - it works 2021-04-23 15:41:57 +02:00
Dmitry Anisimov 6bf1966012 partially fixed issue for match faces + added minimum example for that issue 2021-04-23 14:37:58 +02:00
Sébastien Loriot 0eea836f1e handle empty point range 2021-04-23 08:46:28 +02:00
Dmitry Anisimov 9a9c3ed887 a few comments in addition to the discussion with Sebastien and Martin 2021-04-22 12:19:58 +02:00
Sébastien Loriot b0a05ab501 fix default 2021-04-21 17:50:47 +02:00
Sébastien Loriot 8a3d9ad124 restrict the usage of the macro
everything is local now
2021-04-21 17:48:08 +02:00
Sébastien Loriot f513a791e2 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-21 15:48:36 +02:00
Sébastien Loriot eef92fbef7 Merge remote-tracking branch 'cgal/5.1.x-branch' 2021-04-21 15:47:06 +02:00
Sebastien Loriot fa4a31a87b
Merge pull request #5583 from sloriot/PMP-face_epsilon_map
Polyhedral_envelope: face epsilon map
2021-04-21 15:26:48 +02:00
Dmitry Anisimov 2f5ff51c60 missing include 2021-04-21 12:21:15 +02:00
Dmitry Anisimov 33d2f1073a optimized AABB tree calls 2021-04-21 11:48:56 +02:00
Dmitry Anisimov a0812c1ad7 added comments with refs to the original paper, checked all the formulas 2021-04-19 17:44:25 +02:00
Dmitry Anisimov 4ebbaba856 added bunny benchmarks versus original paper 2021-04-19 14:00:03 +02:00
Sébastien Loriot 0efe2459dc remove whitespace introduced during merge 2021-04-17 14:13:28 +02:00
Sébastien Loriot 39367c2313 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-17 11:14:29 +02:00
Sebastien Loriot e9c97d2b59
Merge pull request #5539 from sloriot/PMP-coref_check_si
Collect faces incident to edges too
2021-04-17 11:04:38 +02:00
Sebastien Loriot 66441af8c6
Merge pull request #5566 from afabri/PMP-accelerate_Envelope-GF
PMP - Polyhedral Envelope :  Make it faster by making combinatorial tests
2021-04-17 10:53:22 +02:00
Dmitry Anisimov 81513fc860 face descriptor is now stored in the candidate triangle to remember the realizing triangle 2021-04-16 18:15:07 +02:00
Dmitry Anisimov 56b77cfd9f fixed match faces + removed small optimization (not sure about it) 2021-04-16 17:43:26 +02:00
Sébastien Loriot 33a9553a13 rename variables 2021-04-14 11:09:14 +02:00
Sébastien Loriot 05e4b56c88 group intersecting segment of planar faces into a unique Node_set_id
This makes the unordered_map change working for autoref
2021-04-14 10:19:38 +02:00
Jane Tournois d61cf58f2f add ISOLATED_CONSTRAINT halfedge status
this type is needed for edges that are part of the input constrained
edges property map, and are incident to a face to be remeshed only by a
vertex.
These edges contribute to creating corner vertices (incident to >= 3
constrained edges), but should still not be considered as patch borders

without dealing with these "isolated constraints", the corner vertices that
are incident to 2 patch borders and 1 of these edges was not considered
as a corner but as a simple patch border vertex, hence it could be
moved/deleted by a collapse or relaxation steps
2021-04-13 15:20:21 +02:00
Sébastien Loriot 0e6754b15e typos 2021-04-10 09:19:46 +02:00
Dmitry Anisimov ddb8c6a9ff fewer candidate triangles for distance > 0 2021-04-09 18:48:15 +02:00
Dmitry Anisimov 50fc1cabd9 faster queries for close meshes, now traversal traits initial bounds depend on error_bound 2021-04-09 18:19:54 +02:00
Dmitry Anisimov 95f124fd30 added missing ref 2021-04-09 16:50:34 +02:00
Dmitry Anisimov 4d107b3b8d using std priority queue instead of boost heap 2021-04-09 16:34:03 +02:00
Dmitry Anisimov 63db510aef epeck support, fixed bug with infinity value 2021-04-09 16:03:55 +02:00
Dmitry Anisimov dc9e958503 removed some asserts and types, added const, make it compile with epeck, but epeck gives wrong results 2021-04-09 12:35:18 +02:00
Dmitry Anisimov 410b03bc1f added z-shaped test 2021-04-09 10:46:01 +02:00
Dmitry Anisimov a255f692dc matching faces finished, still needs several more tests 2021-04-08 17:07:13 +02:00
Dmitry Anisimov ffc8953a42 caching data 2021-04-08 16:25:38 +02:00
Dmitry Anisimov 0333778b96 added face matching, not finished 2021-04-08 16:22:32 +02:00
Andreas Fabri e0985c4daf PMP Corefinement: Replace containters to make it faster 2021-04-08 11:40:19 +01:00
Jane Tournois 371706e92a Merge remote-tracking branch 'cgal/master' into PMP-isotropic_remeshing_collapse_step-jtournois
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
2021-04-08 11:11:51 +02:00
Sebastien Loriot dfe70d17e7
Fix typo 2021-04-08 08:56:54 +02:00
Sébastien Loriot d8cdbbdc28 avoid an extra is-degenerate test 2021-04-07 15:10:32 +02:00
Sébastien Loriot 5b554abce8 add named parameter for triangle soup 2021-04-07 14:52:51 +02:00
Dmitry Anisimov dfd2e15066 Merge remote-tracking branch 'maxGimeno/PMP-compare_faces_from_meshes-maxGimeno' into gsoc2019-PMPHDist-martinskrodzki 2021-04-07 13:54:02 +02:00
Dmitry Anisimov 841ad3b8b1 fixed bug introduced in 2d4c254 2021-04-07 13:53:10 +02:00
Dmitry Anisimov f8f37393f3 fixed warnings 2021-04-07 12:44:17 +02:00
Laurent Rineau 1b54449dc5 Merge pull request #4878 from danston/Kernels-decltypes-danston
Improve decltype/result_of/invoke_result
2021-04-06 15:13:21 +02:00
Laurent Rineau 58ddf16295 Merge pull request #5507 from afabri/PMP-vtune_isotropic_remeshing-GF
PMP:  Accelerate isotropic remeshing
2021-04-06 15:13:11 +02:00
Laurent Rineau 791d4abfec Merge pull request #5555 from sloriot/PMP-exception_inheritance
Inherit from a std exception
2021-04-06 15:12:55 +02:00
Laurent Rineau 9b442d1595 Merge pull request #5570 from MaelRL/PMP-Repair_PS_invalid_polygons_speed_up-GF
Speed up invalid polygon removal in repair_PS
2021-04-06 15:12:47 +02:00
Laurent Rineau a11a7578f6 Merge pull request #5570 from MaelRL/PMP-Repair_PS_invalid_polygons_speed_up-GF
Speed up invalid polygon removal in repair_PS
2021-04-06 15:11:41 +02:00
Sébastien Loriot b7bafa1a34 do not build vector if not needed 2021-04-03 11:22:14 +02:00
Sébastien Loriot dd19b506ed first version to add epsilon per face 2021-04-03 11:14:15 +02:00
Andreas Fabri c97d3ffb65 Take into account that obtuse vertices are not clipped. 2021-04-01 16:47:07 +01:00
Andreas Fabri 6c4835f8db Introduce a struct for Prism so that we can also store which corner is obtuse 2021-04-01 15:35:16 +01:00
Maxime Gimeno 34e2180b22 rename match_faces 2021-04-01 13:50:41 +02:00
Mael Rouxel-Labbé dc854d8088 Use std::remove_if to speed-up invalid polygon removal 2021-03-31 11:54:38 +02:00
Andreas Fabri ebbe978291 Do not test combinations of planes where we know that there is no intersection point 2021-03-30 13:56:28 +01:00
Sébastien Loriot e3b0302b2b inherit from a std exception 2021-03-26 09:53:29 +01:00
Maxime Gimeno ca5867f172 Changes after review 2021-03-25 13:27:16 +01:00
Laurent Rineau 79ba1af61f Merge pull request #5492 from sloriot/PMP-coref_full_edge_visitor
Add missing visitor calls for the output_builder part
2021-03-24 15:05:24 +01:00
Maxime Gimeno 9e6eaa504a Orientation requirements always on, as it won't work without it on non triangle meshes 2021-03-23 13:43:49 +01:00
Maxime Gimeno 5f4437bef1 Fix missing inline and doc 2021-03-23 12:43:53 +01:00
Maxime Gimeno c3036b1e3e clean-up 2021-03-23 12:12:45 +01:00
Maxime Gimeno cc4d274399 Clarify np 2021-03-23 12:10:34 +01:00
Maxime Gimeno 277117613b Add a NP for orientation requirement 2021-03-23 11:49:47 +01:00
Maxime Gimeno aa2b527156 Fix holes situation 2021-03-23 11:13:47 +01:00
Maxime Gimeno 8f92a01b12 clean-up 2021-03-23 10:38:19 +01:00
Maxime Gimeno dd90a3ce84 OutputIterators 2021-03-23 10:17:39 +01:00
Maxime Gimeno 8c5fcd9209 Replace by bitset 2021-03-23 09:45:48 +01:00
Maxime Gimeno 27701711e7 Only 2 loops for faces 2021-03-23 09:25:06 +01:00
Jane Tournois f9eb2439bd Merge branch 'PMP-isotropic_remeshing_collapse_step-jtournois' of github.com:janetournois/cgal into PMP-isotropic_remeshing_collapse_step-jtournois 2021-03-22 16:50:00 +01:00
Jane Tournois a79fe08fcf Merge remote-tracking branch 'cgal/master' into PMP-isotropic_remeshing_collapse_step-jtournois 2021-03-22 16:46:08 +01:00
Maxime Gimeno 22e13faee9 1st pass after review 2021-03-22 16:28:10 +01:00
Maxime Gimeno c1895e74b6 mutbale ranges in doc 2021-03-22 14:59:40 +01:00
Maxime Gimeno 7d4a661671 Overloads, plugin and data sets 2021-03-22 14:59:01 +01:00
Maxime Gimeno 67aaf04a0a doc + example + tests 2021-03-22 14:02:18 +01:00
Sébastien Loriot f5a6ff424e collect face incident to edges too 2021-03-19 14:47:54 +01:00
Maxime Gimeno d33a3622c8 Fix namespace error in Triangulate_hole_polyline.h 2021-03-19 13:51:27 +01:00
Maxime Gimeno 735567531b RENAME 2021-03-19 12:00:08 +01:00
Jane Tournois 109a893657 remove #ifdef that should be defined 2021-03-19 11:30:05 +01:00
Dmitry Anisimov 00c185b028
Merge branch 'master' into Kernels-decltypes-danston 2021-03-12 12:06:20 +01:00
Andreas Fabri da17681a06 Avoid computing degree several times 2021-03-10 15:28:56 +00:00
Laurent Rineau b2ed4e5f7e Merge pull request #5423 from afabri/PMP-corefine_OM-GF
PMP:: Use operator<  instead of operator> as OM only implements the former

Conflicts:
	Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_consecutive_bool_op.cpp
	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h
2021-03-10 11:33:30 +01:00
Laurent Rineau 4dc8a341f9 Merge pull request #5423 from afabri/PMP-corefine_OM-GF
PMP:: Use operator<  instead of operator> as OM only implements the former
2021-03-10 10:33:17 +01:00
Andreas Fabri cea8cca6af WIP: less computations of degree 2021-03-09 15:45:18 +00:00
Andreas Fabri 45265a7e34 Replace vector with optional by two vectors. No idea what is better yet 2021-03-04 10:46:46 +00:00
Andreas Fabri 2e3bfa8743 Reduce calls to target @sloriot please double check the correctness 2021-03-04 09:27:05 +00:00
Sébastien Loriot 0710924d3b accomodate is_badly_shape API update 2021-03-04 09:34:40 +01:00
Sébastien Loriot a4669bc39f Merge remote-tracking branch 'cgal/master' into HEAD 2021-03-04 09:34:26 +01:00
Laurent Rineau fb00e173d6 Merge pull request #5405 from maxGimeno/PMP-Move_operations_for_collision_detector-maxGimeno
PMP Move assign for Rigid_triangle_mesh_collision_detection
2021-03-03 17:33:12 +01:00
Laurent Rineau 83244deabb Merge pull request #5429 from sloriot/PMP-coref_face_patch_init
Corefine: always init faces of patches
2021-03-03 17:33:02 +01:00
Laurent Rineau dcf9dfd0fe Merge pull request #5435 from afabri/Intersect_3-fix_isocuboid_plane-GF
Intersect_3: Fix Iso_cuboid_3/Plane_3 and Tetrahedon_/Plane_3 intersection using PMP::clip internal function

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h
2021-03-03 17:30:04 +01:00
Laurent Rineau adc8d9b686 Merge pull request #5442 from MaelRL/PMP-stitch_borders_reintroduce_zipping-GF
Re-introduce some kind of zipping as a first step to boundary cycle stitching
2021-03-03 17:29:45 +01:00
Laurent Rineau 8f9009e793 Merge pull request #5476 from sloriot/PMP-needle_caps_ecm_bug
PMP: Remove needles&caps fixes
2021-03-03 17:21:38 +01:00
Laurent Rineau ea7fa2dada Merge pull request #5480 from afabri/Filtered_kernel-Document_functor_for_Envelope-GF
Kernel_23:  Rename internal function and functor
2021-03-03 17:21:35 +01:00
Laurent Rineau 15263250a4 Merge pull request #5485 from danston/PMP-tbb_exception_fix-danston
Use TBB captured exception in PMP
2021-03-03 17:21:31 +01:00
Laurent Rineau fd353e84e9 Merge pull request #5509 from sloriot/PMP-coref_robust_side_of
Robustify internal side-of-triangle-mesh calls
2021-03-03 17:18:11 +01:00
Laurent Rineau 325436540f Merge pull request #5429 from sloriot/PMP-coref_face_patch_init
Corefine: always init faces of patches
2021-03-03 17:10:16 +01:00
Laurent Rineau 3c3dad3243 Merge pull request #5435 from afabri/Intersect_3-fix_isocuboid_plane-GF
Intersect_3: Fix Iso_cuboid_3/Plane_3 and Tetrahedon_/Plane_3 intersection
2021-03-03 16:56:31 +01:00
Laurent Rineau b5e6ef261f Merge pull request #5442 from MaelRL/PMP-stitch_borders_reintroduce_zipping-GF
Re-introduce some kind of zipping as a first step to boundary cycle stitching
2021-03-03 16:39:54 +01:00
Laurent Rineau e522630610 Merge pull request #5476 from sloriot/PMP-needle_caps_ecm_bug
PMP: Remove needles&caps fixes
2021-03-03 16:34:46 +01:00
Laurent Rineau 7e61495ef5 Merge pull request #5429 from sloriot/PMP-coref_face_patch_init
Corefine: always init faces of patches
2021-03-03 16:31:17 +01:00
Laurent Rineau 2800c8c587 Merge pull request #5435 from afabri/Intersect_3-fix_isocuboid_plane-GF
Intersect_3: Fix Iso_cuboid_3/Plane_3 and Tetrahedon_/Plane_3 intersection
2021-03-03 16:31:15 +01:00
Andreas Fabri dad0287b69 Remove trailing whitespace 2021-03-03 14:34:56 +00:00
Andreas Fabri 82e5b3a02d Do not collect in a vector per patch, but do the tests directly (@janetournois please double-check this commit) 2021-03-03 14:23:56 +00:00
Sébastien Loriot fa47c35271 remove unused variable 2021-03-03 08:28:28 +01:00
Andreas Fabri 22789f6f6b Replace geometric by combinatorial test 2021-03-02 21:56:54 +00:00
Sébastien Loriot c1dcaac020 remove TODOs 2021-03-02 16:21:06 +01:00
Sébastien Loriot 313f682b8c use custom functor for bbox and split primitives
aabb tree build runtime is similar to using EPICK
2021-03-02 16:16:07 +01:00
Andreas Fabri 5e2a580551 map -> unordered_map 2021-03-02 13:17:53 +00:00
Andreas Fabri 10f454d983 reserve(8) for incident faces to a vertex 2021-03-02 13:09:45 +00:00
Andreas Fabri 19e5e4a16e Use flaat_set and put it outside the loop 2021-03-02 12:25:28 +00:00
Sébastien Loriot 20865d2544 robustify side_of test 2021-02-26 15:46:01 +01:00
Dmitry Anisimov a1edfa76db fixed tbb warning 2021-02-25 12:05:56 +01:00
Dmitry Anisimov 4e911a4be0 fixed syntax error 2021-02-25 10:22:17 +01:00
Sébastien Loriot c0a90c101b doc update + missing renaming 2021-02-24 17:05:58 +01:00
Sébastien Loriot e2a80611ce complete the visitor for edge creation/copies 2021-02-24 16:53:20 +01:00
Dmitry Anisimov 9db3cdb22f use tbb captured_exception only on the x86_64 platforms 2021-02-24 11:08:44 +01:00
Dmitry Anisimov 688e76f70a
Update Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-02-23 14:05:29 +01:00
Dmitry Anisimov c63741dbb6 better tbb exception 2021-02-23 12:40:18 +01:00
Dmitry Anisimov e16e773fb8 fixed exception handling 2021-02-22 17:37:57 +01:00
Mael Rouxel-Labbé abe1f6e577 Misc cleaning 2021-02-22 16:51:35 +01:00
Mael Rouxel-Labbé b3d7977fac Fix boundary cycle zipping not updating its representative 2021-02-22 16:50:52 +01:00
Dmitry Anisimov c0627fc05f cleaner solution using std exception 2021-02-22 16:45:10 +01:00
Dmitry Anisimov 99f8843197 in case tbb is on, we use tbb captured execption in pmp 2021-02-22 15:19:58 +01:00
Sébastien Loriot 85a9962892 2 fixes:
- an edge cannot be collapsed if both its endpoints are constrained -> allow cap classification
- an edge with two constrained endpoints can be flipped (if not constrained)
2021-02-22 14:50:41 +01:00
Andreas Fabri d5a5b20ce8 Make it clear that the functor is not part of the Kernel concept 2021-02-19 20:23:20 +00:00
Mael Rouxel-Labbé 68f53bc518 Clean preconditions of is_needle/cap 2021-02-19 18:04:58 +01:00
Mael Rouxel-Labbé 8afeab71e7 Various fixes for PMP::remove_almost_degenerate_faces
See https://github.com/CGAL/cgal/pull/5476
2021-02-19 18:02:15 +01:00
Mael Rouxel-Labbé aacd453965 Do not stitch two halfedges if both are incident to the same degenerate face 2021-02-19 17:38:34 +01:00
Sébastien Loriot a75ad50a31 allow to handle a triangle as a cap if the collapse_length_threshold is not met 2021-02-19 16:53:01 +01:00
Sébastien Loriot b5277495e2 remove no longer needed variables 2021-02-19 16:10:32 +01:00
Sébastien Loriot 7ab4a8f6a2 handle constrained edges removed upon collapse 2021-02-19 14:38:20 +01:00
Sébastien Loriot 6e4b5ead81 use new macros 2021-02-19 13:44:51 +01:00
Sébastien Loriot 35387df806 do not document all overloads 2021-02-19 13:37:28 +01:00
Sébastien Loriot 0d698f1bfc update header 2021-02-19 13:13:42 +01:00
Sébastien Loriot 5d0d98f35e add missing parameter not added in 2d4c254362 ? 2021-02-19 11:24:41 +01:00
Sébastien Loriot 8abb285302 post merge/cgal update fixes 2021-02-19 11:13:16 +01:00
Sébastien Loriot 20661527bd Merge branch 'martinskrodzki/gsoc2019-PMPHDist-martinskrodzki' into master 2021-02-19 10:58:11 +01:00
Laurent Rineau 1a040c8552
Merge pull request #4749 from danston/Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2021-02-19 07:59:59 +01:00
Laurent Rineau c70da09776 Merge pull request #5049 from sloriot/PMP-corefine_non_manifold
corefine with non manifold edges
2021-02-18 15:26:56 +01:00
Laurent Rineau 77466bc60e Merge pull request #5295 from barcode/Side_of_triangle_mesh_move_ctor_move_assign
Add move ctor and move assign to Side_of_triangle_mesh
2021-02-18 15:26:46 +01:00
Sébastien Loriot 692f35a62d fix warnings 2021-02-15 17:17:20 +01:00
Dmitry Anisimov c970c4a758 removed unused Point_3 type in PMP 2021-02-11 09:48:27 +01:00
Dmitry Anisimov 81d9556707 Merge remote-tracking branch 'upstream/master' into Kernels-decltypes-danston 2021-02-10 10:06:45 +01:00
Sébastien Loriot a595e529c5 remove edge map and inter pt set 2021-02-09 18:43:05 +01:00
Mael Rouxel-Labbé f55d586d9d Re-introduce some kind of zipping as a first step to boundary cycle stitching
Zipping was removed when local stitching was introduced, and a common interface
between stitching-within-a-cycle and normal-stitching was introduced.

However, that common interface does not handle any non-manifold configuration,
even if it's a folded cycle with obvious stitching (consecutive equal edges).

So, some kind of zipping is re-added. It is cheap anyway
(compared to e.g. calling PMP::connected_components on the whole mesh).
2021-02-08 15:50:48 +01:00
Maxime Gimeno 564e4a1d9f Fix 2021-02-08 10:24:40 +01:00
Laurent Rineau 41765b6a26 Merge pull request #5377 from sloriot/PMP-typo
Remove extra p
2021-02-05 16:10:22 +01:00
Laurent Rineau 9986b1c151 Merge pull request #5424 from sloriot/PMP-hole_filling_no_warnings
Do not emit warning as hole filling can fail
2021-02-05 16:09:51 +01:00
Laurent Rineau 8c86a6a858 Merge pull request #5377 from sloriot/PMP-typo
Remove extra p
2021-02-05 16:07:20 +01:00
Laurent Rineau a4bbce7f7a Merge pull request #5424 from sloriot/PMP-hole_filling_no_warnings
Do not emit warning as hole filling can fail
2021-02-05 16:07:09 +01:00
Laurent Rineau 11939d830f Merge pull request #5377 from sloriot/PMP-typo
Remove extra p
2021-02-05 16:05:48 +01:00
Dmitry Anisimov 8914b2fc82
Update Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2021-02-05 14:43:29 +01:00
Sebastien Loriot c30056b126
use move assignment 2021-02-05 13:51:21 +01:00
Sébastien Loriot 2510571448 always init faces of patches 2021-02-04 17:00:48 +01:00
Andreas Fabri 96769b2873 Use 2 template parameters so that it matches for a handle and a smart handle 2021-02-03 12:38:25 +00:00
Sébastien Loriot 22724728e7 do not emit warning as hole filling can fail 2021-02-03 12:48:50 +01:00
Andreas Fabri cd70b9b172 Use operator< instead of operator> as OM only implements the former 2021-02-03 10:46:28 +00:00
Maxime Gimeno a0686c10ec use *this = std::move(other); 2021-01-28 12:21:57 +01:00
Maxime Gimeno 63fe0dc17a clean-up 2021-01-28 12:00:40 +01:00
Maxime Gimeno 5039f813ae Add move assign to Rigid_triangle_mesh_collision_detection 2021-01-28 11:21:32 +01:00
Dmitry Anisimov b2861aefa3 fixed warning with Vector 3 type 2021-01-28 10:57:01 +01:00
Sébastien Loriot 71ae816bfa Merge remote-tracking branch 'cgal/master' into PMP-corefine_non_manifold 2021-01-27 13:46:09 +01:00
Dmitry Anisimov 56a0cb15e4 added missing type 2021-01-26 10:48:17 +01:00
Dmitry Anisimov 3551d0224b fixed IO interface + the bug with misplaced assertions 2021-01-26 10:38:03 +01:00
Laurent Rineau 9ef6fc3182 Merge pull request #5330 from sloriot/PMP-hard_coded_EK
remove hardcoded kernel
2021-01-21 16:23:19 +01:00
Laurent Rineau 1fbc6ec52b Merge pull request #5330 from sloriot/PMP-hard_coded_EK
remove hardcoded kernel
2021-01-21 16:19:06 +01:00
Sébastien Loriot 4ef0295891 typo 2021-01-20 15:53:52 +01:00
Sébastien Loriot ad911271a9 Merge commit '6594e7549bd70923990d86c31e2aa267a79bb629' into HEAD 2021-01-15 10:12:17 +01:00
Sébastien Loriot bdd4efe3b3 Merge commit 'efc0c525e8b' into HEAD 2021-01-15 10:06:56 +01:00
Sébastien Loriot efc0c525e8 include non-deprecated header 2021-01-15 10:02:00 +01:00
Dmitry Anisimov f7abb6c343
Merge branch 'master' into Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2021-01-14 17:23:24 +01:00
Dmitry Anisimov c657451934
Merge branch 'master' into Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2021-01-14 10:38:51 +01:00
Sébastien Loriot ffc16da931 close stream 2021-01-13 13:50:32 +01:00
Maxime Gimeno cf19fb2df9 Fixes 2021-01-08 09:35:35 +01:00
Maxime Gimeno 3d1c41fd14 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2021-01-07 15:05:28 +01:00
Laurent Rineau 85325d789f Merge pull request #5090 from afabri/FastEnvelope-GF
Polygon Mesh Processing:  Add envelope test
2021-01-06 16:11:56 +01:00
Laurent Rineau f33f3f5d7c Merge pull request #5256 from sloriot/PMP-improve_isotropic_remeshing
TIny improvement of surface isotropic remeshing
2021-01-06 16:11:40 +01:00
Sébastien Loriot 925abf284d expose type 2021-01-06 14:26:11 +01:00
Sébastien Loriot e63b032979 remove hardcoded kernel 2021-01-06 13:26:58 +01:00
Sébastien Loriot 02db50ae4f fix warnings 2021-01-04 10:36:14 +01:00
Andreas Fabri 404ee465df Address VC++ warnings 2021-01-04 09:16:30 +00:00
Andreas Fabri 8ae9070e5d Fix warnings 2020-12-30 09:06:19 +00:00
Raphael Grimm c395a5d3f7 Add std::move to all members 2020-12-18 10:54:42 +01:00
Raphael Grimm 7bd2923bc3 Remove BOOST_NO_CXX11_RVALUE_REFERENCES 2020-12-18 10:31:18 +01:00
Raphael Grimm f3330b91d6 Add move ctor and move assign to Side_of_triangle_mesh 2020-12-18 08:59:24 +01:00
Laurent Rineau 4b42d4b555 Merge pull request #5286 from janetournois/PMP-isotropic_remeshing_fix_is_corner-jtournois
PMP::isotropic_remeshing - fix is_corner(v)
2020-12-17 17:03:13 +01:00
Laurent Rineau 1357ebc0c1 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:46 +01:00
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
Jane Tournois 0be31d5440 Revert "skip the null face when checking for self-intersections in a face range"
This reverts commit 9ba6ac4929.
2020-12-17 10:15:59 +01:00
Laurent Rineau ec4768468f 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:49:12 +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
Jane Tournois fab3f8a55b move pid to where it is actually needed 2020-12-11 15:24:52 +01:00
Jane Tournois 9ba6ac4929 skip the null face when checking for self-intersections in a face range 2020-12-11 15:23:41 +01:00
Jane Tournois d984905e2e rename function for code readability 2020-12-11 15:00:27 +01:00
Jane Tournois a42b4326a9 improve flipping step
add another criterion to decide whether to flip or not
is_badly_shaped detects caps and needles
2020-12-11 14:51:46 +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
Sébastien Loriot 7c7d9c0755 add missing requirement 2020-12-10 12:23:26 +01:00
Sébastien Loriot bd05e06b48 use patch_id_to_index_map 2020-12-10 12:19:43 +01:00
Sébastien Loriot 876a40afe5 do not test faces outside of the patches considered 2020-12-10 12:07:06 +01:00
Maxime Gimeno 1d98f0f71d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-12-09 14:40:02 +01:00
Sébastien Loriot ba0b215335 replace multimap by vector of vector 2020-12-08 17:14:05 +01:00
Sébastien Loriot 6e782ef0ee call reserve 2020-12-08 16:26:13 +01:00
Sébastien Loriot 06ac504bec fix indentation 2020-12-08 16:21:01 +01:00
Sébastien Loriot a31ccc4a2d remove property map 2020-12-08 16:19:07 +01:00
Sébastien Loriot 0d480ca612 use vectors instead of maps 2020-12-08 16:07:08 +01:00
Sébastien Loriot 08eeacca8b Merge remote-tracking branch 'cgal/master' into FastEnvelope-GF 2020-12-07 16:40:34 +01:00
Dmitry Anisimov c2085ea36c
Merge branch 'master' into Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2020-12-04 18:32:25 +01:00
Laurent Rineau 81336ab612 Merge pull request #5225 from albert-github/feature/bug_missing_End
Missing \cgalParamEnd
2020-12-04 17:15:52 +01:00
Laurent Rineau 3eed365417 Merge pull request #5228 from MaelRL/PMP-Add_missing_include_pm2ps-GF
PMP: Add missing header include (PM to PS)
2020-12-04 17:15:43 +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
Sébastien Loriot 2e56e8d298 dump all debug prims in a single file (easier to load) 2020-12-03 19:29:42 +01:00
Sébastien Loriot 294b9cf1e3 empty() -> is_empty() 2020-12-03 18:55:05 +01:00
Sébastien Loriot 698eca8698 use std + make it work with EPECK 2020-12-03 18:54:38 +01:00
Sébastien Loriot 1aed8bad83 add soup as query 2020-12-03 15:37:38 +01:00
Sébastien Loriot 5b3c3eaeba remove old copy/paste 2020-12-03 10:54:23 +01:00
Sébastien Loriot 5f6dca4738 add an option to refuse a repair that is too far from the input
using Polyhedral_envelope
2020-12-03 10:43:03 +01:00
Sébastien Loriot 37218729f4 add move assignment and move constructor 2020-12-03 10:23:49 +01:00
Andreas Fabri 6046432534 Add a mesh in envelope test 2020-12-03 07:58:33 +00:00
Sébastien Loriot 3463501b4d add more operator() 2020-12-02 18:21:11 +01:00
Sébastien Loriot e8b68a3de8 dump prims at the end of init 2020-12-02 18:16:38 +01:00
Sébastien Loriot fd8d9eed31 fix copy-paste error: do not copy all vertices 2020-12-02 18:14:56 +01:00
Sébastien Loriot 3778b0c3c3 add default constructor 2020-12-02 18:14:18 +01:00
Sébastien Loriot 1f5a1cb314 link to user manual 2020-12-02 09:49:53 +01:00
Sébastien Loriot f76c5f9595 doc that triangle soup can be used too as input 2020-12-02 09:40:05 +01:00
Sébastien Loriot 87f0b49b11 remove extra template parameter 2020-12-01 18:17:03 +01:00
Mael Rouxel-Labbé 47df5dc4df Add missing header include 2020-11-30 18:00:41 +01:00
albert-github 44fdd8bda6 Missing \cgalParamEnd
A missing `\cgalParamEnd` results in incorrect HTML code (i.e. `</div>` is missing, but which is still shown correctly)
2020-11-30 14:45:14 +01:00
Sébastien Loriot 118b904429 document triangle soup constructor 2020-11-27 16:02:22 +01:00
Sébastien Loriot dbaf546a2f vector -> range 2020-11-27 16:02:06 +01:00
Sébastien Loriot 3e51ef97d6 use Oriented_side 2020-11-27 15:24:48 +01:00
Sébastien Loriot 2677630c84 remove experimental code 2020-11-27 15:13:35 +01:00
Sébastien Loriot 1d7c778b17 avoid signed vs unsigned int warnings 2020-11-27 15:10:43 +01:00
Sébastien Loriot 4a0b162b95 handle unused variable warnings 2020-11-27 14:53:22 +01:00
Sébastien Loriot 8c69ced9fb fix misleading braces 2020-11-27 14:34:36 +01:00
Sébastien Loriot 41a9ac9f26 use unsigned int in loops to avoid conversion warnings 2020-11-27 14:29:17 +01:00
Sébastien Loriot 2625934503 add constructor with a range of faces 2020-11-27 14:08:55 +01:00
Sébastien Loriot 5fa89e2fd2 fix constructor in case the mesh contains garbarge vertices
remove the need for a vertex index map
2020-11-27 14:08:05 +01:00
Sébastien Loriot cde45d2405 Merge remote-tracking branch 'cgal/master' into PMP-corefine_non_manifold 2020-11-27 10:22:24 +01:00
Sébastien Loriot feb5ed87fd export the handling of extra terminal node in a class template (with specialization for autoref) 2020-11-26 18:31:24 +01:00
Sébastien Loriot 172b16bf09 really split the intersection graph at node where the intersection polylines ...
... goes from the interior of a mesh onto its boundary
The patch is not yet valid for autorefinement
2020-11-26 14:10:53 +01:00
Andreas Fabri 9b794b2fa4 Update Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-11-26 10:38:30 +01:00
Andreas Fabri 2f9de520b3 Update Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-11-26 10:10:15 +01:00
Andreas Fabri 80bfe829ca Update Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-11-26 10:10:02 +01:00
Andreas Fabri e36f34ad52 Update Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-11-26 10:09:53 +01:00
Andreas Fabri 4722ed66db Update Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-11-26 10:09:36 +01:00
Andreas Fabri b7a5dd9193 Update Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-11-26 10:09:24 +01:00
Sébastien Loriot 4b26935ff5 fix boundary cases (regular and coplanar)
tests are updated as results were somehow invalid
2020-11-24 18:11:27 +01:00
Sébastien Loriot f56cbecce9 add missing resize for autoref case 2020-11-23 16:36:05 +01:00
Andreas Fabri 56886962ce typos 2020-11-20 10:43:14 +00:00
Maxime Gimeno d80d2eebc8 put expensive tests in weight calculation in expensive_assertions 2020-11-19 16:57:34 +01:00
Andreas Fabri 6080b92f12 Favor earlier exit by reordering planes 2020-11-19 08:44:28 +00:00
Sébastien Loriot cbc4360b43 better handling of setting of coplanar flag for patches
especially for connected components being entirely a coplanar patch
2020-11-17 15:01:24 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Andreas Fabri f246c4abf8 merge 2020-11-13 16:26:57 +00:00
Andreas Fabri 1b55b2823b Fix license check 2020-11-13 16:12:38 +00:00
Sébastien Loriot 63ad707c02 correctly handle orientation of coplanar patches 2020-11-13 15:20:54 +01:00
Sébastien Loriot aecc7c7ee7 improve debug 2020-11-10 14:44:32 +01:00
Sébastien Loriot e86b24e2c4 add an np to filter some self-intersections 2020-11-10 13:46:22 +01:00
Andreas Fabri ac1200fe28 Cleanup of GetFilter 2020-11-10 10:52:53 +00:00
Sébastien Loriot 06fbadbd10 add extra code to handle boundary conditions 2020-11-10 11:28:41 +01:00
Andreas Fabri c510a89ea0 Improve doc 2020-11-10 09:59:01 +00:00
Sébastien Loriot 21f64efbdc add non-documented visitor function calls 2020-11-09 18:25:13 +01:00
Laurent Rineau b248867e91
Merge pull request #5141 from maxGimeno/Demo-Fix-clipping_plugin-maxGimeno 2020-11-09 17:10:24 +01:00
Andreas Fabri 40283b618d Ignore degenerate faces 2020-11-09 08:42:19 +00:00
Andreas Fabri 5731813c19 Define polyhedral envelope 2020-11-06 12:44:53 +00:00
Andreas Fabri 45a24c2308 Duplicate a helper file in order to remove a dependency 2020-11-06 08:28:58 +00:00
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