Commit Graph

2944 Commits

Author SHA1 Message Date
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
Sébastien Loriot ba42fcb6ca Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:36:40 +01:00
Sébastien Loriot d1c1ca2399 Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:19:39 +01:00
Sébastien Loriot e6e9e23fdd extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:40:08 +01:00
Sébastien Loriot 95e2f8055f Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:39:47 +01:00
Sébastien Loriot 92f5f0242e Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:04:33 +01:00
Sébastien Loriot 754699b33d extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:59:49 +01:00
Sébastien Loriot 4c094fd3c2 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:59:19 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

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

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

fix patch introduced in 6e31445f62
2020-02-13 14:38:19 +01:00
Maxime Gimeno 6db578509d add np to bbox() 2020-02-11 14:47:46 +01:00
Maxime Gimeno e9864cf874 Fixes after review 2020-02-11 14:13:56 +01:00
Maxime Gimeno 0378d7825f Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-02-10 15:53:05 +01:00
Maxime Gimeno f60d8d24ec more fixes after review 2020-02-10 14:41:05 +01:00
Maxime Gimeno 4716359ca6 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-02-10 14:29:56 +01:00
Maxime Gimeno e3ace2289d First batch of fixes after review 2020-02-10 14:28:45 +01:00
Mael Rouxel-Labbé cb3e5cd83c Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2020-02-07 17:09:59 +01:00
Mael bb4247e143
Merge branch 'master' into PMP-Snapping_improvements-GF 2020-02-07 16:31:28 +01:00
Laurent Rineau 49a06e9201 Merge pull request #4362 from afabri/Box_intersection_d-accelerate-GF
PMP::self_intersections: Add Concurrency
2020-02-07 16:25:06 +01:00
Laurent Rineau 0fd7bbc4ff Merge pull request #4364 from afabri/CGAL-Parallel_if_available_tag
CGAL:: Add Parallel_if_available_tag
2020-02-07 16:25:03 +01:00
Laurent Rineau 21570cde72 Merge pull request #4416 from sloriot/PMP-clip_box
Add clipping overload to a iso-cuboid
2020-02-07 16:24:57 +01:00
Laurent Rineau 36cb11d01b Merge pull request #4417 from sloriot/PMP-cc_remove_boost_call
Remove call to boost in PMP::connected_components
2020-02-07 16:24:55 +01:00
Laurent Rineau c490d01e7f Merge pull request #4489 from MaelRL/PMP-Relax_assertion_in_compute_normal-GF
PMP: Fixes for compute_normals
2020-02-07 16:24:36 +01:00
Mael Rouxel-Labbé 84215c95c4 Merge branch 'Box_intersection_d-accelerate-GF-old' into Box_intersection_d-accelerate-GF 2020-02-07 11:03:07 +01:00
Mael Rouxel-Labbé b7d2646421 Fix sanity check not failing on self-intersections 2020-02-06 17:14:29 +01:00
Mael Rouxel-Labbé 29ddd67b8d Clean temp code 2020-02-06 17:14:16 +01:00
Mael Rouxel-Labbé f1969fc5b8 Remove unused debug functions 2020-02-06 16:18:42 +01:00
Mael Rouxel-Labbé 0ddf33c9df Use PM_to_PS in the demo 2020-02-06 16:15:15 +01:00
Mael Rouxel-Labbé 035536527c Misc cleaning 2020-02-06 15:49:33 +01:00