Commit Graph

531 Commits

Author SHA1 Message Date
Andreas Fabri a32e75646f reorient make_tetrahedron 2016-12-09 12:49:06 +01:00
Maxime Gimeno d7c8f598a1 Fix doc 2016-12-08 10:12:10 +01:00
Sébastien Loriot a066f8c01b use different overloads even in c++11
The default value for the point map cannot be set
2016-12-07 17:08:30 +01:00
Maxime Gimeno 8569e8fb9a Add an example. 2016-12-07 16:46:49 +01:00
Laurent Rineau 65d67329fc Fix the patch from #1524
When the `less` operator was added to `split_graph_into_polylines`, it
was wrong: as we duplicate vertices, that is not sufficient to compare
the points at vertices.
2016-12-07 11:24:28 +01:00
Sébastien Loriot b4da56f408 remove extra comma 2016-12-07 09:02:36 +01:00
Maxime Gimeno 50e4b04d51 Restore graph_has_property() 2016-12-06 14:13:18 +01:00
Maxime Gimeno 5141f55efe Make doc 2016-12-06 12:59:56 +01:00
Sébastien Loriot f82fce23fd remove trailing whitespaces 2016-12-06 12:59:56 +01:00
Sébastien Loriot b1f6d0c1dd add assertion and graph_has_property specialization 2016-12-06 12:59:56 +01:00
Sébastien Loriot 2355c5b871 fix compilation issues 2016-12-06 12:59:55 +01:00
Sébastien Loriot 5a51e9bc98 allow comparision with null descriptors 2016-12-06 12:59:55 +01:00
Sébastien Loriot b1a481db5c disable the copy-constructor 2016-12-06 12:59:55 +01:00
Sébastien Loriot 4d67fcc08f the base property_map must be copied 2016-12-06 12:59:55 +01:00
Sébastien Loriot 51bed6153e add missing const 2016-12-06 12:59:55 +01:00
Sébastien Loriot b0e5c90eae various fixes 2016-12-06 12:59:55 +01:00
Andreas Fabri 3703683761 Add put 2016-12-06 12:59:55 +01:00
Andreas Fabri 211fcb4107 Partial support for propery maps 2016-12-06 12:59:55 +01:00
Andreas Fabri c9b53a1989 Add null_vertex() etc. 2016-12-06 12:59:55 +01:00
Sébastien Loriot 7f25b7af56 add missing typename and fix typo 2016-12-06 12:59:55 +01:00
Andreas Fabri 5f18b0738c First version of a graph class that stores a pointer to the graph in the descriptor (for debugging) 2016-12-06 12:59:55 +01:00
Sébastien Loriot c3e1309181 update from master branch 2016-12-05 14:37:29 +01:00
Andreas Fabri 3fc151b0dd polish, e.g. P -> pm 2016-11-30 10:32:40 +01:00
Andreas Fabri e0484d4988 Remove Graph_geometry.h 2016-11-28 08:39:51 +01:00
Sébastien Loriot 20fa78081c add property maps as parameter for copy_face_graph 2016-11-23 15:31:29 +01:00
Sébastien Loriot 5c94f7d8ac avoid documenting internal and non-intended classes and functions 2016-10-21 11:11:00 +02:00
Sébastien Loriot e4ba7e0c70 add missing include directive 2016-10-20 18:12:54 +02:00
Laurent Rineau 5ab5825013 Merge pull request #1466 from sloriot/BGL-add_nef_to_pm
Add a function to convert a Nef polyhedron to a polygon mesh
2016-10-17 10:03:24 +02:00
Laurent Rineau d43015c0ef Merge pull request #1543 from afabri/BGL_remove_graph_traits_CMap-GF
Remove files that are here accidentally according to Guillaume
2016-10-17 09:59:17 +02:00
Sébastien Loriot 14030d4c49 remove unused variable 2016-10-12 10:52:02 +02:00
Sébastien Loriot 5d9edb5670 fix license 2016-10-06 09:33:32 +02:00
Andreas Fabri 74a72a4749 Remove files that are here accidentally according to Guillaume 2016-10-05 16:22:26 +02:00
Sébastien Loriot d9413be399 add function convert_nef_polyhedron_to_polygon_mesh and document it 2016-10-05 15:28:12 +02:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 745cdaeba5 Merge pull request #1524 from lrineau/Mesh_3-split_graph_into_polylines_determinism-lrineau
Make split_graph_into_polylines deterministic
2016-10-05 13:03:36 +02:00
Laurent Rineau 7b6addbb55 Merge pull request #1519 from lrineau/Mesh_3-fix_conversion_warnings-lrineau
Mesh_3: fix conversion warnings
2016-10-05 13:03:15 +02:00
Laurent Rineau 1c19028e5b Merge pull request #1267 from maxGimeno/Random_generator-GF
Random generator
2016-10-05 13:02:29 +02:00
Laurent Rineau eb21f2ed3b Fix a compilation error 2016-09-30 19:52:20 +02:00
Andreas Fabri 40e9c6f735 Move specializations of graph_traits the packages that are concerned 2016-09-30 15:22:29 +02:00
Andreas Fabri ca1f19b392 Package BGL: Add includes 2016-09-30 15:22:29 +02:00
Laurent Rineau 5bd65fba58 Make split_graph_into_polylines deterministic
- There is a new argument, `Less`, that allows to sort the `std::set` of
  vertex descriptors with a deterministic sort functor.

