songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
65,272 Commits 3 Branches 156 Tags 974 MiB
Commit Graph

1770 Commits

Author SHA1 Message Date
Maxime Gimeno 89348a1ab9 cut_plugin fixed 
- replaced the missing modified files by the originals
- added a reference to a vector of floats in traits so that it fills it instead of drawing the bboxes
 2015-04-24 15:59:23 +02:00
Maxime Gimeno ba4ede5f50 Clean-up 
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
 2015-04-24 12:54:05 +02:00
Maxime Gimeno 551ad0a36b SIGSEGV at closure time fixed 
- moved the initializeOpenGLFunction() call from the scene to the viewer
 2015-04-24 11:17:10 +02:00
Maxime Gimeno 711dc354c0 Upgrade of Volume_plane_intersection 
- shader management
 2015-04-24 10:49:56 +02:00
Maxime Gimeno 75c0fd6201 Upgrade of Volume_plane.h 
- Modification of the shader management to be OpenGL 3.3 instead of 1.2
- Qt Wrappers
- Quads made in triangles : transformend the slice value from 64000 to 63999 to be a multiple of 3
- Bordures of the volume planes renderd by a shader
 2015-04-24 09:14:13 +02:00
Andreas Fabri 52382276a8 Escape the word Index with '%' 2015-04-23 12:04:35 +02:00
Maxime Gimeno 4400c15291 Upgrade of Segmented_image_item 
- Shader management usng the existing vbos
- Replacing GLEW by QOpenGLFunctions
- Quads added as 2 triangles
 2015-04-22 14:07:00 +02:00
Maxime Gimeno efce0dcd4a Upgrade of Scene_implicit_function_item 
- shader management
- Qt5 wrappers
- draw colors in a texture
 2015-04-21 16:08:12 +02:00
Maxime Gimeno 8662fa5c6a Upgrade of Mesh3_demo Scene_c3t3_item 
- shader management
- no more draw_edges or draw(int), everything is done in draw
 2015-04-21 12:16:30 +02:00
Maxime Gimeno ba0fb47874 Upgrade of Mesh_3 Polyhedorn_item 
- Added shader management.
 2015-04-20 15:30:59 +02:00
Maxime Gimeno 03858e9109 Upgrade of Mesh_3 Polygon_soup_item 
- Addded an argument viewer to every type of draw in the demo
- added shader management
- removed the glPolygonMode on the scene because it is not usable in OpenGL ES
- draws the lines and the points instead
 2015-04-20 14:16:08 +02:00
Simon 067647eebf Replacing the use of operator!= by !( operator== ) when comparing domain or surface indexes. 
This is link to issue #37.
 2015-04-16 10:12:50 +02:00
Simon bc125c525c This should solve issue #41. 2015-04-14 21:31:18 +02:00
Philipp Möller 49a56c5a79 Fine grained range includes 2015-04-13 17:26:36 +02:00
Philipp Möller 74e71f41e2 Remove uses of Boost.Lambda 
Replace Boost.Lambda with simple loops. The library is not maintained
and no one is going to ever invest in it again. It adds to compile and
preprocessing times without providing safer or shorter code and we can
sacrifice a little bit of readability.
 2015-04-13 17:24:08 +02:00
Philipp Möller 4f8e76b074 Boost.Lambda is not used here anymore 2015-04-13 16:47:00 +02:00
Simon f9e4a9faff Explicitely call the constructor of Surface_patch to prevent compilation failures with g++. 2015-04-12 22:27:44 +02:00
Philipp Möller 370a7da94b Use boost::shared_ptr instead of tr1::shared_ptr 2015-04-10 14:35:20 +02:00
Maxime Gimeno f3e712187f Added the remaining forgotten files to Mesh_3. 2015-04-03 11:47:35 +02:00
Maxime Gimeno 0a177e4380 Mesh_3 fix 
- Added Implicit_functions/CMakeList.txt
 2015-04-03 11:45:19 +02:00
Maxime Gimeno d6abdc0160 Upgrade to Qt5 for Mesh_3 Demo 
- Changed the *.moc in *.cpp when calling the macro polyhedron_demo_plugin plugin_name and removed a call to LIST APPEND of a file that wasn't existing yet. At least I think this is what I did...
 2015-04-02 15:37:45 +02:00
Maxime Gimeno adb3125e1f WORK IN PROGRESS 
Updated the Qt4 code in CMakeList but not quite finished.
 2015-04-02 14:15:16 +02:00
Maxime Gimeno 52dc3b265d Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5 
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.

