Commit Graph

1064 Commits

Author SHA1 Message Date
Laurent Rineau d466ea50cd Merge pull request #3884 from MaelRL/BGL-Fix_FFG_master-GF
BGL: Fix `Face_filtered_graph`'s `is_selection_valid()` (5.0)
2019-05-06 15:30:33 +02:00
Laurent Rineau c9beac61ca Merge pull request #3862 from MaelRL/BGL-Fix_is_valid_selection-GF
BGL: Fix `Face_filtered_graph`'s `is_selection_valid()`
2019-05-06 15:02:10 +02:00
Mael Rouxel-Labbé af142c7416 Add new named parameter: face_size_map
Used to pass custom maps to keep_large(st)_CCs
2019-05-06 09:00:09 +02:00
Mael Rouxel-Labbé ccf98605ab Fix Face_filtered_graph::is_selection_valid() (master) 2019-04-26 09:20:36 +02:00
Sébastien Loriot 564a6c72f4 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-23 10:46:32 +02:00
Mael Rouxel-Labbé 6ed5f5d064 Fixed CGAL::Face_filtered_graph::is_selection_valid()
The walk was wrong:
  hd = next(opposite(hd, _graph), _graph);
does not walk around the target.

It also didn't properly test all types of non-manifoldness
2019-04-18 11:26:54 +02:00
Mael Rouxel-Labbé c8767d3487 Fixed is_valid_polygon_mesh() (and family) not breaking away from invalid loops
also reduced verbosity and improved indentation
2019-04-17 16:32:05 +02:00
Sébastien Loriot bd955e57d3 fix conversion warnings 2019-04-10 14:28:35 +02:00
Sébastien Loriot 9c39f2260f add calls to reserve before creating meshes 2019-04-02 21:54:30 +02:00
Sébastien Loriot 0ce7fc09b5 turns iterator pairs into iterable ranges 2019-03-29 13:28:22 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Laurent Rineau 0d5009e582 Merge branch 'releases/CGAL-4.13-branch' 2019-03-26 16:43:41 +01:00
Laurent Rineau 0aa49e3549 Merge pull request #3783 from afabri/BGL_add_seams-GF
BGL:  Seam_mesh::add_seams() requires .selection.txt
2019-03-26 16:42:59 +01:00
Mael f1dceb79ee
fix typo 2019-03-20 11:43:33 +01:00
Andreas Fabri d31f685a0b polish 2019-03-20 11:42:06 +01:00
Andreas Fabri a9c3f9bc6c BGL: Seam_mesh::add_seams() requires .selection.txt 2019-03-20 11:34:21 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Laurent Rineau 69fad29842 Merge branch 'releases/CGAL-4.13-branch' 2019-02-28 20:49:15 +01:00
Laurent Rineau b22f210fd4 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-02-28 20:48:05 +01:00
Sébastien Loriot 5ee640be6c add missing function required by the concept 2019-02-26 09:11:07 +01:00
Laurent Rineau 8693f95dac Merge pull request #3619 from albert-github/feature/bug_headers
Update of headers
2019-02-22 16:39:09 +01:00
Andreas Fabri 84e118266d BGL: Return Iterator_range instead of std::pair 2019-02-20 11:44:20 +01:00
Sébastien Loriot a5576cd3fb replace markdown subsections by \cgalHeading 2019-02-14 10:53:48 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Laurent Rineau c9164a0660
Merge branch 'master' into Stream_support-Dont_use_vtk_for_vtu-GF 2019-01-22 12:06:08 +01:00
Laurent Rineau f5a8686cf3 Merge pull request #3439 from aboudev/VSA-lingjie
New package: Surface_mesh_approximation
2019-01-22 09:17:35 +01:00
Laurent Rineau 28e520b121 Merge pull request #3594 from sloriot/PMP-remove_null_edges_on_border
Null edges removal fix on the border
2019-01-22 09:15:08 +01:00
Sébastien Loriot eadb08d976 replace mode by a np 2019-01-17 16:03:48 +01:00
Laurent Rineau 40cf3869ba My changes for write_vtp 2019-01-16 16:15:01 +01:00
Sébastien Loriot c5cef4ce06 handle triangles attached by non-manifold vertices
cherry-picking of c697c2086f
2019-01-16 15:29:44 +01:00
Sébastien Loriot c697c2086f handle triangles attached by non-manifold vertices 2019-01-16 15:24:57 +01:00
Andreas Fabri 53816ffc2c Fix Seam_mesh 2019-01-15 17:59:03 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Andreas Fabri cd6bf144fe Simplify Seam_mesh 2019-01-10 13:54:16 +01:00
Laurent Rineau c9fb876574
Merge branch 'master' into VSA-lingjie 2019-01-10 10:13:09 +01:00
Andreas Fabri 608c5c6ac8 Fix Seam_mesh and Dispatch_output_iterator 2019-01-09 17:43:45 +01:00
Simon Giraudot 0396dd1118 Patch to improve normal orientation using user-defined seed points 2019-01-04 14:34:56 +01:00
Sébastien Loriot 551be55235 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2018-12-31 10:29:57 +01:00
Mael Rouxel-Labbé 2c6e9c2b70 Fixed memory leaks in partition code 2018-12-20 15:57:51 +01:00
Laurent Rineau 57b2fbdbfb Merge pull request #3485 from afabri/BGL-write_wrl-GF
BGL: Add write_wrl() for FaceGraph
2018-12-19 16:12:26 +01:00
Laurent Rineau 4bf2499b52 Merge pull request #3512 from maxGimeno/BGL-Fix_make_hexahedron_API-GF
Fix make_hexahedron doc
2018-12-19 16:08:58 +01:00
Laurent Rineau 0ec8873a37 Merge pull request #3538 from maxGimeno/BGL-Fix_add_face-GF
BGL: Fix Euler::add_face()
2018-12-19 16:01:14 +01:00
Laurent Rineau eb51562fe9 Merge pull request #3538 from maxGimeno/BGL-Fix_add_face-GF
BGL: Fix Euler::add_face()
2018-12-19 15:45:45 +01:00
Maxime Gimeno 51f8877e60 Replace the assertion about n>2 by a if 2018-12-13 09:31:35 +01:00
Maxime Gimeno 31b68de8b2 use std::copy and adjacent_find 2018-12-13 09:31:28 +01:00
Maxime Gimeno 266fee1c4c Check for uniqueness of the vertices in add_face 2018-12-13 09:31:10 +01:00
Maxime Gimeno 629b41e69d Remove garbage 2018-12-05 16:33:44 +01:00
Maxime Gimeno b04523f8c3 add images to doc 2018-12-04 13:27:02 +01:00
Maxime Gimeno 20899df7a7 Make the hexahedron creation clearer and fix examples and tests 2018-12-04 11:46:48 +01:00
Laurent Rineau eb1d7ecd68 Merge pull request #3480 from afabri/patch-3
BGL: Fix doc of Face_filtered_graph
2018-12-01 16:31:11 +01:00
Laurent Rineau c137f9f252 Merge pull request #3476 from sloriot/BGL_PSP-fix_getK_helper
Fix in PSP named parameters
2018-12-01 16:31:09 +01:00
Sébastien Loriot 7bf5cff4cf accomodate update from master 2018-11-30 15:32:34 +08:00
Sébastien Loriot cb4c3b47cf fix back-ticking 2018-11-29 14:53:21 +01:00
Andreas Fabri c570e86661 Removed unused typedef; Added to CHANGES.md 2018-11-29 08:12:26 +01:00
Andreas Fabri 5f007da461 Remove unused variables 2018-11-28 07:56:14 +01:00
Andreas Fabri 7ac3dcd63b Add write_wrl() for FaceGraph 2018-11-27 10:04:32 +01:00
Andreas Fabri eb688df5e0
BGL: Fix doc of Face_filtered_graph
Fix typo in documentation.
2018-11-26 15:00:07 +01:00
Sébastien Loriot 75aca45157 do no ignore user provided traits 2018-11-24 18:40:15 +01:00
Mael 49033c14ad
Merge branch 'master' into PMP-Snap_boundary-GF 2018-11-13 22:38:58 +01:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Sébastien Loriot 4dd6526022 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2018-11-08 17:21:29 +01:00
Sébastien Loriot 20b8205952 Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2018-11-08 17:21:00 +01:00
Sebastien Loriot d718870772
Merge pull request #3426 from maxGimeno/BGL-Fix_make_grid_doc-GF
BGL: Fix make_grid() documentation
2018-11-08 16:17:04 +01:00
Balázs Ludmány 5d35c33316 Fix type missmatch in adjacent_vertices
The adjacent_vertices uses the wrong iterator type in it's body. This commit changes it to the same as the function's return type.
2018-11-06 07:47:11 +01:00
Sébastien Loriot 6b8a36ba0c update clipping code for surface case and use Face_graph_output_builder
This fixes a bug when a patch with no input vertex must be
classified wrt the clipper
2018-11-05 16:26:33 +01:00
Maxime Gimeno b7d546eebb Remove ifdef 2018-11-05 14:02:39 +01:00
Maxime Gimeno e4f5455d2f Use the default 2018-11-05 13:57:22 +01:00
Maxime Gimeno 7f14d79292 Fix doc and only use 2 arguments in functor 2018-11-05 11:12:37 +01:00
Maxime Gimeno 985f34202d Adds missing information in the doc of make_grid and adds the 3rd argument of the functor. 2018-11-05 11:12:25 +01:00
Sébastien Loriot d940632471 Merge pull request #3258 from MaelRL/PMP-Filter_degenerate_polygon_soup_input-GF
PMP: repair polygon soup
2018-11-02 10:37:58 +01:00
Sébastien Loriot 056c778305 Merge pull request #3370 from maxGimeno/AABB_tree-Change_facegraph_triangle_primitive_id-GF
Aabb_tree: change the id of AABB_face_graph_triangle_primitive and AABB_halfedge_graph_segment_primitive
2018-11-02 10:34:26 +01:00
Sébastien Loriot cdbe19b480 Merge pull request #3369 from maxGimeno/AABB_tree-AABB_transformed_traits-GF
[Small Feature] Add collision detection in PMP
2018-10-30 15:49:38 +01:00
Laurent Rineau aba922e2d4 Merge pull request #3395 from sloriot/BGL-selection_issue
Fix selection issue with boundary vertices

