Commit Graph

57188 Commits

Author SHA1 Message Date
Laurent Rineau 4f5619e349 Add a README.md at the root of the SCM repository
- A file INSTALL.md is also added,
- Installation/INSTALL is added the .md extension,
2015-01-07 11:40:24 +01:00
Jane Tournois 0ee08ef100 Merge branch 'Mesh_3-fix_compilation_with_tbb43-GF' into releases/CGAL-4.5-branch
fix the compilation of Mesh_3 for TBB 4.3

Approved by the release manager
2014-12-19 11:19:32 +01:00
Jane Tournois 90a74c1bb6 fix a bug that happens on vc10, because atomics are not initialized 2014-12-16 16:42:22 +01:00
Jane Tournois 88142b2997 fix compilation for TBB 4.3
this partial specialization was only used for testing, so it can be removed
The problem comes from the std::vector of mutex(s), which can't be copied
using the std::vector operator=
2014-12-16 13:02:39 +01:00
Sébastien Loriot 5dbfeec3ae Merge branch 'BSO_2-fix_kernel_conflict-local' into releases/CGAL-4.5-branch
Tested in CGAL-4.5.1-Ic-171
2014-12-12 15:29:51 +01:00
Sébastien Loriot 5b9be0f8c7 workaround ambiguous call in kernel intersection functions when including BSO_2 2014-12-11 16:33:29 +01:00
Laurent Rineau fc407cfebf Merge branch 'Mesh_3-fix_with_time_stamps-GF' into releases/CGAL-4.5-branch
Bug-fix in Mesh_3 with time stamps.

Tested in CGAL-4.5.1-Ic-168.
Approved by the Release Manager.
2014-12-01 17:38:48 +01:00
Laurent Rineau bd2c6f890f Merge branch BGL-make_property_map_lightweight-For_4.5_bugfix-GF' into releases/CGAL-4.5-branch
Bug fix: a property map was not lightweight.

Tested in CGAL-4.5.1-Ic-167.
Approved by the Release Manager.
2014-11-28 12:04:55 +01:00
Laurent Rineau ad53e42fb3 Merge remote-tracking branch 'remotes/origin/BGL-fix_example-GF' into releases/CGAL-4.5-branch
Fix the example examples/BGL_triangulation_2/emst.cpp:
the filtered (finite) triangulation was not used.

Tested in CGAL-4.5.1-Ic-167.
Approved by the Release Manager.
2014-11-28 12:03:30 +01:00
Laurent Rineau 044660eb48 Merge branch 'CGAL-fix_sse2_mingw-lrineau' into releases/CGAL-4.5-branch
Fix the SSE macros when MinGW is used.

Tested in CGAL-4.5.1-Ic-167.
Approved by the Release Manager.
2014-11-28 12:01:50 +01:00
Laurent Rineau 0c6153ce8c cleanup
I forgot to remove extra expensive assertions that I have used using the
debugging!

I clean up also a few spaces at end of lines.
2014-11-27 11:29:52 +01:00
Laurent Rineau 4464116c0d Test _WIN32 instead of _MSC_VER
With MinGW, __declspec is also implemented.

Reported in the CGAL-discuss mailing list:

  Date: Wed, 26 Nov 2014 14:59:46 +0000
  From: xantares 09 <xantares09@hotmail.com>
  To: "cgal-discuss@inria.fr" <cgal-discuss@inria.fr>
  Subject: [cgal-discuss] MinGW issues
2014-11-26 16:26:54 +01:00
Laurent Rineau 4bdafe6908 Bug-fix in Mesh_3 with time stamps
That is a follow-up to that commit:
  | commit eefe2012c0
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Thu Oct 2 16:59:19 2014 +0200
  |
  |     Bug-fix in Mesh_3 with time stamps
  |
  |     The implementation of the class template Protect_edges_sizing_field was
  |     not correct when time stamps are used for Vertex_handle. The issue is
  |     that the time stamp of a vertex change when one do:
  |       tr.remove(v);
  |       v = tr.insert(point);
  |     The vertex pointed by 'v' is re-used by the TDS, but the time stamp of
  |     the vertex does change.
  |
