Commit Graph

806 Commits

Author SHA1 Message Date
Laurent Rineau 5ffbed4cf7
Merge pull request #2732 from maxGimeno/Travis-Install_openmesh-GF
Travis: Add OpenMesh
2018-01-24 16:13:27 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Maxime Gimeno 960025fb17 Replace or by and 2018-01-22 14:02:09 +01:00
Maxime Gimeno c3215b9331 Move graph_has_property from namespace boost to namespace CGAL and provide some doc for it. 2018-01-22 12:43:29 +01:00
Laurent Rineau e72444ab60
Merge pull request #2709 from lrineau/CGAL-fix_merge_of_PR_2478-GF
Fix the merge of PR #2478 into releases/CGAL-4.11-branch
2018-01-22 10:06:21 +01:00
Andreas Fabri 5efce459da Mesh_3 2018-01-18 08:49:52 +00:00
Andreas Fabri 39b1431fca Surface_mesh_paramerization 2018-01-17 21:42:31 +00:00
Andreas Fabri 38b2e57b11 PMP 2018-01-17 17:59:35 +00:00
Laurent Rineau 2ec646a046 Merge pull request #2713 from sloriot/BGL-fix_assertions_FFG
Fix assertions
2018-01-17 10:43:14 +01:00
Maxime Gimeno 150bde7159 Move inclusion of MeshIO.hh before mesh type definition 2018-01-15 11:23:36 +01:00
Sébastien Loriot 560f98faf0 please compiler instantiating non valid overloads 2018-01-15 10:31:29 +01:00
Sébastien Loriot 8ac58e96c5 add missing include directive 2018-01-11 18:04:31 +01:00
Simon Giraudot c52b32b744 Add trick to get FT right for general PointRange AND for CGAL::Point_set_3 2018-01-11 14:04:19 +01:00
Simon Giraudot 9c1e045376 Use std::iterator_traits to get the value type 2018-01-11 12:35:36 +01:00
Simon Giraudot 9dd5b07ccb Fix namespace indentation 2018-01-10 16:39:33 +01:00
Simon Giraudot 16697b79f9 Add convenient Fake_point_range + fix dummy normal map 2018-01-10 16:39:31 +01:00
Simon Giraudot fffefbaeaf add all_default() method with point set 3 overload 2018-01-10 16:38:36 +01:00
Simon Giraudot 2cc86911b2 Add missing PSP named parameters 2018-01-10 16:38:35 +01:00
Simon Giraudot bfca6b41c8 Add point set processing named parameters helpers 2018-01-10 16:38:35 +01:00
Simon Giraudot 09c2fcaf94 Add PSP named parameters 2018-01-10 16:38:35 +01:00
Simon Giraudot c6f35d6d6e Move helpers of PMP in namespace + first helpers of PSP 2018-01-10 16:38:35 +01:00
Mael Rouxel-Labbé 7e62f6ffd1 Various doc fixes 2018-01-10 14:30:37 +01:00
Mael Rouxel-Labbé 4e3d91becf Moved undocumented output function to internal 2018-01-10 12:00:31 +01:00
Mael Rouxel-Labbé 1da84501f7 Renamed output function 2018-01-10 11:59:14 +01:00
Mael Rouxel-Labbé d35e6d4329 Added a comment 2018-01-10 11:59:05 +01:00
Mael Rouxel-Labbé 51e23d44a8 Fixed includes 2018-01-10 11:58:56 +01:00
Mael Rouxel-Labbé 17e46dab7d Added partition operations to BGL 2018-01-09 18:06:02 +01:00
Sébastien Loriot 7ee538395d fix assertions 2018-01-08 05:36:16 +01:00
Martial Tola c233ba697b fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during link process... 2018-01-04 17:54:16 +01:00
Laurent Rineau 42b11ddf29 Revert the merge of PR #2478
This reverts the merge commit 46cc91e787 onto
488c3e2879.
2018-01-04 17:54:08 +01:00
Sébastien Loriot 9fe73a801e Merge pull request #2552 from maxGimeno/PMP_does_intersect-GF
PMP: do_intersect
2018-01-04 15:34:18 +01:00
Sebastien Loriot e3f78ff10e
Merge pull request #2545 from maxGimeno/PMP_orient_connected_components-GF
PMP :  Orient_connected_components function
2018-01-04 15:31:21 +01:00
Sebastien Loriot 625df00b19
Merge pull request #2219 from afabri/BGL-generic_property_map-GF
BGL: Add an API for adding and removing a property map
2018-01-04 15:28:54 +01:00
Sebastien Loriot fb44258bb6
Merge pull request #2682 from sloriot/BGL-nef_to_fg_triangulate_all
Add an option to triangulate all the faces
2017-12-22 22:10:01 +01:00
Sébastien Loriot d1597f2fb5 Merge branch 'maxGimeno/PMP_orient_connected_components-GF' into cgal/master 2017-12-19 17:34:51 +01:00
Sébastien Loriot 430ad5bc72 Merge branch 'maxGimeno/PMP_does_intersect-GF' into cgal/master 2017-12-19 17:31:29 +01:00
Laurent Rineau 61e662c4e4 Merge pull request #2649 from sgiraudot/BGL-Regroup_named_parameters-GF
Regroup PMP named parameters with BGL named parameters

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/parameters_interface.h
2017-12-19 16:33:44 +01:00
Sébastien Loriot 86c1cfb65d factorize implementation for PolyMesh_Array and TriMesh_Array
I removed add_face(VertexIterator, VertexIterator, FG) as it is not
required by MutableFaceGraph and was the only function with
a different implementation between the 2 classes
2017-12-19 15:48:07 +01:00
Sébastien Loriot 456222aa81 add comment 2017-12-19 14:51:12 +01:00
Sébastien Loriot a9a85b37e6 fix compilation issues and warnings 2017-12-19 14:43:30 +01:00
Sébastien Loriot 5630e163f9 fix copy-paste error 2017-12-18 09:43:12 +01:00
Sébastien Loriot f9698633a5 add special case for border of size 3 and border of size 4 2017-12-15 16:14:04 +01:00
Laurent Rineau 7df26c594b
Merge branch 'master' into BGL-generic_property_map-GF 2017-12-14 09:46:01 +01:00
Sébastien Loriot 8c94abde95 add an option to triangulate all the faces 2017-12-14 07:52:08 +01:00
Mael Rouxel-Labbé 638bfee3fd Regroup and complete BGL named parameters tests
Along the way, apply the same fix as in f191e6114a
(*_sampling should be named use_*_sampling)
2017-12-13 10:49:50 +01:00
Mael Rouxel-Labbé ad947da752 Give each package a NamedParameters.txt 2017-12-12 00:07:57 +01:00
Mael Rouxel-Labbé 9a38d9d41a Reorder named parameters and remove useless ones 2017-12-11 21:32:03 +01:00
Laurent Rineau 4e91d4d768 Merge pull request #2595 from gdamiand/BGL_LCC-use_generic_load-gdamiand
BGL/LCC: use generic load