- The header `<CGAL/Mesh_3/polylines_to_protect.h>` defines and use such
  a functor.
2016-09-29 17:41:32 +02:00
Laurent Rineau 0221c3727a Fix a typo in the doc of the internal function 2016-09-29 14:48:29 +02:00
Maxime Gimeno cf0d78da34 Use const references in the generators instead of simple references. 2016-09-28 10:59:11 +02:00
Maxime Gimeno 4754094f5f Make working tests. 2016-09-28 10:48:07 +02:00
Maxime Gimeno 8469c45336 Enhance Prevent_deref API and use it. 2016-09-28 10:48:07 +02:00
Sébastien Loriot b899dc4549 add default parameters 2016-09-28 10:46:42 +02:00
Maxime Gimeno 3eb1f4ca69 Clean-up
- Clean-up
- Moved Prevent_deref to CGAL/iterator.h
2016-09-28 10:45:46 +02:00
Sébastien Loriot e2f7efa58a clean up 2016-09-28 10:45:45 +02:00
Maxime Gimeno 35a328b1bf Move Halfedge_and_face_graph_property_maps.h to BGL. 2016-09-28 10:45:45 +02:00
Jane Tournois b475497db2 add missing graph_has_property for edge_weight_t 2016-09-22 12:10:06 +02:00
Jane Tournois 661a55f8e6 use Has_member_id where it's possible, and add missing graph_has_property structs 2016-09-22 12:10:06 +02:00
Jane Tournois d1da692ce7 add partial specializations of graph_has_property for existing internal pmaps 2016-09-22 12:05:51 +02:00
Jane Tournois c8de3e32f1 add class to check whether a class has member function id()
this function is also able to detect the id() function in
base classes, however the number of derivations is large