Conflicts:
	GraphicsView/demo/Polygon/CMakeLists.txt
	GraphicsView/src/CGAL_Qt4/CMakeLists.txt
	GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in
	Installation/cmake/modules/CGAL_Macros.cmake
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
	Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
	Mesh_3/demo/Mesh_3/CMakeLists.txt
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
	Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
 2015-03-30 16:02:51 +02:00
Guillaume Damiand 522c3dfada Update modified cmakelists.txt to initial versions 2015-03-26 12:23:15 +01:00
Guillaume Damiand cca136c131 Wip 2015-03-16 18:06:53 +01:00
Jane Tournois 6de112e4a3 move internal folder to subfolder of Polygon_mesh_processing 2015-03-16 10:04:56 +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 607929b069 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch' 
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
 2015-02-16 11:45:08 +01:00
Jane Tournois 0d1087857a int -> size_t + cherrypick 2015-02-12 17:17:28 +01:00
Jane Tournois f4af27a3da reorder variables for initialization 2015-02-06 10:01:41 +01:00
Sébastien Loriot 39f9813070 add discover_connected_component 2015-02-05 14:04:43 +01:00
Jane Tournois abfc6d92c8 fix a warning caused by boost::dynamic_bitset<> 2015-02-03 11:20:01 +01:00
Jane Tournois 21082320e3 minimize changes to get warnings, but dynamic_bitset triggers a warning 2015-02-03 11:05:29 +01:00
Jane Tournois a923ae477d fix conversion warnings. meshing_info() is an int here 2015-02-03 10:25:43 +01:00
Jane Tournois b03a656246 this becomes useless because we now backup infinite cells 2015-02-02 15:55:28 +01:00
Jane Tournois c57b9b8840 backup infinite cells for revert_move of perturber 
this is necessary because there can be an infinite cells
among the outdated_cells (with a finite facet f)
that does not share any finite facet with the other cells of
the conflict zone/set of outdated cells.

Therefore the surface info of f cannot be

Conflicts:
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
 2015-02-02 15:54:34 +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
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 72e0a3e677 Fix warnings about signed/unsigned 
The code involved is about TBB.
 2015-01-21 12:59:07 +01:00
Sébastien Loriot 85dce701b9 move compute_normal in Polygon Mesh Processing package 2015-01-06 15:32:45 +01:00
Laurent Rineau 602383e15b Merge branch 'Mesh_3-fix_Implicit_mesh_domain_3_default_bound-lrineau' 
Bug fix in Mesh_3

Approved by the Release Manager. Tested in CGAL-4.6-Ic-79.
 2014-12-17 17:09:20 +01:00
Laurent Rineau 9debd6a471 Merge branch 'CGAL-various_fixes-lrineau' 
s/const static/static const/

Tested in CGAL-4.6-Ic-79. Approved by the Release Manager.
 2014-12-17 17:07:57 +01:00
Laurent Rineau 057924e1d4 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch' 
That merges the following:
  | commit 5dbfeec3ae
  | Merge: fc407cf 5b9be0f
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Fri Dec 12 15:29:51 2014 +0100
  |
  |     Merge branch 'BSO_2-fix_kernel_conflict-local' into releases/CGAL-4.5-branch
  |
  |     Tested in CGAL-4.5.1-Ic-171
  |
  | commit fc407cfebf
  | Merge: bd2c6f8 0c6153c
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Mon Dec 1 17:38:48 2014 +0100
  |
  |     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.
  |
  | commit bd2c6f890f
  | Merge: ad53e42 c904f77
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:04:55 2014 +0100
  |
  |     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.
  |
  | commit ad53e42fb3
  | Merge: 044660e b281d86
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:03:30 2014 +0100
  |
  |     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.
  |
  | commit 044660eb48
  | Merge: a096cdf 4464116
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:01:50 2014 +0100
  |
  |     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.

Tested in CGAL-4.6-Ic-79.
 2014-12-17 17:05:01 +01:00
Laurent Rineau 21161cc432 The default error_bound for Implicit_mesh_domain_3 was too small 2014-11-28 12:16:14 +01:00
Jane Tournois 78ccd1440f Merge branch 'Mesh_3-fix_integer_overflow-jtournoi' 
this branch fixes Image_IO for large images, when the
dimensions do not fit in 'unsigned int'
'size_t' is now used everywhere that deals with image sizes
and pixel/voxel coordinates

fix suggested by a CGAL user
 2014-11-27 12:15:40 +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 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
Jane Tournois f59acabc9b avoid using info when casting 2014-11-07 11:19:20 +01:00
Laurent Rineau 2d72cd7f7e Merge branch 'Mesh_3-fix_includes-lrineau' 
Fix missing/surperflous #include

