Commit Graph

59256 Commits

Author SHA1 Message Date
Sébastien Loriot a6ea5c0b22 update orient_polygon_soup testsuite 2015-01-30 18:02:36 +01:00
Sébastien Loriot 1a79edd840 fix compilation issues (nothing to do with the merge) 2015-01-30 17:57:04 +01:00
Sébastien Loriot dab5e16524 accomodate changes of the merge 2015-01-30 17:56:27 +01:00
Sébastien Loriot 137805d091 Merge branch 'old/Polygon_mesh_processing-GF'
Conflicts:
	Operations_on_polyhedra/include/CGAL/orient_polyhedron_3.h
	Polygon_mesh_processing/include/CGAL/orient_polygon_soup.h
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
2015-01-30 17:55:22 +01:00
Sébastien Loriot e56a845b96 Merge branch 'local/Polyhedron_demo-export_STL_builder'
Brings enhancement to the polyhedron demo:
   * better handling of triangle soups -> always orientable as polyhedron
   * better handling of triangulated stl files in the loader

  Tested in CGAL-4.6-Ic-117
  Approved by the release manager
2015-01-30 16:09:00 +01:00
Laurent Rineau 434766c22b Merge branch 'releases/CGAL-4.5-branch'
Approved by the Release Manager.
2015-01-30 11:30:49 +01:00
Laurent Rineau 835dadcfdd updated crontab (automated commit) 2015-01-30 11:18:02 +01:00
Andreas Fabri 062ce726be it is operator -- and not - 2015-01-29 14:49:12 +01:00
Andreas Fabri f048bd9c50 fix figure with ref; add () to a function 2015-01-29 14:40:45 +01:00
Andreas Fabri d40c7919b6 remove Triangulation_hierarchy_3 from the classified reference pages 2015-01-29 14:10:33 +01:00
Sébastien Loriot 24fcc4a2fe update orient_polygon_soup to always produce a polyhedron
with self-intersection at singular vertices/edges
2015-01-29 14:02:56 +01:00
Sébastien Loriot b4bd141980 move OFF reading function to a header file 2015-01-29 14:02:47 +01:00
Sébastien Loriot 7c09fdb490 add missing include 2015-01-29 14:02:35 +01:00
Andreas Fabri d5580a4b27 \cgalFigureCaptionEnd has no parameters 2015-01-29 09:20:23 +01:00
Laurent Rineau 351e73373f Merge branch 'CGAL-fix_MSVC_warnings_with_TBB-lrineau' into releases/CGAL-4.5-branch
Tested in CGAL-4.5.2-Ic-178.
Approved by the Release Manager.
2015-01-28 18:12:53 +01:00
Laurent Rineau 626ec7a144 Disable the normal estimation plugin with Boost-1.57 and C++11
(cherry picked from commit bd43545717)
2015-01-28 18:07:21 +01:00
Laurent Rineau f2453dab32 Merge branch 'Polyhedron-demo_disable_normal_estimation_boost_1_57-lrineau'
Tested in CGAL-4.6-Ic-115.
Approved by the Release Manager.
2015-01-28 18:06:33 +01:00
Laurent Rineau 62069ccfc2 Fix the image
There was superfluous "arrows" in the cell.
2015-01-28 17:40:30 +01:00
Andreas Fabri 2ae1d649c2 capitlize words in \subsection 2015-01-28 16:53:05 +01:00
Laurent Rineau e7d4526c6d New figure, for vertex_triple_index 2015-01-28 16:41:12 +01:00
Laurent Rineau a00429cba1 Add the src files of figures of TDS_3 2015-01-28 16:11:15 +01:00
Laurent Rineau 9818e2bdbe Add the src files of figures of TDS_2 2015-01-28 13:19:12 +01:00
Remy Thomasse 33e5f52486 fix iterator bug in convex_hull_in_disc_2.h
trivial fix for master
2015-01-27 16:03:01 +01:00
Sébastien Loriot 4ccb186e08 handle non triangulated polyhedron 2015-01-27 14:35:08 +01:00
Sébastien Loriot 7ab1037f6b handle case when the x coordinate of the normal vector at the minimal vertex is 0 2015-01-27 14:13:17 +01:00
Sébastien Loriot 4cf96051c5 stl plugin can now also load polygon soups 2015-01-27 11:38:59 +01:00
Sébastien Loriot 613915c07f add the possibility to load a polygon soup from vector of points and indices
I needed to move the Polygon_soup class inside the header as the function
  added is a template function and the definition must be available in the
  header