I will add the test `test_Has_member_id.cpp` to the BGL package to test
this functionality
2016-09-22 12:05:51 +02:00
Jane Tournois 73492e7767 add graph_has_property
a struct intended to check whether Graph has an internal property map
for the parameter tag `PropertyTag`
2016-09-22 12:05:51 +02:00
Sébastien Loriot ff1b240a37 replace assert by CGAL_assertion in CGAL code 2016-08-25 11:12:17 +02:00
Sebastien Loriot af5c8210b7 Add missing requirements 2016-07-07 14:25:29 +02:00
Sebastien Loriot fc44ee3051 Merge pull request #1180 from sloriot/BGL-fix_edge_hash
fix edge hash
2016-06-24 13:24:27 +02:00
Sébastien Loriot c3f7310355 handle default constructed edges 2016-06-16 16:47:59 +02:00
Sébastien Loriot f7090e4b71 remove debug output 2016-06-15 14:32:44 +02:00
Sébastien Loriot d94ef9467f fix the hash for edges
it returns the hash value of the smallest edge
2016-06-15 14:29:59 +02:00
Andreas Fabri 20c97edb12 The edge_weight must be the lenth, and not the squared length 2016-06-14 14:17:14 +02:00
Sebastien Loriot 40e36d41b5 Merge pull request #1138 from afabri/BGL-hash_OpenMesh-GF
Add hash_value and specialization of hash for OpenMesh
2016-06-08 14:18:29 +02:00
Andreas Fabri d84be563f8 Add hash_value and specialization of hash for OpenMesh 2016-06-06 19:10:58 +02:00
Andreas Fabri a9e8981278 Document that vertex and face type must be Hashable 2016-06-06 14:05:51 +02:00
Sebastien Loriot 64e8bbe44f Update copy_face_graph.h 2016-06-06 13:50:33 +02:00
Sébastien Loriot fc5c70f7b3 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch' 2016-05-23 10:53:33 +02:00
Maxime Gimeno a54b648050 Fix for heap out of space 2016-05-09 10:46:43 +02:00
Laurent Rineau 5ac3473d96 Fix a "typo"?
Actually, the difference between `boost::disable_if` and
`boost::lazy_disable_if` is really important (one "dereference" of
`::type` or not). The fact is that I had not tested correctly: I had
tested only with `test/PMP`, whereas there was a compilation error in
`examples/PMP`.
2016-05-06 11:59:27 +02:00
Maxime Gimeno 91669afc36 Fix for get 2016-05-04 12:20:34 +02:00
Laurent Rineau f39805f8d6 Merge pull request #1014 from afabri/BGL_use_put_get-GF
Add using get and put to help VC++; Add a testcase
2016-04-22 15:25:03 +02:00
Andreas Fabri 0bebd2cbd0 Move the using from properties_Polyhedron.h to property_map.h 2016-04-18 11:24:45 +02:00
Andreas Fabri ca284090b2 move the using ::put to the put that VC++ has problems with 2016-04-18 09:36:16 +02:00
Andreas Fabri aace47d473 Add using get and put to help VC++; Add a testcase 2016-04-15 17:10:12 +02:00
Andreas Fabri cd367c4104 Take fix from janetournois:BGL-fix_conversion_of_boundary_halfedges-jtournois 2016-04-15 10:07:03 +02:00
Philipp Möller 72b2269958 Use Cartesian_converter for point property 2016-04-15 10:04:43 +02:00
Philipp Möller b1666cece7 Improve wording 2016-04-15 10:04:42 +02:00
Philipp Möller 4df63ef37f Specify correct concept 2016-04-15 10:04:41 +02:00
Philipp Möller 2b98567b2b Use an internal v2v as well 2016-04-15 10:04:38 +02:00
Philipp Möller d559271761 Add trickery for default template arguments 2016-04-15 10:04:36 +02:00
Philipp Möller 0fa954bc8a Use f2f argument 2016-04-15 10:04:34 +02:00
Philipp Möller e664952918 Basic documentation 2016-04-15 10:04:33 +02:00
Philipp Möller 56987c5062 Use output iterators and default them 2016-04-15 10:04:32 +02:00
Philipp Möller 6a5bf5f4ce Rename the file 2016-04-15 10:03:46 +02:00
Philipp Möller b63a2d7312 Rename convert_surface_mesh and add to doc 2016-04-15 10:02:16 +02:00
Laurent Rineau fceba01368 Merge pull request #918 from afabri/HDS-hash-GF
Add hash_value for edge_descriptor of HDS
2016-04-14 15:07:47 +02:00
Laurent Rineau 8e604f70f2 Merge modifications from 'releases/CGAL-4.8-branch'
Merges the following:

> dbb2be1 Merge pull request #983 from lrineau/Mesh_3-fix_test_meshing_3D_gray_image-lrineau
> 5dcd5c7 Merge pull request #958 from gdamiand/BGL-bugfix-gdamiand
> 869e65a CGAL-4.8 announcement
2016-04-05 11:24:19 +02:00
Guillaume Damiand c80082a574 Bug fix in add_vertex_and_face_to_border in BGL/include/CGAL/boost/graph/Euler_operations.h. 2016-04-04 11:52:02 +02:00
Laurent Rineau ae33af9222 Merge branch 'releases/CGAL-4.8-branch'
Merges the following fixes:
> 4025913 Merge pull request #949 from janetournois/BGL-fix_conversion_of_boundary_halfedges-jtournois
> 9c62628 Merge pull request #948 from janetournois/PMP-fix_assertion_isotropic_remeshing-jtournois
> f61402d Merge pull request #929 from sloriot/Polyhedron_demo-Isotropic_remeshing_preserve_duplicates

See also:

* https://github.com/CGAL/cgal/pull/949
* https://github.com/CGAL/cgal/pull/948
* https://github.com/CGAL/cgal/pull/929
2016-03-31 10:55:12 +02:00
Laurent Rineau 4025913a8e Merge pull request #949 from janetournois/BGL-fix_conversion_of_boundary_halfedges-jtournois
BGL convert_surface_mesh : convert also boundary halfedges
2016-03-31 10:54:29 +02:00
Laurent Rineau 145b3dbe77 Merge fixes to Surface_mesh and BGL from 4.8
Merge branch 'releases/CGAL-4.8-branch'. Merges:
> 0b5fa6a Merge pull request #945 from sloriot/BGL-OpenMesh_free_functions
> 681e08d Merge pull request #947 from sloriot/SM_shortest_path-fix_package_info
2016-03-29 12:01:15 +02:00
Jane Tournois 2bc034dee1 don't forget to map boundary halfedges 2016-03-25 10:55:07 +01:00
Laurent Rineau 076c982dbf Merge pull request #676 from bo0ts/BGL-document_dual-pmoeller
BGL: document Dual
2016-03-24 17:11:27 +01:00
Laurent Rineau 00e6e03d5c Merge pull request #785 from afabri/CGAL-missing_includes-GF
Partial cleanup of issue #595   Part2
2016-03-24 17:02:27 +01:00
Sébastien Loriot 0354c3913a BGL functions must be in OpenMesh namespace
this was detected by a qualified call to get for variant

