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
Sébastien Loriot
e2567c5c82
move doc header at its right place
2015-10-23 09:49:13 +02: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
6eeebfe8d0
test make-triangle()
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
Andreas Fabri
1eb87f5a9d
#ifdef to switch between TriMesh and PolyMesh
2015-09-21 16:05:46 +02:00
Andreas Fabri
881a9aefcc
Check that the incident halfedge is not the null_halfedge
...
It is astonishing that add_face works for the PolyMesh
but not for the TriMesh. The function is_isolated(V)
does not the right thing for a TriMesh
2015-09-21 15:49:34 +02:00
Andreas Fabri
cff5745e3d
Duplicate the graph traits from PolyMesh to TriMesh
2015-09-21 14:53:42 +02:00
Andreas Fabri
66b3d24af3
Add converter between models of FaceGraph
2015-09-21 12:00:11 +02:00
Andreas Fabri
72c7781b56
Comment add_edge(V,V, OM) as it conflicts with Euler::add_edge(V,V,MFG)
2015-09-21 11:59:07 +02:00
Andreas Fabri
43058e81c0
set_halfedge(..) was called twice
2015-09-17 10:08:23 +02:00
Sébastien Loriot
6d215672aa
fix doc issues
...
* add missing iterator doc (function documented but not the iterator type)
* add missing entries in the classified reference manual
* hide deprecated function from doxygen
2015-09-10 07:38:56 +02:00
Laurent Rineau
7ddefbdcc8
Merge pull request #297 from afabri/CGAL-assert-GF
...
assert() should not be used in CGAL headers!
2015-09-07 10:58:20 +02:00
Jane Tournois
ce54198aa7
Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF
2015-09-02 15:57:23 +02:00
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
bda64df544
Remove unnecessary includes
2015-07-30 14:16:59 +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
Laurent Rineau
aa72eaa371
Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF
...
Qt5 support, GSoC 2014
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support
In this commit, I have fixed the permissions of the file:
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points
In this commit, I have also modified:
Installation/changes.html
2015-07-17 14:13:37 +02:00
Sébastien Loriot
5ac79c737f
use two variable names to avoid warnings and possible issues
2015-07-17 09:40:22 +02:00