# Conflicts:
#	BGL/test/BGL/CMakeLists.txt
2017-12-05 18:23:58 +01:00
Laurent Rineau f37630bc0f Merge branch 'releases/CGAL-4.11-branch'
# Conflicts:
#	Kernel_23/test/Kernel_23/include/CGAL/_Result_of_kernel.h
#	Kernel_23/test/Kernel_23/test_result_of.cpp
2017-12-05 18:14:23 +01:00
Laurent Rineau a84a0b686b Merge pull request #2598 from sloriot/BGL-fix_export_to_nef
Correctly handle faces with more than one cc of the boundary
2017-12-05 17:57:59 +01:00
Simon Giraudot 426a72af74 Merge parameters_interface.h to BGL 2017-12-01 15:32:29 +01:00
Simon Giraudot 3dc39c7641 Regroup PMP named parameters with BGL named parameters 2017-11-30 16:05:11 +01:00
Andreas Fabri de166d8be7 Fix testsuite 2017-11-29 10:51:06 +00:00
Jane Tournois 2feb79a16b Add example for dynamic_property_map 2017-11-27 16:35:30 +00:00
Guillaume Damiand 3d84dae11a Bug fix in read_off specialization for open mesh. 2017-11-24 11:18:01 +01:00
Guillaume Damiand 4be7fac4f2 Add read and write off taking a std::string as parameter 2017-11-24 11:18:01 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Sébastien Loriot 67ab9d124d correctly handle the case of faces with more than one cc of the boundary 2017-11-15 15:37:27 +01:00
Sébastien Loriot 5a4697771d explicit the BSL in the header
also remove LGPL from GF as it makes little sense.
The change is done to please licensecheck
2017-11-12 10:41:37 +01:00
Sébastien Loriot 39e4fdd3ed add missing SPDX identifiers 2017-11-12 10:21:27 +01:00
Sébastien Loriot 5174db8e1d add missing boost license tag 2017-11-12 10:17:52 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Sébastien Loriot a05b134a6b add SPDX identifier for files under the boost license 2017-11-12 10:17:50 +01:00
Laurent Rineau 5ecd090ab6 Merge pull request #2315 from lrineau/Mesh_3-imported_newest_improvements_into_CGAL-GF
Mesh_3: import newest improvements
2017-10-23 17:07:00 +02:00
Laurent Rineau 46cc91e787 Merge pull request #2478 from mtola/master
fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during …
2017-10-13 17:06:22 +02:00
Laurent Rineau 1d46a17214 Merge pull request #2515 from sloriot/BGL-fix_argument_order
Change argument order to be consistent with other selection functions
2017-10-13 16:54:27 +02:00
Laurent Rineau 39516eaa2b Merge pull request #2478 from mtola/master
fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during …
2017-10-13 16:54:11 +02:00
Laurent Rineau dc7c887436 Fix the compilation of <CGAL/Polyhedral_mesh_domain_3.h>
1. Create <CGAL/boost/graph/Graph_with_descriptor_with_graph_fwd.h>
     ... a forward-declaration header.

  2. Include the forward-declarations of `CGAL::Surface_mesher` and
  `CGAL::Graph_with_descriptor_with_graph`, so that the header compiles.