(cherry picked from commit 309f91f1550be0653ffa00d59ee040cc8777d0b6)
2016-03-24 15:55:30 +01:00
Andreas Fabri b639ce8d55 Didn't take border edges into account 2016-03-22 16:04:20 +01:00
Andreas Fabri 06a1925f6f Forgot to set the halfedge of the face 2016-03-22 16:04:20 +01:00
Andreas Fabri eddb7b7dbe Add hash_value for edge_descriptor of HDS 2016-03-15 14:30:54 +01:00
Andreas Fabri beb1417477 remove unused header files; remove commented includes; changed include paths 2016-02-15 14:20:12 +01:00
Sebastien Loriot 718eae7a00 Merge pull request #714 from sgiraudot/CGAL-Fix_boost_warning_unused_typedef-GF
Fix boost warning (unused typedef)
2016-02-05 14:59:28 +01:00
Sébastien Loriot 8cee2ef1dd Merge pull request #686 from afabri/Kernel_fix-warnings-GF
Fix warnings concerning indentation and unused parameter
2016-02-03 09:49:54 +01:00
Philipp Möller 5e05cb6205 Also use Key argument
Those functions trigger a hard error when a call such as
`get<XXX>(something)` is made. Using all template arguments makes it go
away, but why this is a hard error is still baffling.
2016-02-02 17:06:49 +01:00
Philipp Möller ed17a8f57d Add free dual function 2016-02-02 16:00:31 +01:00
Philipp Möller 44fdb662b0 Add documentation for members 2016-02-02 16:00:31 +01:00
Philipp Möller 9c0cc1319e Prevent use of other vertex/face properties 2016-02-02 16:00:31 +01:00
Philipp Möller b1deeabe56 More doc 2016-02-02 16:00:31 +01:00
Philipp Möller 9c9256da8c Add the overloads to fix face/vertex_index_t 2016-02-02 16:00:31 +01:00
Philipp Möller 7fc6441903 Add generic property forwarding 2016-02-02 16:00:31 +01:00
Philipp Möller 2b20ea5e92 Add missing graph functions 2016-02-02 16:00:31 +01:00
Philipp Möller b3cf47a81b Directly forward the traversal category 2016-02-02 16:00:31 +01:00
Philipp Möller 2a0e76a29f Add initial documentation 2016-02-02 16:00:31 +01:00
Simon Giraudot d9b3b40dc0 Add CGAL_UNUSED after BOOST_CONCEPT_ASSERT to avoid unused typedef warnings 2016-02-02 12:59:42 +01:00
Sébastien Loriot f02e570690 avoid unused variable warning 2016-01-29 14:18:09 +01:00
Sébastien Loriot ccdb47318f add missing header 2016-01-25 10:29:20 +01:00
Sébastien Loriot 4c4b191209 Merge pull request #604 from bo0ts/BGL-add_clear-pmoeller
Add BGL helper CGAL::clear
2016-01-23 09:18:56 +01:00
Sébastien Loriot cf08261299 Merge pull request #652 from sloriot/BGL-document_selection_functions
BGL: document selection functions
2016-01-20 17:13:21 +01:00
Sébastien Loriot 13de98a97a consistantly rename graph variable 2016-01-20 17:09:10 +01:00
Sébastien Loriot d9e1472468 document all selection functions 2016-01-19 11:32:56 +01:00
Sébastien Loriot c1459d3f20 rename dilate/erode function after review 2016-01-19 11:32:49 +01:00
Sébastien Loriot afc38f5a7b remove extra comment 2016-01-19 11:32:34 +01:00
Sébastien Loriot b10b78c0c1 first step to document selection functions 2016-01-19 11:32:10 +01:00
Sébastien Loriot 1792146afd document split_graph_into_polylines 2016-01-19 09:30:00 +01:00
Philipp Möller 7cf791fa0f Improve documentation to mention clear 2016-01-08 14:48:28 +01:00
Philipp Möller e7ed448862 Add clear overload for OpenMesh 2016-01-08 12:34:46 +01:00
Philipp Möller f17dd10214 Add a clear helper
This helper will use the faster clear member function, if it is
available or clear the mesh in a traditional fashion otherwise.
2016-01-08 12:31:47 +01:00
Philipp Möller 9766b8f350 Add traits class to check for member clear 2015-12-27 17:03:17 +01:00
Sébastien Loriot 554036b699 Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' 2015-11-23 09:55:22 +01:00
Sebastien Loriot 019856b8c4 Merge pull request #494 from afabri/BGL-fix_Halfedges_around_source_bug-GF
Fix bug  in Halfedge_around_source_circulator
2015-11-23 09:43:50 +01:00
Sébastien Loriot dbe07942c4 Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' 2015-11-20 14:48:11 +01:00
Andreas Fabri 48f367e68b fix bug and improve testsuite 2015-11-20 09:56:55 +01:00
Andreas Fabri 170636b15b add const qualifier 2015-11-19 16:03:43 +01:00
Sebastien Loriot d605b6b95f Merge pull request #457 from janetournois/Polygon_mesh_processing-local_remeshing-GF
Polygon mesh processing - add isotropic remeshing
2015-11-17 13:25:45 +01:00
Sébastien Loriot eef03023fe is_border cannot be used in a file included by CGAL/boost/graph/helpers.h 2015-11-16 17:12:41 +01:00
Sébastien Loriot c6469e6c97 add missing include directives 2015-11-16 17:12:27 +01:00
Andreas Fabri 66e0abc87e fixes: add missing typename; use graph_traits; read from a file 2015-11-16 10:05:58 +01:00
Andreas Fabri bf6cfaa8d9 include header which pragma pushes a warning 2015-11-14 09:44:04 +01:00
Andreas Fabri 6706cc58c4 include header which pragma pushes a warning 2015-11-13 09:47:25 +01:00
Andreas Fabri f805b65f7d suppress warning in boost as this has to be solved upstream 2015-11-12 09:41:24 +01:00
Jane Tournois e2c6f6961b Merge branch 'BGL-SurfaceMesh2SurfaceMesh-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-09 12:38:58 +01:00
Jane Tournois d1c2573822 fix unused typedef warning 2015-11-09 12:36:37 +01:00
Sébastien Loriot 03db4f7256 add missing license headers 2015-11-05 20:13:07 +01:00
Sébastien Loriot 0072b649e2 Merge branch 'old/Polygon_mesh_processing-local_remeshing-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-05 20:11:10 +01:00
Sébastien Loriot c6e649aa9b Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF
and adapt plugin to CGAL::Three
2015-11-05 20:07:15 +01:00
Sébastien Loriot 54ca52b538 Merge branch 'BGL-SurfaceMesh2SurfaceMesh-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-05 19:25:00 +01:00
Andreas Fabri d2ed79d38d Add keep_large_connected_components (code,doc,test) 2015-10-22 09:01:08 +02:00
Andreas Fabri 9fa669b81c fix make_quad() 2015-10-14 10:41:47 +02:00
Andreas Fabri a2f3175044 bug fix. set_next was not called for the opposite edges 2015-10-14 10:41:46 +02:00
Jane Tournois fe09c5483e do not use the brackets [] API of std::map, but an API compatible with boost::bimap 2015-09-22 15:07:49 +02:00
Jane Tournois 1bbd90f25b remove redundancy to avoid conflicts when both files are included 2015-09-22 14:55:13 +02:00
Jane Tournois 2a47fd5c0b Merge remote-tracking branch 'remotes/cgal-dev/BGL-OpenTriMesh-GF' into BGL-SurfaceMesh2SurfaceMesh-GF 2015-09-22 12:21:31 +02:00
Andreas Fabri bb208ab2d6 Fix halfedge(v, PolyMesh) + fixes for conversion from OpenMesh to Polyhedron 2015-09-21 16:41:24 +02:00