The fix was not complete.
2014-11-26 15:56:37 +01:00
Andreas Fabri b281d86414 We must run kruskal on the filtered graph to ignore the infinite vertex 2014-11-24 16:55:59 +01:00
Andreas Fabri c904f77e13 Use a shared_ptr in order to make the property map lightweight 2014-11-21 12:50:35 +01:00
Laurent Rineau a096cdf431 releases/CGAL-4.5-branch targets CGAL-4.5.1 2014-10-31 17:27:28 +01:00
Laurent Rineau f526ebd5cd Merge branch Mesh_3-fix_plugin_interface-cjamin' into releases/CGAL-4.5-branch
The changes the interface ID declared by
demo/Mesh_3/include/CGAL_demo/Plugin_interface.h, so that the ID of
plugin interface for the Polyedron demo and the Mesh_3 are
different. That will allow to have plugins for both demos in the same
directory.
2014-10-31 16:40:04 +01:00
Laurent Rineau d85eaa327c Merge remote-tracking branch 'origin/Mesh_3-fix_exuder_holes_on_surface-GF' into releases/CGAL-4.5-branch
Bug-fix for Mesh_3:
  Fix a bug in the sliver exudation preservation of boundaries.

Approved by the Release Manager.
2014-10-31 11:32:09 +01:00
Clement Jamin ae0a88708b Fix: a plugin may implement two interfaces 2014-10-29 15:34:01 +01:00
Clement Jamin 72513db3b0 Better console output 2014-10-29 15:14:08 +01:00
Clement Jamin 9979427337 Fix ID and #define 2014-10-29 15:13:31 +01:00
Clement Jamin faf129c1dc Fix interface name 2014-10-29 10:21:29 +01:00
Jane Tournois df0ec2e54d mention exuder bug fix in changes.html 2014-10-21 11:29:07 +02:00
Laurent Rineau 47708fd7e5 Fix a warning 2014-10-17 16:34:08 +02:00
Jane Tournois 2ff8f82bf2 improve the sorting function 2014-10-17 16:34:08 +02:00
Jane Tournois d9cb114484 get_umbrella fixed. It was responsible for holes on the output mesh surface
it collects edges incident to the internal facets of the conflict zone,
that are restricted to the surface.
For each such edge :
- if it appears once, we keep it
- if it appears twice, we don't consider it
- if it appears more than twice, we are in a non-manifold configuration,
and the move (pump) is canceled
2014-10-17 16:34:08 +02:00
Laurent Rineau 70b5a14c9a Fix the picking
There was two problems:
  - the handling of glPushName()/glPopName was not consistent,
  - the splatting MUST be deactivated during a picking.
2014-10-16 15:48:06 +02:00
Laurent Rineau 00a35cf3f5 Reformat to avoid wrapping 2014-10-10 16:41:17 +02:00
Laurent Rineau 54b9e83649 Announcement for 4.5 2014-10-10 16:36:07 +02:00
Laurent Rineau 86ae58ef9f Merge branch 'Mesh_3-fix_surface_holes_4.5-jtournoi' into releases/CGAL-4.5-branch 2014-10-09 16:33:34 +02:00
Sébastien Loriot 58ca6c24ea Merge branch 'Projection_traits-fix_angle_2-sloriot' into releases/CGAL-4.5-branch 2014-10-09 16:28:44 +02:00
Sébastien Loriot 6c4cd29fb1 bug fix in projection traits, Angle_3 != Angle_2 when z is taken into account 2014-10-09 10:27:39 +02:00
Clement Jamin 201ab5f9be We need to copy facet's surface center too
(cherry picked from commit 32f7f5fd610481512ee626df4fd08249a31a8938)
2014-10-08 10:51:55 +02:00
Laurent Rineau f5d89b443e Update CHANGES 2014-10-06 16:46:28 +02:00
Sébastien Loriot f2eb5bd75d Merge branch 'Fix_mesh_3_missing_example_in_doc-APelle' into releases/CGAL-4.5-branch
Tested in CGAL-4.5-Ic-147

  Approved by the release manager