Tested in CGAL-4.6-Ic-50.
Approved by the Release Manager.
 2014-11-06 11:59:26 +01:00
Laurent Rineau 768ec1d687 Merge branch 'Polyhedron_demo-fix_warning-lrineau' 
Fix warnings in the Polyhedron demo. The fixes are in Mesh_3,
Min_sphere_or_spheres_d, and in the Polyhedron demo itself.

Tested in CGAL-4.6-Ic-50.
Approved by the Release Manager.
 2014-11-06 11:58:09 +01:00
Laurent Rineau 7d63f9d072 Merge branch 'releases/CGAL-4.5-branch' 
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
 2014-11-06 10:47:45 +01:00
Laurent Rineau e50820d3fd Fix #include in Mesh_3 
There was missing #include, and surperfuous #include (hard to detect).
 2014-11-05 17:01:28 +01:00
Laurent Rineau 4a8d9077c0 Fix a warning 
Warning from clang:

Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h:1358:25: warning: comparison of unsigned expression >= 0 is always true [-Wtautological-compare]
 2014-11-03 16:52:51 +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
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 b49e7b7f88 fix conversion warnings 2014-10-24 14:50:08 +02:00
Jane Tournois 42abb4db5a fix a warning 2014-10-24 14:24:29 +02:00
Laurent Rineau 908d608072 Merge branch 'releases/CGAL-4.5-branch' 
Conflicts:
	Installation/changes.html
 2014-10-20 14:46:36 +02:00
Jane Tournois 06eb921215 fix the use of integers 
patch suggested by Bryn Lloyd on cgal-discuss to avoid an integer overflow
problem that occurs when generating a 3D mesh from very large images
 2014-10-20 12:39:03 +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 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
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
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
Laurent Rineau 9e586da1e6 Revert two commits. 
Revert "Add longer tests, with other data"
Revert "Verbose testsuite. Should be reverted later."

This reverts commit 0f592d8e0a.
This reverts commit a8e6764c97.
 2014-10-03 17:13:49 +02:00
Laurent Rineau 0f592d8e0a Verbose testsuite. Should be reverted later. 2014-10-03 16:41:06 +02:00
Laurent Rineau a8e6764c97 Add longer tests, with other data 
So far, that shows bugs.
 2014-10-03 16:39:04 +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 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 3616d28c86 typedef instead of using 2014-09-25 14:10:38 +02:00
Sébastien Loriot 024bd2724f add output_facets_in_complex_to_off and update test and demo 2014-09-24 12:05:02 +02:00
Sébastien Loriot 9f3151c9f1 add test for C3T3::output_boundary_to_off 2014-09-24 09:12:21 +02:00
Sébastien Loriot 684104c032 add 2 overloads of output_boundary_of_c3t3_to_off in the C3T3 class 
also update the demo plugin to use one of them
 2014-09-24 08:26:18 +02:00
Sébastien Loriot e4e65dceda import file to write the surface of a subdomain into a file 
use it in the demo, with writting in a .off for now
 2014-09-24 08:26:18 +02:00
Aymeric PELLE 3d37d6abe6 Add two examples for meshing multi domains. Fix some mistakes in the doc. 2014-09-03 16:55:10 +02:00
Aurélien Vialon 68a8ad6607 Big improvement of Qt4or5 and findQt5. 
Now, when a switch is done by the user between Qt4 and Qt5, all the qt executables are refound, searching the proper version of them (Qt4 or Qt5)

A new bug, that wasn't noticed the first time, has been found and corrected into Mesh_3.
 2014-08-18 03:13:47 +02:00
Aurélien Vialon df9e315536 Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake. 2014-08-15 02:57:48 +02:00
Laurent Rineau c42216e48b Fix for CMake 3.0 
Trivial fix for master.
 2014-08-06 17:05:41 +02:00
Aurélien Vialon 6df9530094 All GraphicView demonstrations ported to the new Qt inclusion way. 
Change of Qt4or5 variables names.

Now: QT_VERSION => contains "QtX", with x 4 or 5 depending of the version wanted by the user.
     USE_QT_VERSION => variable to force the version of Qt wanted. If this variable is set, the Qt Choice drop-down menu doesn't appear on CMake-gui.
     QT_VERSION_USED => number of Qt version wanted (4 or 5).
     QT4 => TRUE if Qt4 chosen.
     QT5 => TRUE if Qt5 chosen.
 2014-08-05 18:13:39 +02:00
Aurélien Vialon 9a1461442b Some bug correction for new Qt inclusion way. 
Following demonstrations ported to Qt4or5 way :
- Polyhedron
- Linear Cell Complex
- Mesh_3
- Periodic_3_Triangulation
- Periodic_Llyod_3
- Surface_reconstruction_point_3
 2014-08-04 20:16:44 +02:00