2015-01-27 11:38:45 +01:00
Sébastien Loriot d6a8fcaf4f the orientation plugin is only applicable on polygon soup items 2015-01-27 10:39:41 +01:00
Sébastien Loriot 20ffc3da30 remove assertion that should be a warning 2015-01-27 10:07:32 +01:00
Laurent Rineau 90543eefab Support MINGW64 in sse2.h
Trivial fix for master
2015-01-26 17:35:05 +01:00
Sébastien Loriot 8637097561 Merge remote-tracking branch 'origin/Spatial_searching-fixes_for_4.6-GF'
Tested in CGAL-4.6-Ic-113
  Approved by the RM
2015-01-26 17:05:31 +01:00
Andreas Fabri cc4192a628 Merge branch 'Surface_mesh-fixes-GF'
Approved by the release manager

Conflicts:
	STL_Extension/include/CGAL/Iterator_range.h
2015-01-26 16:54:03 +01:00
Andreas Fabri e08c28727c Add #defines to trick moc
(cherry picked from commit 5db9675db8)

Conflicts:
	Installation/include/CGAL/config.h
2015-01-26 16:25:58 +01:00
Andreas Fabri 3d2acacdb9 Add a benchmark for the slicer 2015-01-26 16:12:26 +01:00
Laurent Rineau 0497c8116e Merge branch 'releases/CGAL-4.5-branch'
Conflicts:
	Maintenance/release_building/BUGFIX_NUMBER

This merge is actually a no-op: the changeset is empty. It only merges
the history.

Approved by the Release Manager.
2015-01-26 11:45:02 +01:00
Laurent Rineau ff62595012 Merge branch 'CGAL-fix_compilation_boost_1_56-lrineau'
Fix compilation issues with Boost-1.56 and later.

Approved by the Release Manager.
2015-01-26 11:42:29 +01:00
Laurent Rineau 87c340fc64 Merge remote-tracking branch 'origin/CGAL_moc_BOOST_JOIN-GF'
Fix the compilation of Qt4 demos, when Boost-1.57 is used.

Approved by the Release Manager.
2015-01-26 11:23:57 +01:00
Laurent Rineau bd43545717 Disable the normal estimation plugin with Boost-1.57 and C++11 2015-01-26 11:22:09 +01:00
Sébastien Loriot ba36fe0ac1 reordering 2015-01-26 09:34:25 +01:00
Sébastien Loriot ccbcb8b23f remove typename 2015-01-26 08:59:47 +01:00
Jane Tournois f9b8938596 stitching BGLized
works for Polyhedron_3
todo : check it still works for Surface_mesh
2015-01-23 17:48:46 +01:00
Jane Tournois 594a17eefd progress on BGLization of stitching
until now it only works for Polyhedron_3
2015-01-23 16:39:16 +01:00
Jane Tournois 5f785f7e44 add validity precondition to check valid orientation 2015-01-23 16:37:18 +01:00
Sébastien Loriot 3fce4e0e5a bugfix: we might miss edges
for example if we have exactly 3 triangles oriented such that the edge (i0,i1)
  is in the 3 triangles and i1>i0 then the edge will never be reported
2015-01-23 16:30:57 +01:00
Sébastien Loriot 4242990bf5 change Index type and use CGAL::array 2015-01-23 16:22:21 +01:00
Sébastien Loriot 4708e63fa6 abstract the polygon type 2015-01-23 15:56:02 +01:00
Sébastien Loriot 58b99a51f2 hide the modifier in internal namespace and advertise the function 2015-01-23 15:55:45 +01:00
Jane Tournois 79fa2df1f7 remove useless include 2015-01-23 15:49:22 +01:00
Jane Tournois 7a4428e43d start conversion to BGL API, and improve test 2015-01-23 15:48:53 +01:00
Jane Tournois 58b3e09350 make the use of namespaces consistent with other operators 2015-01-23 15:34:19 +01:00