# Conflicts:
#	BGL/test/BGL/test_Manifold_face_removal.cpp
2018-10-29 10:42:21 +01:00
Laurent Rineau 821f9c015e Merge pull request #3311 from sloriot/Doc-Pkg_link_name
Update the name of package names reference links
2018-10-29 10:27:53 +01:00
Laurent Rineau 2721f9a35b Merge pull request #3395 from sloriot/BGL-selection_issue
Fix selection issue with boundary vertices
2018-10-29 10:27:15 +01:00
Sébastien Loriot 915c3e7fec use a vector for dynamic properties of const Surface_mesh
also done for OpenMesh types
2018-10-25 17:05:21 +02:00
Sébastien Loriot 8b6a2b8aef fix issue with boundary vertices 2018-10-11 14:30:49 +02:00
Sébastien Loriot eb8e5e5b35 change the Id in the base class + update pmaps to handle also pairs 2018-10-09 14:15:26 +02:00
Sébastien Loriot bfa9844b1a make default vpm of mesh convertible to default vpm of const mesh 2018-10-09 10:28:45 +02:00
Mael Rouxel-Labbé d18e21cfe7 Merge branch 'PMP-Filter_degenerate_polygon_soup_input-GF-old' into PMP-Filter_degenerate_polygon_soup_input-GF 2018-10-08 16:19:26 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Mael Rouxel-Labbé 1676cd7405 Merge branch 'repair_functions-old' into repair_functions 2018-09-17 15:10:39 +02:00
Laurent Rineau 3686015045 Merge pull request #3310 from sloriot/BGL_SMS-fix_link_condition
Handle the case of degenerate volumes in the link condition
2018-09-17 11:36:37 +02:00
Sébastien Loriot 376bc42716 update URL and use https 2018-09-04 13:29:51 +02:00
Sébastien Loriot e474d61fa7 handle the case of degenerate volumes in the link condition
a volume is degenerate if it consists only of twice the same face
with opposite orientation
2018-09-04 10:09:08 +02:00
Mael Rouxel-Labbé ab9b0479b3 Removed unnecessary 'do_' in named parameters 2018-08-17 15:32:26 +02:00
Mael Rouxel-Labbé 46bd7dc832 Merge branch 'PMP-Filter_degenerate_polygon_soup_input-GF-old' into PMP-Filter_degenerate_polygon_soup_input-GF 2018-08-03 09:34:15 +02:00
Mael Rouxel-Labbé 0aabaf3025 Added some functions to snap mesh borders onto another mesh 2018-08-01 08:44:30 +02:00
Mael Rouxel-Labbé 5a8d6c67e8 Merge branch 'repair_functions-old' into repair_functions 2018-07-30 15:53:37 +02:00
Mael Rouxel-Labbé 4e31832136 Added a function to detect and merge duplicate faces 2018-07-30 13:08:16 +02:00
Laurent Rineau f3b9d03ccf Merge pull request #3234 from sloriot/BGL-fix_copy_fg_with_garbage
Fix copy_face_graph with target mesh having garbage
2018-07-26 17:31:15 +02:00
Mael Rouxel-Labbé 16a9bc4d7c Fixed some links / concepts related to sgi.com and cppreference 2018-07-26 16:27:58 +02:00
Sébastien Loriot b0d012fe01 Merge pull request #3243 from sloriot/BGL-clear_fix
Fix CGAL::clear
2018-07-25 18:56:39 +02:00
Sébastien Loriot c8c1c11c9c Merge pull request #3234 from sloriot/BGL-fix_copy_fg_with_garbage
Fix copy_face_graph with target mesh having garbage
2018-07-25 18:55:26 +02:00
Mael Rouxel-Labbé 072b2376b8 Merge branch 'repair_functions-old' into repair_functions 2018-07-23 17:59:43 +02:00
Sébastien Loriot e5ec40abe9 use itself as next instead of null_halfedge
some models might call set_prev on null_halfedge
2018-07-19 18:23:01 +02:00
Sébastien Loriot 0561f62d43 simplify patch 2018-07-19 18:03:15 +02:00
Sébastien Loriot f0605c818c do not remove element you iterate on
+ as for std::vector, clear() does not always imply a change of capacity
2018-07-19 10:58:27 +02:00
Sébastien Loriot 869f1c01b0 init next pointer we rely on in the algorithm 2018-07-17 09:56:47 +02:00
Laurent Rineau 87715e3342 Merge pull request #3224 from sloriot/BGL-fix_getGT
Fix GetGeomTraits
2018-07-16 11:12:53 +02:00
Sébastien Loriot 080b2a70d1 we should also check whether a vertex point map was given as parameter 2018-07-11 16:52:36 +02:00
Konstantinos Katrioplas 032ee2828a named parameters for duplicate non-manifold vertices 2018-07-03 15:38:57 +02:00
Konstantinos Katrioplas 903df8106a corrections after the review 2018-07-03 15:37:20 +02:00
Maxime Gimeno e961746dd3 fix make_functor and doc. 2018-07-03 11:47:52 +02:00
Sébastien Loriot b66ffa3df1 fix merge issues 2018-07-02 10:37:57 +02:00
konstantinos katrioplas 9901ed78ef Merge branch 'master' into PMP-smoothing 2018-07-01 20:07:19 +03:00
Maxime Gimeno a584af827b Fix Conflicts 2018-06-29 18:21:24 +02:00
Laurent Rineau 2d9000efde Merge pull request #3111 from sloriot/PMP-coref_preserve_face_attributes
Add a visitor to track the creation of faces in corefinement functions
2018-06-28 16:09:37 +02:00
Laurent Rineau c68cf8fc4c Merge pull request #3129 from sgiraudot/Point_set_processing-Callbacks-GF
Point Set Processing: Callbacks
2018-06-27 10:21:40 +02:00
Laurent Rineau 0e4e50f2e7 Merge pull request #3060 from maxGimeno/BGL-read_write_off_use_np-GF
BGL: Use Named Parameters in OFF I/O
2018-06-27 10:21:33 +02:00
Laurent Rineau b44ad18983
Merge branch 'master' into PMP-stitch_after_orient-GF 2018-06-21 12:31:26 +02:00
Sébastien Loriot 0abfba8ac0 Update branch 'PMP-coref_preserve_face_attributes' from master@5ceb529d0f 2018-06-21 10:53:59 +02:00
Laurent Rineau b08fb6c4ed Merge pull request #3069 from sloriot/PMP-isotropic_remeshing_user_projection
Fix constrained edge map update and add user projection functor as input
2018-06-20 17:21:10 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Maxime Gimeno 158d292435 Add missing overload 2018-06-13 10:22:11 +02:00
Maxime Gimeno 1d4b1f9183 Merge master to solve conflicts 2018-06-13 09:48:07 +02:00
Sébastien Loriot e1e1512869 Merge 'PMP-isotropic_remeshing_user_projection' into PMP-isotropic_remeshing_user_projection 2018-06-06 18:00:32 +02:00
Konstantinos Katrioplas 60cbb2fc6a Merge remote-tracking branch 'cgal/master' into PMP-smoothing-kkatrio 2018-06-06 15:50:14 +02:00
Sébastien Loriot 6e1d9b2a3e clip_volumes -> clip_volume 2018-06-06 13:30:36 +02:00
Sébastien Loriot e26bee1a61 rename new_face_visitor -> visitor 2018-06-06 09:50:05 +02:00
Sébastien Loriot 7d69c199af the variable is name graph_visitor and not visitor (visitor is the function) 2018-06-06 09:37:14 +02:00
Simon Giraudot beb3408663 Add forward declarations and remove dependency to Solver_interface 2018-06-05 14:50:17 +02:00
Maxime Gimeno b18f5e5546 Fix warning. 2018-06-05 09:30:58 +02:00
Sébastien Loriot aecefd2e6d include_clipper_boundary -> use_compact_clipper 2018-06-04 15:20:31 +02:00
Maxime GIMENO 0517c35f59
Merge branch 'master' into BGL-Copy_face_graph_use_np-GF 2018-06-04 11:58:43 +02:00
Sébastien Loriot 2569c271e5 improve doc and plugin 2018-06-01 16:50:39 +02:00
Sébastien Loriot 94a73232d5 document clip functions 2018-06-01 11:06:29 +02:00
Sébastien Loriot 13cb7d250c make the function collapsing edges with constraints always keep the target 2018-05-29 16:17:41 +02:00
Sébastien Loriot 460f49d64f move code to swap edges in a function 2018-05-29 15:59:55 +02:00
Sébastien Loriot 1f1c97050b move code swapping vertices in an internal helper function 2018-05-29 15:59:55 +02:00
Sébastien Loriot acf969560d try improving phrasing 2018-05-29 15:59:54 +02:00
Maxime Gimeno 127b0c68d5 Fix doc 2018-05-29 15:59:54 +02:00
Maxime Gimeno 0b2436d062 Clean-up after review 2018-05-29 15:59:54 +02:00
Sébastien Loriot 4e580a6450 update documentation 2018-05-29 15:59:10 +02:00
Sébastien Loriot 0695f30c17 always preserve q at collapse by swapping p and q if q is of degree 2
the advantage is that we have an easy way to document which
halfedges are removed
2018-05-29 15:59:10 +02:00
Maxime Gimeno 5586622829 Update doc for edge_collapse 2018-05-29 15:59:10 +02:00
Maxime Gimeno f1724b3f4c Make collapse_edge always keep the target vertex. 2018-05-29 15:58:19 +02:00
Simon Giraudot 6daa40c4aa Add callback named parameter 2018-05-29 11:42:02 +02:00
Sébastien Loriot d3a9f655af replace bool parameter throw_on_self_intersection with a named parameter
used it at the same time in Boolean operation functions
2018-05-28 17:37:17 +02:00
Sébastien Loriot a207317cf5 add a parameter in corefinement functions to track the creation of new faces 2018-05-28 17:36:07 +02:00
Laurent Rineau 851dfabd29 Merge pull request #2757 from maxGimeno/BGL-Add_facegraph_validity_check_function-GF
BGL:  Add a  FaceGraph validity check function
2018-05-28 13:58:07 +02:00
Sébastien Loriot edf7527b3f simplify call 2018-05-17 13:42:42 +02:00
Maxime Gimeno 4b90bca4e3 Clean-up and fixes 2018-05-17 11:49:31 +02:00
Maxime Gimeno e0cf352319 Revert changes to Emptyset_iterator and modifies default map management to use a dummy functor instead 2018-05-17 10:50:23 +02:00
Maxime Gimeno cd6ffdc12a Add property maps for simplex mapping.
Also adds an operator()(const T&){} to Emptyset_iterator so it can be used by boost::function_output_iterator().
2018-05-17 10:49:58 +02:00
Maxime Gimeno 6623d3633f Clean-up and fixes 2018-05-17 10:49:58 +02:00
Maxime Gimeno 5fc0022d92 make copy_face_graph use NamedParameters 2018-05-17 10:49:58 +02:00
Sébastien Loriot e08c1cdc4d add an option to prevent the collapse of constrained edges 2018-05-15 12:21:05 +02:00