Commit Graph

323 Commits

Author SHA1 Message Date
Andreas Fabri 1e2ff1131e assert -> CGAL_assertion 2015-08-27 16:51:55 +02:00
Laurent Rineau 0fd6f2fa59 Merge pull request #288 from afabri/CGAL-add_hash-GF
No longer forward declare struct std:hash

Fixes issues #287 and #274.
2015-08-27 15:41:50 +02:00
Andreas Fabri 5030ed42b8 deal with graph_traits_HalfedgeDS.h and graph_traits_Triangulation_2.h 2015-08-25 09:34:17 +02:00
Jane Tournois 86896278e5 Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 2015-08-07 13:02:35 +02:00
Laurent Rineau 70c08ae2bf Merge pull request #217 from bo0ts/Surface_mesh-drop_fusion-pmoeller
Drop Boost.Fusion from Surface_mesh
2015-07-31 14:27:30 +02:00
Philipp Möller 0b5e682985 Clean up some includes 2015-07-30 14:16:26 +02:00
Laurent Rineau 8be7c27063 Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF
...aka refresh the branch from 'master'.

Conflicts:
	AABB_tree/demo/AABB_tree/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp
2015-07-28 15:30:17 +02:00
Jane Tournois bb3d38c9e7 Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 2015-07-23 17:50:34 +02:00
Sébastien Loriot a220686d02 satisfies_link_condition->does_satisfy_link_condition to match naming convention 2015-07-21 10:27:27 +02:00
Laurent Rineau 08666dce25 Merge pull request #179 from afabri/CGAL-add_hash-GF
Add boost::hash and std::hash

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash

Conflicts:
	Installation/changes.html
2015-07-17 15:39:18 +02:00
Sébastien Loriot 5d2c892dbe Merge pull request #149 'lrineau/Polygon_mesh_processing-GF'
Add various functions to manipulate polygon meshes
2015-07-17 14:50:56 +02:00
Sébastien Loriot 5ac79c737f use two variable names to avoid warnings and possible issues 2015-07-17 09:40:22 +02:00
Sébastien Loriot c89fa4bd53 simplify bgl named parameters handling with boost < 1.51 and make PMP compatible 2015-07-16 16:01:21 +02:00
Jane Tournois 817d28515c duplicate every function in the overload for tuple<visitor, graph> 2015-07-15 16:02:30 +02:00
Laurent Rineau 7a7c4fa447 <boost/core/ref.hpp> appeared in Boost-1.56
The compatibility path is <boost/ref.hpp>.
2015-07-15 16:02:30 +02:00
Laurent Rineau 6303dbeb7d Fix a syntax error not detected my MSVC 2015-07-15 16:02:30 +02:00
Jane Tournois 4b7a997df0 add the ability to use a Visitor for a BGL graph using an overload of graph_traits
TODO : is_valid(mesh) does not compile on msvc. To be fixed
2015-07-15 16:02:30 +02:00
Jane Tournois 4ba9dbd71b fix constness 2015-07-15 16:02:30 +02:00
Jane Tournois d34d47a6d5 Revert "detect sharp edges and surface patches"
This reverts commit 80b1363f1db4db8391398188bcb33427ffc69aac.
2015-07-15 16:02:23 +02:00
Jane Tournois 83957ed495 add code to the selection tool to be able to select a surface patch
for now it works only for facets and the checkbox is not used
2015-07-15 16:02:23 +02:00
Laurent Rineau 2a9b9330c3 Revert "Merge pull request #143 from bo0ts/Surface_mesh-gcc44_fixes-pmoeller"
This reverts commit 8cffc8be58, reversing
changes made to c1a0afd97a.

Philipp (@bo0ts) will open a new pull-request so solve the issue.
2015-07-14 18:29:43 +02:00
Sébastien Loriot c616df7196 Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Installation/changes.html
2015-07-13 08:16:59 +02:00
Laurent Rineau fa13f4ed0c Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF 2015-07-10 17:28:07 +02:00
Sébastien Loriot e7563d3e05 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao'
Conflicts:
	Installation/changes.html
2015-07-09 17:30:24 +02:00
Sébastien Loriot e4277165c6 make an assertion tagged as expensive 2015-07-08 11:44:10 +02:00
Andreas Fabri 2dea6db3bb Merge branch 'CGAL-add_hash-GF-old' into CGAL-add_hash-GF
Conflicts:
	Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
2015-07-06 10:51:23 +02:00
Sébastien Loriot a306384cc8 add missing include 2015-07-03 11:13:18 +02:00
Andreas Fabri 20c1b1a1f6 Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF
Conflicts:
	BGL/include/CGAL/boost/graph/Euler_operations.h
	BGL/include/CGAL/boost/graph/iterator.h
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Selection_widget.ui
2015-07-01 13:52:44 +02:00
Philipp Möller 224d63be58 On GCC 4.4 with C++0x enabled, ADL + next is unreliable
This is a combination of two bugs: the call to next should pick up
CGAL::next to begin with and even if it didn't iterator_traits should
arguably be SFINAE friendly. See
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=40497