Laurent Rineau 36d8b5bd18 Convert source files encoding to utf-8 
All non-ASCII files should be encoded in UTF-8. So far, the ZSH script
`Scripts/developer_scripts/detect_wrong_encoding` detects wrong encoding
in source/header files of include/, src/, and doc/.
 2014-08-01 11:20:13 +02:00
Aurélien Vialon 6784800dd1 Fusion of CGAL_Qt4 and CGAL_Qt5 into just one CGAL_Qt. 2014-07-31 22:41:44 +02:00
Clement Jamin e4a1efc3e8 Fix "unused variable" warnings 2014-07-24 11:46:08 +02:00
Laurent Rineau 8571477f92 Merge branch 'Mesh_3-fix_a_warning-GF' 
Fix a warning.

Tested in CGAL-4.5-Ic-100.
Approved by the Release Manager.
 2014-07-21 12:00:53 +02:00
Laurent Rineau 8ac225efa5 Trivial fix of a warning 
Trivial bug-fix for master
 2014-07-21 11:52:10 +02:00
Laurent Rineau f83486c5e3 Fix a warning when TBB is not used 
test/Mesh_3/test_meshing_utilities.h:379:44: warning: typedef 'Concurrency_tag' locally defined but not used [-Wunused-local-typedefs]
     typedef typename C3t3::Concurrency_tag Concurrency_tag;
 2014-07-18 17:29:27 +02:00
Laurent Rineau 7c29e97263 Fix a segfault 
There was a bug when a Polyhedral_mesh_domain_with_features_3 was
constructed with the default `Random* = 0`.
 2014-07-18 16:35:43 +02:00
Laurent Rineau 3deb8e7910 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.

There was a conflict with two features recently merged into 'master' for
CGAL-4.5:

- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
  the small feature:
    http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper

- parallelism for Triangulation_3 and Mesh_3:
    http://cgal.org/wiki/Features/Parallel_Mesh_3

Conflicts:
	Combinatorial_map/include/CGAL/Cell_attribute.h
	Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
	Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_type.h
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp

I also modified the following files during the conflict resolution:

	Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
 2014-07-18 15:47:14 +02:00
Aurelien Vialon 548bba0637 Mesh_3_export_plugin Windows modification. 2014-07-17 19:16:18 +02:00
Clement Jamin c8c7ed03a6 Relax the "number of facets/vertices" criteria 2014-07-17 17:46:37 +02:00
Aurelien Vialon c3aaf0bffe Some modification of CGAL Graphic view to a better compatibility of Windows with the Qt5 version of CGAL (especially about dll import and export stuff). 2014-07-17 01:55:07 +02:00
Clement Jamin a7a654e207 Temporarily change Haussdorf distance threshold 2014-07-16 18:02:00 +02:00
Laurent Rineau d0570871e7 Fix a warning 2014-07-16 17:06:11 +02:00
Clement Jamin deb6edcb1f Wrong variable name. 2014-07-16 17:05:22 +02:00
Clement Jamin dad9162352 Missing "using" 2014-07-16 17:04:47 +02:00
Clement Jamin 2dd27c4d13 Fix a (minor) data race on the circumcenter cache 2014-07-16 16:35:31 +02:00
Clement Jamin 6f7587c6dd Fix small differences between master and Mesh_3-parallel 2014-07-16 14:13:40 +02:00
Clement Jamin aa1aa597bb Restore commit a09ed468 with a bug fix 
"Thread-safe version of incident_cells and incident_facets"
 2014-07-15 20:13:30 +02:00
Clement Jamin 32616470c7 Add parallelism to test_meshing_unit_tetrahedron.cpp 2014-07-15 20:04:35 +02:00
Clement Jamin 2d35c204fb Remove VERBOSE macro 2014-07-15 19:28:19 +02:00
Clement Jamin db6db80096 Fix identation 2014-07-15 18:11:31 +02:00
Clement Jamin d299aa2202 Use different checking intervals for the sequential and the parallel version 2014-07-15 16:30:56 +02:00
Laurent Rineau 6147850312 Fix remaining warnings 2014-07-11 11:01:24 +02:00
Laurent Rineau 64fe2b3f8e Remove warnings 2014-07-10 14:46:12 +02:00
Laurent Rineau 19158bac27 Remove warnings about unused parameters 2014-07-10 14:41:42 +02:00
Andreas Fabri b63488b0e9 remove unused parameters 2014-07-09 16:15:54 +02:00
Andreas Fabri 3aefde776a Move a function body in the class definition to avoid an ICE with VC12 2014-07-09 15:30:16 +02:00
Clement Jamin 39b2b6379b Forgot an #ifdef 2014-07-08 20:47:37 +02:00
Clement Jamin 93fc2bfdfc Bug fix (ref to a temporary object) 2014-07-08 20:19:51 +02:00
Clement Jamin 1351dcbb7d Relax test 2014-07-08 19:04:23 +02:00
Clement Jamin 545216b0a6 Clean-up demo config file 2014-07-08 18:11:27 +02:00
Clement Jamin 1946b4fecd Atomics can't be initialized in initializer list 2014-07-08 17:55:55 +02:00
Clement Jamin e5c89d7139 Use atomics for the perturbation timers 
To fix later: the timer are wrong on the parallel version because each threads
counts and adds the CPU time to the total time
 2014-07-08 16:27:25 +02:00
