songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
85,186 Commits 3 Branches 156 Tags 962 MiB
Commit Graph

956 Commits

Author SHA1 Message Date
Sébastien Loriot 75aca45157 do no ignore user provided traits 2018-11-24 18:40:15 +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é 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
Laurent Rineau 464491a3a1 Merge pull request #3243 from sloriot/BGL-clear_fix 
Fix CGAL::clear
 2018-07-26 17:31:12 +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 62a8391fde Merge pull request #3242 from lrineau/Mesh_3-fix__add_stop_with_TBB-GF 
Mesh 3 fix: add the possibility to stop the algorithm, when Parallel_tag is used
 2018-07-25 18:59:46 +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
Laurent Rineau a96e69af29 Add the possibility to stop Mesh_3 with TBB 2018-07-24 12:40:18 +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
Laurent Rineau ba21ecb66a Add the possibility to stop Mesh_3 with TBB 2018-07-18 18:26:08 +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
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
Laurent Rineau cabb7d9b89 Merge pull request #2737 from maxGimeno/BGL_isotropic_remeshing_keep_constrained_points_intact-GF 
BGL: Isotropic_remeshing() keeps constrained vertices intact

# Conflicts:
#	Installation/CHANGES.md
 2018-06-06 14:41:34 +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 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Laurent Rineau 2ad4781a05 Merge pull request #3092 from maxGimeno/Travis-Check_including_all_headers-GF 
Infrastructure : Test compilation of headers
 2018-05-28 13:58:19 +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
Maxime Gimeno 333505036a Dummy change to trigger travis 2018-05-23 11:48:59 +02:00
Andreas Fabri 6e828da0e9 Move stuff to CGAL/boost/parameter 2018-05-23 11:48:59 +02:00
Andreas Fabri f6cd1e0bcf Factorize boost parameters in the file CGAL/boost/parameter.h 2018-05-23 11:48:59 +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
Sébastien Loriot 0c61d13e2f add missing include directive 2018-05-04 10:45:15 +02:00
Maxime Gimeno 861a6a16c5 Fixes 2018-05-03 12:49:34 +02:00
Maxime Gimeno 68de1819cf Move the code to the PMP functio nand document. 2018-05-03 12:49:34 +02:00
Maxime Gimeno d3c874bd83 Add some info about what a valid graph is. 2018-05-03 12:03:15 +02:00