We fix this by fully qualifying the call on the affected compiler. To
make this work we have to partially break the dependency between
CGAL/boost/graph/iterator.h and CGAL/boost/graph/graph_traits_Surface_mesh.h
2015-06-29 13:13:10 +02:00
Philipp Möller 0cda240dd1 Clean up some includes 2015-06-29 13:13:09 +02:00
Jane Tournois bab9c51189 fix documentation 2015-06-25 11:49:35 +02:00
Sébastien Loriot f6a2479472 fix compilation issues with g++ 2015-06-22 11:23:31 +02:00
Laurent Rineau 00eb751dc1 Nasty compilation-error
SFINAE does not work in that case, and the substitution error is a hard
error.
2015-06-11 16:17:15 +02:00
Laurent Rineau c61663b6ca Merge branch 'releases/CGAL-4.6-branch' 2015-06-05 16:45:53 +02:00
Andreas Fabri dadb129147 g++ needs a forward declaration for std::hash 2015-06-02 08:46:20 +02:00
Andreas Fabri 56c16d581c use CGAL naming conventions 2015-06-01 12:35:52 +02:00
Andreas Fabri b6850d35c0 #include <functional> and suppress struct/class warning for VC10 2015-06-01 10:42:52 +02:00
Andreas Fabri c30a000ce3 bug fix. The iterator did not dereference to opposite faces 2015-05-29 09:16:32 +02:00
Laurent Rineau 5b374cbeb1 Merge pull request #77 from afabri/BGL-helpers-GF
Document and complete BGL helper functions
2015-05-26 12:27:15 +02:00
Jane Tournois 68b5acb9b3 Merge branch 'Polygon_mesh_processing_OpenMesh-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing_OpenMesh-GF 2015-05-15 12:03:13 +02:00
Jane Tournois f5c9d9fce5 fix is_valid_polygon_mesh 2015-05-15 12:02:02 +02:00
Andreas Fabri 57e2c27b73 use generic is_valid test 2015-05-15 11:22:33 +02:00
Andreas Fabri 09ea32096d Add generic is_valid_polygon_mesh() to BGL Helpers 2015-05-15 10:52:31 +02:00
Andreas Fabri 1249f74c83 halfedge(v,om) returns opposite of the stored halfedge 2015-05-15 10:51:46 +02:00
Andreas Fabri 4438c8651c Add operator< for two OpenMesh edges 2015-05-12 19:33:57 +02:00
Andreas Fabri f88ff84d36 move the property map class to a CGAL header file 2015-05-11 14:57:14 +02:00
Andreas Fabri 20cd22c369 Add operator[] to the point property map 2015-05-11 12:22:19 +02:00
Andreas Fabri e9766c0ffd slight change of Index_iterator::increment 2015-04-21 13:24:10 +02:00
Andreas Fabri 62700ded92 a bench for a vector 2015-04-21 12:26:50 +02:00
Andreas Fabri ac76093c68 use a forward declaration for Euler operation 2015-04-20 10:57:01 +02:00
Andreas Fabri d539246011 add typename; remove unused typedefs 2015-04-20 10:48:12 +02:00
Sébastien Loriot d36593eb72 add missing const and remove debug output 2015-04-17 17:22:26 +02:00
Andreas Fabri 832208d815 simplifications 2015-04-17 15:49:21 +02:00
Andreas Fabri 0eaa9235d0 Add specializations of hash 2015-04-17 10:44:43 +02:00
Andreas Fabri 7f0bdd272d move halfedge_descriptor out of the graph_traits class 2015-04-17 10:33:22 +02:00
Andreas Fabri 205a594a77 add specializations of hash and add tests 2015-04-17 10:21:14 +02:00
Andreas Fabri 2f73c7e985 add typename 2015-04-17 08:24:19 +02:00
Andreas Fabri a5a982ce61 fixes and cleanup 2015-04-16 11:24:38 +02:00
Andreas Fabri 8eb4ec93c4 fixes and cleanup 2015-04-16 11:21:19 +02:00
Andreas Fabri 6e7debb874 test helpers 2015-04-15 16:36:23 +02:00
Andreas Fabri 6fdb64eb7a fix typos 2015-04-15 11:55:12 +02:00
Jane Tournois 9e3f91a5d4 update documentation according to pre-approved small feature 2015-04-10 11:08:34 +02:00
Jane Tournois f04079a815 documentation of add_face(vertex range, graph) 2015-04-09 17:02:43 +02:00
Andreas Fabri e1c1b58415 Add a test for the make_hexahedron 2015-03-18 15:48:19 +01:00
Andreas Fabri c5810ee2ff integrate fill_hole() 2015-03-18 10:54:23 +01:00
Andreas Fabri 9f62b06bce Add make_..() 2015-03-18 10:53:34 +01:00
Sébastien Loriot 0e3d4586d4 fix doc warnings 2015-03-18 09:28:50 +01:00
Andreas Fabri 020d2ff054 Add documentation of helper functions 2015-03-17 18:41:14 +01:00
Sébastien Loriot 5c1512d63f handle when boundary of the selection is on the border 2015-03-17 16:53:50 +01:00
Sébastien Loriot ef2cef3eb4 use a wrapper to make sure the return type of get is instantiable
the pb encountered comes from get called on a variant
2015-03-17 16:20:37 +01:00
Sébastien Loriot 2c73064343 use nested type 2015-03-17 16:20:37 +01:00
Sébastien Loriot 9cf0a3fd37 add missing license header 2015-03-17 16:20:37 +01:00
Jane Tournois 803c16d3e0 null_halfedge is not a type 2015-03-12 14:19:11 +01:00
Sébastien Loriot eec0d93a2f move function before it is used 2015-03-12 14:04:35 +01:00
Laurent Rineau 2a58fbda4a Merge remote-tracking branch 'origin/Surface_mesh-isolated_vertex-GF'
Bug-fix for the BGL API:

  - Remove assertion in halfedge(Polyehdron_3, vertex_descriptor) as it
    is wrong for an isolated vertex.
  - fix a warning.