Clement Jamin 01b81c5bcb Fix GCC compilation 2014-07-08 16:17:51 +02:00
Clement Jamin bebed84a3b Forgot to commit the main file 2014-07-08 15:49:48 +02:00
Clement Jamin 078e89f55f Add the possibility to remove the far points 
The far points are added by the parallel version to reduce the contention
on the infinite vertex
 2014-07-08 15:37:59 +02:00
Aurélien Vialon 74b829ae08 Polyhedron demonstration ported. 2014-07-08 11:54:15 +02:00
Clement Jamin 0cb9945e58 The far points are now further + minor fixes 2014-07-07 20:56:48 +02:00
Clement Jamin c2084d96c2 Add header 2014-07-07 20:36:31 +02:00
Clement Jamin b5a5a82930 Use s_iterator_to 2014-07-07 19:07:46 +02:00
Clement Jamin 4c02082a71 Remove unused variables 2014-07-07 16:36:54 +02:00
Aurélien Vialon b460fa3596 Mesh_3 demonstration working. 2014-07-07 15:23:56 +02:00
Clement Jamin bc4cb0d3f3 Fix data race in verbose mode 2014-07-07 12:03:57 +02:00
Clement Jamin dff670f4e3 Remove VERBOSE options 2014-07-07 11:00:41 +02:00
Clement Jamin a3db71cc20 Remove warnings 2014-07-04 09:31:27 +02:00
Clement Jamin f19c4b29d8 Fix MSVC warnings 2014-07-03 16:18:48 +02:00
Clement Jamin c641904fad Merge branch 'Mesh_3-parallel-cjamin' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-parallel-cjamin 2014-07-03 16:18:02 +02:00
Clement Jamin 0e4c8e54cd Fix a few other warnings 2014-07-03 15:57:35 +02:00
Clement Jamin da4cf8fc1d Fix gcc warnings (reorder + unused variables & typedef...) 2014-07-03 15:54:39 +02:00
Clement Jamin 0a4267b7ce Temporarily revert "Thread-safe version of incident_cells and incident_facets" 2014-07-03 15:41:02 +02:00
Aurélien Vialon ab909badb9 Demonstrations AABB_tree, Alpha_shapes_3 and Circulat_kernel_3 ported. Working on Mesh_3, Polyhedron and Periodic_3_triangulation_3. 2014-07-03 15:07:00 +02:00
Clement Jamin 5af7535de9 Fix warning (MSVC) 2014-07-03 13:39:11 +02:00
Clement Jamin 8d9fd85f61 Forgot to replace boost::get 2014-07-02 17:16:34 +02:00
Clement Jamin 1be95efcd5 Replace boost::tuple by CGAL::cpp11::tuple 2014-07-02 17:07:54 +02:00
Clement Jamin 894c9c649a Merge branch 'Mesh_3-parallel-cjamin' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-parallel-cjamin 2014-07-02 16:49:58 +02:00
Clement Jamin 3a31722f37 Missing typenames 2014-07-02 16:48:49 +02:00
Laurent Rineau 11e9d699db Allow to use TBB with an env variable 
For the use of the test suite
 2014-07-02 16:03:25 +02:00
Clement Jamin a6359b8e5f Clean-up + fix CMakeLists.txt 2014-07-02 15:27:36 +02:00
Clement Jamin 982f140911 Use tbb::task_scheduler_init::default_num_threads... 
... instead of boost:🧵:hardware_concurrency
 2014-07-02 15:10:34 +02:00
Clement Jamin a35a5df4ac Add missing #ifdef/#endif 2014-07-02 10:50:30 +02:00
Clement Jamin 772756eaf4 Disable precompiled headers by default 2014-07-02 10:34:59 +02:00