2017-10-13 15:57:02 +02:00
Laurent Rineau d333cc672d Merge pull request #2492 from sloriot/OM-fix_edge_hashing
Fix hashing of edge_descriptor for OpenMesh
2017-10-11 19:18:57 +02:00
Laurent Rineau 8d111f35e0 Merge pull request #2455 from afabri/SM-abaquus-GF
Add write_inp(FaceGraph)
2017-10-11 19:18:41 +02:00
Laurent Rineau 3877f84899 Merge pull request #2492 from sloriot/OM-fix_edge_hashing
Fix hashing of edge_descriptor for OpenMesh
2017-10-11 19:11:46 +02:00
Sébastien Loriot be4635a1f6 change argument order to be consistent with expand/reduce_face_selection() 2017-10-09 15:09:42 +02:00
Andreas Fabri 3f89acae6b Remove unused typedef 2017-10-05 09:50:42 +01:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Andreas Fabri 1be0c2163b Increment the element number 2017-10-04 08:14:47 +02:00
Sébastien Loriot 12688d05a1 fix hashing of edge_descriptor for OpenMesh 2017-10-03 17:21:24 +02:00
Jane Tournois ab1eef79b5 fix unused variable warnings 2017-10-03 10:51:15 +02:00
Martial Tola 6ce7afb6e0 fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during link process... 2017-10-01 16:07:33 +02:00
Andreas Fabri b574ba0bb4 add typename 2017-09-22 13:44:37 +01:00
Andreas Fabri 7156427220 Add write_inp() 2017-09-22 08:16:50 +01:00
Jane Tournois 6a17042d6e make get() function const
so that the pmap works and an lvalue_property_map
2017-08-22 17:19:51 +02:00
Sebastien Loriot 97b8782a27 Merge branch 'master' into Detect_features-GF 2017-08-18 16:34:29 +02:00
Maxime Gimeno 43ff0d092c Implementation review Jane and sebastien 2017-08-11 15:30:03 +02:00
Maxime Gimeno 723492def1 Use existing named_parameters and vertex_incident_patches becomes lvaluepmap, 2017-08-10 15:16:27 +02:00
Maxime Gimeno 1fe1e21bb6 Replace maximum_surface_patch by first_index. 2017-08-07 13:32:02 +02:00
Maxime Gimeno 1bad0e7202 Use edges instead of halfedges for edge_is_feature_t and map 2017-08-07 11:39:07 +02:00
Maxime Gimeno d588c55bbb Make functions free functions and wright doc 2017-08-04 15:06:41 +02:00
Maxime Gimeno 2f45a46f7c Fix and enhance detect_feature 2017-08-02 16:08:33 +02:00
Maxime Gimeno 9381041e18 Doc fixes and enhancement 2017-08-02 11:16:44 +02:00
Maxime Gimeno 8288fe2ca2 changes.html 2017-08-02 11:16:44 +02:00
Maxime Gimeno f1a3ea95a3 Add face selection expansion to the selection_plugin 2017-08-02 11:14:32 +02:00
Maxime Gimeno 8460df09c3 Add a function to make a removal of faces manifold. 2017-08-02 11:14:32 +02:00
Laurent Rineau 1537335ed6 Merge pull request #2311 from sloriot/BGL-FFG_bugfix
Fix Face_filtered_graph bugs
2017-07-28 18:46:14 +02:00
Laurent Rineau 3fb6c05622 Merge pull request #2304 from sloriot/BGL-copy_non_manifold_vertices
Handle non-manifold vertices when copying a mesh
2017-07-28 18:42:38 +02:00
Jane Tournois aeb9a72843 replace BOOST_FOREACH by a simple for loop
the BOOST_FOREACH loop was either crashing after one loop,
of entering an infinite loop on the first vertex of the range,
and this fixes the bug

it happened on vs2015 and vs2017, in Release mode, and only Release mode
2017-07-28 17:48:37 +02:00
Sébastien Loriot 7efdddefd6 use member function instead of a useless free function
this avoid at the same time pollution of the CGAL namespace
2017-07-27 15:49:21 +02:00
Sébastien Loriot c57c14255b always reset the selection bits (important when switching to a new selection) 2017-07-27 14:56:01 +02:00
Sébastien Loriot 7114b8c542 do not use an ambiguous name 2017-07-27 14:55:30 +02:00
Sébastien Loriot 54aae24840 fix next/prev in case we are on the border
we need to look at all possible candidates turning outside
of the patch. The previous code was taking a random halfedge
as starting point (and that halfedge can be in the interior
of the selection)
2017-07-27 14:53:50 +02:00
Sébastien Loriot bb175cdc66 handle non-manifold vertices when copying a mesh 2017-07-26 12:05:09 +02:00