Fix the documentation:

  - Document that add_vertex/edge/face(G&) do not initialize the
    connectivity

Approved by the Release Manager.
Tested in CGAL-4.6-Ic-132.
2015-02-19 17:42:23 +01:00
Laurent Rineau 518368e470 Merge remote-tracking branch 'origin/BGL-use_iterator_adaptor-GF'
Bug-fix branch for the BGL API.

Approved by the Release Manager.
Tested in CGAL-4.6-Ic-132.
2015-02-19 17:40:32 +01:00
Sébastien Loriot bb6233c3b6 remove trash 2015-02-18 15:43:02 +01:00
Sébastien Loriot 5f23fad1a9 add missing documentation 2015-02-18 15:42:16 +01:00
Sébastien Loriot 317aae4b32 remove unused variable 2015-02-18 09:50:40 +01:00
Andreas Fabri fef3ec4692 use BGL named parameters 2015-02-17 20:14:59 +01:00
Jane Tournois 08e14b7af5 Merge branch 'Polygon_mesh_processing-GF' of ssh://scm.cgal.org/var/git/cgal into Polygon_mesh_processing-GF
Conflicts:
	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/is_oriented.h
2015-02-17 12:31:07 +01:00
Jane Tournois 5ef0fd2296 remove assertion
in case v->halfedge() is null_halfedge(), the vertex() operator
crashes
2015-02-17 12:19:58 +01:00
Jane Tournois 0e02e0ed39 fix set_halfedge(face, he, g)
we should use a decorator to use this function
2015-02-17 12:18:03 +01:00
Jane Tournois 24a7f9056b add add_face(begin, end, g) 2015-02-17 12:13:49 +01:00
Jane Tournois 10b6af8461 remove add_edge(s, t), it is now in Euler_operations 2015-02-17 12:13:00 +01:00
Jane Tournois 7a89b6a2ee uncomment add_vertex, and remove add_edge, which is now in Euler_operations 2015-02-17 12:07:13 +01:00
Jane Tournois 2658576fb2 add subfunctions for previous commit 2015-02-17 11:59:59 +01:00
Jane Tournois 5cfbcb0a06 add two Euler operations :
* add_face(vertex range, g)
* add_edge(source, target, g)
2015-02-17 11:56:50 +01:00
Andreas Fabri fb5280b2aa Remove assertion in halfedge(Polyehdron_3, vertex_descriptor)
as it is wrong for an isolated vertex.
Document that add_vertex/edge/face(G&) do not initialize the connectivity
2015-02-17 11:43:23 +01:00
Sébastien Loriot 8a6f9223a1 add missing include 2015-02-16 15:41:53 +01:00
Sébastien Loriot 24c47ae95d add missing typenames 2015-02-16 14:55:14 +01:00
Andreas Fabri e155ff9a75 first version of keep_largest_connected_component 2015-02-16 12:49:40 +01:00
Sébastien Loriot ad744ee6bb fix typename position 2015-02-16 11:57:49 +01:00
Sébastien Loriot 837be0b84f fix of 10c08719 2015-02-16 11:54:32 +01:00
Sébastien Loriot 13296e6887 Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 2015-02-16 11:48:29 +01:00
Sébastien Loriot e2d0d44f3c add missing typename's 2015-02-16 11:26:28 +01:00
Sébastien Loriot 68d15e165a Merge branch 'local/Polyhedron_demo-better_selection_offset'
Improve the facet selection process in the demo plugin
  by using the vertex incidence instead of the edge incidence.
  First step toward simpler the code

  Tested in CGAL-4.6-Ic-126
  Approved by the release manager
2015-02-16 10:23:31 +01:00
Andreas Fabri 92e3482da4 Add high level function connected_component which uses boost::connected_component 2015-02-13 16:58:02 +01:00
Sébastien Loriot 9ea03ca315 prevent internal namespaces to be documented
trivial bugfix for master
2015-02-13 16:03:23 +01:00
Andreas Fabri 0d67ba64df improve example for connected_components of a graph and its dual 2015-02-12 15:34:05 +01:00