2014-10-06 14:07:26 +02:00
Laurent Rineau 90f02e7c73 Merge branch 'Mesh_3-fix_with_time_stamps-GF' into releases/CGAL-4.5-branch
Fix a bug in Mesh_3, when timestamps are used to compare Vertex_handle
and Cell_handle. The bug was in the class
Protect_edges_sizing_field. Once a vertex is removed from a
triangulation, the timestamp of the Vertex can change. That means that
it invalidates any future use of the original Vertex_handle.

Bug-fix for CGAL-4.5, approved by the Release Manager.
2014-10-06 12:41:31 +02:00
Jane Tournois 602c33c897 Merge branch 'Mesh_3-fix_surface_holes_4.5-jtournoi' into releases/CGAL-4.5-branch
fix the use of "revert_move" that was producing holes on the mesh surface

infinite cells don't need to be backuped, but the data of facets that belong to
the convex hull should be restored (from inside the mesh)
2014-10-06 12:23:23 +02:00
Jane Tournois 2b7c05a1cc Merge branch 'Triangulation_3-fix_delaunay_cell_base-jtournoi' into releases/CGAL-4.5-branch
- fix Delaunay_triangulation_cell_base_3, which was not compiling
- add testing for this class
2014-10-06 12:17:59 +02:00
Sébastien Loriot 926d0fefc8 Merge branch 'BGL-fix_internal_struct_names-sloriot' into releases/CGAL-4.5-branch
Tested in CGAL-4.5-Ic-146

  Approved by the release manager
2014-10-03 17:20:49 +02:00
Jane Tournois 545fe18310 add missing typedef for compilation on Linux 2014-10-03 17:11:08 +02:00
Laurent Rineau 798db08a11 Make sure the functor is Assignable
A boost::function_output_iterator requires that its template argument is
Assignable. See:
http://www.boost.org/doc/libs/1_56_0/libs/iterator/doc/function_output_iterator.html#function-output-iterator-requirements
If one stores a non-const reference, then the class is not
Assignable. Store a pointer instead.
2014-10-03 16:26:43 +02:00
Laurent Rineau 99462e7faa Fix missing header 2014-10-03 16:26:33 +02:00
Laurent Rineau eefe2012c0 Bug-fix in Mesh_3 with time stamps
The implementation of the class template Protect_edges_sizing_field was
not correct when time stamps are used for Vertex_handle. The issue is
that the time stamp of a vertex change when one do:
  tr.remove(v);
  v = tr.insert(point);
The vertex pointed by 'v' is re-used by the TDS, but the time stamp of
the vertex does change.
2014-10-02 17:04:51 +02:00
Jane Tournois a68adcffb2 add code to test Delaunay_cell_base_3 2014-10-02 11:30:30 +02:00
Jane Tournois 9e921b1d48 add typedef requested as documented 2014-10-02 11:28:43 +02:00
Jane Tournois d874698109 fix implementation of Delaunay_triangulation_cell_base_3 2014-10-02 10:49:16 +02:00
Jane Tournois 354959972c bug fix in restoration of Cell data after revert_move
we still don't backup infinite cells because the infinite vertex does not have
a proper vertex ID (i.e. meshing_info())
However the facet data should be restored in Delaunay-restricted facets that
belong to an infinite cell (i.e. mirror facets of restricted facets that
belong to the convex hull)
2014-09-30 16:51:34 +02:00
Sébastien Loriot 866ea60192 typos 2014-09-30 11:14:50 +02:00
Sébastien Loriot 81d63b133e typos 2014-09-30 11:14:50 +02:00
Sébastien Loriot f87046546e remove duplicated class with name clashing with a macro in X11/X.h 2014-09-30 11:11:19 +02:00