881e4d3199
request Core only in examples, tests and demos when really needed
2016-03-07 22:36:57 +01:00
64644c8c49
Init the doubles to avoid a warning
2016-03-02 16:31:52 +01:00
5adf84cf8d
fix typo
2016-03-01 21:59:05 +01:00
5e57abdc50
Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' into HEAD
2016-02-18 17:01:59 +01:00
4c477c853c
Accelerete 3D version of inexact_locate as we do it for 2D
2016-02-15 10:57:59 +01:00
def3952e0e
Merge pull request #767 from bo0ts/Documentation-no_internal_in_title-pmoeller
...
Remove internal release number from documentation title
2016-02-11 15:42:40 +01:00
0a04a3a48f
Use CGAL_DOC_VERSION
2016-02-11 15:37:54 +01:00
0a37521263
Revert "Fix for the context"
...
This reverts commit 552aaa159f
2016-02-11 14:16:04 +01:00
552aaa159f
Fix for the context
2016-02-09 14:48:26 +01:00
72863bfe44
fix doxygen warnings
2016-02-04 21:19:36 +01:00
e211843b4f
Merge pull request #654 from maxGimeno/FixForMac-GF
...
Demo fix for OS X (fix for #437 )
2016-02-03 14:39:48 +01:00
eda920fba6
reindent to avoid warning
2016-01-26 17:01:20 +01:00
76df91b4cd
Fix for Triangulation_3
...
- The initializeGL() function being called in setupUI on OS X, the settings were wrong, so I simply moved readSettings in this function so that it is called when it must.
2016-01-19 17:11:28 +01:00
32a3972c33
Merge pull request #592 from afabri/CGAL-dont_submit_cleanup-GF
...
Towards getting rid of dont_submit files
2016-01-08 14:14:08 +01:00
e64ae35a6e
Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
...
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
9a9c3ac59e
various
2016-01-05 18:14:03 +01:00
71b4e9c515
Use CGAL_FULL_VERSION in all Doxyfile.in
2015-12-17 16:33:28 +01:00
60dbff189d
Merge pull request #534 from afabri/Polyhedron_3-improve_mesh_3_plugin-GF
...
Polyhedron 3 improve mesh 3 plugin gf
2015-12-10 21:01:00 +01:00
81a8f982dc
Handle the easy INPUT cases
...
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +01:00
20dd524de8
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2015-12-08 17:16:16 +01:00
1937a361ca
add missing _object function
2015-12-08 13:31:55 +01:00
b623100175
split the dual() functions; make the power test check for the absence of weights
2015-12-08 11:27:14 +01:00
fbf7b579c8
fix typos
2015-12-08 11:13:59 +01:00
4318feeca0
remove deprecated class since CGAL 3.6
2015-11-24 01:15:21 +01:00
003b435a46
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2015-11-20 11:53:44 +01:00
b6c1581456
Fix type
2015-10-28 11:06:46 +01:00
ebf4192456
Add missing copy constructor + improve code/formatting
2015-10-27 12:25:14 +01:00
857dc76847
Test the parallel insertion of points with info
2015-10-27 12:22:31 +01:00
6fc4dd7dd3
Enable parallel insertion of points with info
...
There was a bug preventing the parallelism to be activated when
using points with info
2015-10-27 12:17:58 +01:00
136488b149
Add a test for parallel insertion of points with info (bug: not parallel)
2015-10-27 11:10:41 +01:00
37ff880fb8
Merge pull request #58 from dfunke/ParallelInsertionWithInfo
...
Enable parallel insertion of points with info
2015-10-22 09:48:56 +02:00
8081234930
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2015-10-16 10:59:18 +02:00
330a0e75a2
Merge pull request #385 from cjamin/CGAL_headers_only-gdamiand_cjamin
...
CGAL headers only, step 0
2015-10-13 16:37:38 +02:00
145131e2e6
Use Real_timer in PSP3 and T3 since the algorithms might be parallel
2015-10-08 15:34:40 +02:00
cf1c0ea0ca
Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin
2015-10-01 09:12:55 +02:00
38cadeef60
update cmake list
2015-09-24 06:33:35 +02:00
cdfc7f1c31
Merge branch 'old/CGAL-split_packages-GF' into CGAL-split_packages-GF
2015-09-23 10:08:41 +02:00
bcb523ba3e
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2015-09-09 14:21:30 +02:00
6692f993ce
Add/Remove some cgalPkgDependsOn
...
Move Visibility package from Arrangements to Polygons
Add some `` in the Visibility package
Add the keyword 'Geodesic' to the Shortest Path package.
2015-09-09 12:09:57 +02:00
f592fb7e89
move test files to TDS_2 and TDS_3
2015-08-23 16:12:02 +02:00
91543fd382
move header files to TDS_2 and TDS_3
2015-08-23 15:36:12 +02:00
c9f16f8984
Define the OpenGL functions typedefs
...
- PFNGLDRAWARRAYSINSTANCEDARBPROC
- PFNGLVERTEXATTRIBDIVISORARBPROC
Definitions found in glext.h from Mesa.
2015-08-18 18:46:02 +02:00
67d72675fe
split packages
2015-08-17 23:46:59 +02:00
95f87a3ac5
Depth test problem fix
...
- Calling glEnable(GL_DEPTH_TEST) in the beginning of every draw should solve this problem.
2015-08-13 14:08:12 +02:00
03eee8987e
Mesa Fix :
...
- context set to 2.1
- shaders versions set to 120
- fetch and set the ARB extensions for instanced Rendering
- displays points instead of spheres if the extensions cannot be found
2015-08-10 16:12:47 +02:00
508b467203
Merge branch 'CGAL-Qt5_support-GF'
2015-08-05 11:23:40 +02:00
e9b8d6275b
Merge pull request #239 from lrineau/CGAL-Fix_demos_with_Qt_5.2-GF
...
Support Qt-5.2
The use of `QApplication::setAttribute(Qt::AA_UseDesktopOpenGL);` is only for Qt>=5.3.
2015-08-05 10:57:08 +02:00
55c30d0808
Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only
2015-08-04 10:55:26 +02:00
c6e8f8baa2
Do not build the demo when WITH_CGAL_Qt5=OFF
2015-08-03 17:09:52 +02:00
cb0bdd3ad2
Remove warnings about unused moc files
...
Should fix #194 .
2015-08-03 16:27:28 +02:00
1f976af9c2
warning fix
2015-07-31 14:50:14 +02:00
9f14949e69
add missing protecting guards
2015-07-29 08:44:14 +02:00
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
147ac9eabc
Warning fix + Trackball appears
...
- the draw functions had some useless arguments and m_curMode became a m_selMode,
keeping the trackBall to be displayed.
2015-07-22 16:02:15 +02:00
62906461f2
fix out of array bound warning
2015-07-21 09:12:12 +02:00
80d046bc81
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2015-07-20 12:17:03 +02:00
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
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
f9917c487e
CMake 2.8.11
2015-07-13 12:36:43 +02:00
fa13f4ed0c
Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF
2015-07-10 17:28:07 +02:00
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
3ec0c69f8f
We want 2.8.10 for all demos
...
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
f17d91f4e3
Fix warnings about unused variables/local types/local functions
2015-07-08 15:01:36 +02:00
a642c37ba1
Fix a warning that looks like a real error
2015-07-08 14:43:21 +02:00
278e9d9829
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
...
Conflicts:
Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
2015-07-08 12:40:14 +02:00
f76bb19734
Windows fix
...
- add an attribute at the application in the main() function
- add a custom context to the viewer
2015-07-08 12:16:51 +02:00
1d4358e052
update qt urls
2015-07-08 09:48:45 +02:00
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
0d431e39ab
remove qt4 specific code
2015-07-07 18:00:43 +02:00
41e2bb2fe1
Fix changed and sphere normals
...
- empty sphere changed the number of normals for all the spheres instead of just itself, and it was breaking the rendering of all the vertex spheres.
2015-07-07 10:35:47 +02:00
e5bcdc5f3e
Update all CMakeLists.txt
...
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
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
869db5e397
Update Regular_triangulation_euclidean_traits_3.h
...
added missing type Point_3
2015-07-01 14:55:17 +02:00
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
b0eae3bebe
remove explicit copy constructor
2015-06-26 17:40:57 +02:00
6c81226831
improve wording in the manual
2015-06-22 12:40:44 +02:00
46bf663ecd
Triangulation_3 demo
2015-05-06 15:53:49 +02:00
ba4ede5f50
Clean-up
...
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
2015-04-24 12:54:05 +02:00
51eb954081
correct profiler branch name
2015-04-22 13:11:39 +02:00
1c78d67a0f
correct comment
2015-04-22 13:11:21 +02:00
77e2f38d6c
move addition and deletion of tempoary points on far sphere into own methods
2015-04-22 13:10:15 +02:00
99b137f193
Upgrade of Triangulation_3_demo
...
-added the missing files
2015-04-17 14:13:40 +02:00
bd67dc70d5
Upgrade of Triangulation_3_Demo
...
- Use of shaders and Qt Wrapper
- No more Glu dependencies
2015-04-17 14:12:25 +02:00
8d29fc6e6e
Enable parallel insertion of points with info
2015-04-16 17:40:05 +02:00
85c8e7e270
Upgrade of AABB_Tree Demo to Qt5
...
- setBackgroudColor was called too soon(in the constructor of the viewer), now called in InitializeGL
2015-04-02 11:54:06 +02:00
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
5f8ca65abf
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2015-03-25 13:48:38 +01:00
9c78897ba5
Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin
2015-03-16 14:00:43 +01:00
2a78cd495e
typo
2015-02-05 16:09:03 +01:00
bb3264c563
remove conditions that are outdated
2015-02-05 14:46:36 +01:00
434766c22b
Merge branch 'releases/CGAL-4.5-branch'
...
Approved by the Release Manager.
2015-01-30 11:30:49 +01:00
062ce726be
it is operator -- and not -
2015-01-29 14:49:12 +01:00
f048bd9c50
fix figure with ref; add () to a function
2015-01-29 14:40:45 +01:00
d40c7919b6
remove Triangulation_hierarchy_3 from the classified reference pages
2015-01-29 14:10:33 +01:00
d5580a4b27
\cgalFigureCaptionEnd has no parameters
2015-01-29 09:20:23 +01:00
62069ccfc2
Fix the image
...
There was superfluous "arrows" in the cell.
2015-01-28 17:40:30 +01:00
e7d4526c6d
New figure, for vertex_triple_index
2015-01-28 16:41:12 +01:00
a00429cba1
Add the src files of figures of TDS_3
2015-01-28 16:11:15 +01:00
72e0a3e677
Fix warnings about signed/unsigned
...
The code involved is about TBB.
2015-01-21 12:59:07 +01:00
2f4bb69e0a
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2014-12-18 10:59:01 +01:00
315ffdcbc8
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-12-18 09:32:23 +01:00
3a5a65f264
update branch
2014-12-08 17:30:41 +01:00
c6de2a50b2
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-11-20 19:19:23 +01:00
ebc4300334
Header only for random.cpp.
...
For the header only version, the global variable default_random no more exist => we need to replace all occurences of default_random by a call to the global function get_default_random().
As usual, no modification for the non header only version.
2014-11-14 14:20:26 +01:00
545fe18310
add missing typedef for compilation on Linux
2014-10-03 17:11:08 +02:00
a68adcffb2
add code to test Delaunay_cell_base_3
2014-10-02 11:30:30 +02:00
9e921b1d48
add typedef requested as documented
2014-10-02 11:28:43 +02:00
d874698109
fix implementation of Delaunay_triangulation_cell_base_3
2014-10-02 10:49:16 +02:00
03253edf19
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2014-09-09 14:35:38 +02:00
8f259e5dea
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-09-09 11:20:33 +02:00
ded123507d
Updated and new input data files for apps
2014-09-05 09:19:44 +02:00
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
2d65524aea
All last demonstrations ported to Qt4or5. Need to check working of it on Linux.
2014-08-12 22:12:42 +02:00
9955677bd1
Merge branch 'Triangulation_3-fix_testsuite_powertest-GF'
...
Fix the testsuite for Triangulation_3 on
i686_Linux-2.6_g++-4.1.2_CentOS-5.1 with optimizers.
In `test_static_filters.cpp` with the x87 FPU, there was an issue where
the two sides operators or `Kernel_checker` may not be tested with the
exact same floating points (one side with 80 bits of precision, and the other with
64 bits or precision).
Tested in CGAL-4.5-Ic-118.
Approved by the Release manager.
2014-08-08 12:00:08 +02:00
83a06dc85d
Yet another fix
...
I have tested that version of the platform
i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O3. That should be the last attempt.
2014-08-06 15:40:17 +02:00
da6279672c
Fix warning introduced by c71c8a1 in weightless powertest tests
2014-08-05 11:36:00 +02:00
c71c8a13b5
Fix warning in weightless powertest tests
2014-08-03 15:06:43 +02:00
1d99641c8d
Add new tests for Triangulation_3's power_test_3
2014-08-01 12:34:05 +02:00
9d8d255307
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2014-07-30 16:42:33 +02:00
7cc8f59898
Small layout changes for Power_test_3's doc entry
...
(cherry picked from commit fdb4959b3e06c4c3fe4dd17d4420664a5d140486)
2014-07-21 12:15:57 +02:00
374ab8413c
Here is another source of potential problem
...
The variable x/y/z/r can have different values in the two contexts.
2014-07-18 17:42:50 +02:00
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
fbf824c711
Merge branch 'Mesh_3-parallel-cjamin'
...
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3
Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +02:00
d2bd75d8a6
Better solution
...
There was still 'double' variables that were not forced to 64 bits. I
opt for another solution: the result of myrand() itself is forced to
64 bits.
2014-07-17 14:32:10 +02:00
bf3937fabc
Reformat the long list of #ifdef/#else
...
And display the typeid of the kernel, for checking.
(cherry picked from commit 8eb51bee7a
2014-07-16 16:47:33 +02:00
cb09dc9065
Add Leda
...
(cherry picked from commit a25077bf90
2014-07-16 16:47:33 +02:00
4689ac4db5
Force 53 bits of precision (double with 64 bits only)
...
I have the impression that the `x` value can be different in the two
sides of the kernel checker, because of compiler optimization and
80-bits floating point registers.
2014-07-16 14:53:21 +02:00
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
13bb5e38aa
remove unused parameters
2014-07-09 16:02:45 +02:00
d0b222bfac
Fix a bug in finite_adjacent_vertices when dimension()==0
...
When tr.dimension()==0, tr.finite_adjacent_vertices(...)
returned infinite things.
2014-07-08 15:44:26 +02:00
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
aa8577b65e
Test with less points
2014-07-07 19:07:11 +02:00
0b353bb85b
Merge remote-tracking branch 'origin/CGAL-use_leda-GF'
...
Reintroduce the possibility to use CGAL without GMP
(to use LEDA number types instead for example).
The cmake option to set to switch off GMP when building
the lib is CGAL_DISABLE_GMP.
Tested in CGAL-4.5-Ic-86
Approved by the release manager
ge is necessary,
2014-07-04 12:02:37 +02:00
a3db71cc20
Remove warnings
2014-07-04 09:31:27 +02:00
fee85470c1
Merge branch 'Triangulation_3-determinism-gf' into to-be-tested/Triangulation_3-determinism-gf
...
Conflicts:
.gitattributes
Matrix_search/include/CGAL/rectangular_3_center_2.h
Spatial_sorting/include/CGAL/spatial_sort.h
2014-07-03 16:34:46 +02:00
0e4c8e54cd
Fix a few other warnings
2014-07-03 15:57:35 +02:00
da4cf8fc1d
Fix gcc warnings (reorder + unused variables & typedef...)
2014-07-03 15:54:39 +02:00
0a4267b7ce
Temporarily revert "Thread-safe version of incident_cells and incident_facets"
2014-07-03 15:41:02 +02:00
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
65e8d40e33
Fix warning
2014-07-03 09:26:25 +02:00
982f140911
Use tbb::task_scheduler_init::default_num_threads...
...
... instead of boost:🧵 :hardware_concurrency
2014-07-02 15:10:34 +02:00
55ff0a9404
Add a warning in comments
2014-07-02 10:49:44 +02:00
ddd0dcded4
Protect parallel code with #ifdef
2014-07-02 09:29:40 +02:00
906da2deac
Restore those #define as in master
2014-07-01 19:35:00 +02:00
3e873a1f5c
Fix #ifdef mismatch bug
2014-07-01 17:02:09 +02:00
5a6623c3fa
Move typedef since Vector_3 is not available in all kernels
...
TODO: find a better fix later
2014-07-01 17:00:05 +02:00
1bb441317d
Add missing CGAL_ prefix
2014-07-01 16:57:26 +02:00
134369d7f4
Reduce the number of points inserted.
2014-07-01 16:24:45 +02:00
9ca5bf92be
Improve code and CMakeLists.txt for tests
...
There was no need for a CMake option here since the parallel code is tested by
specific cpp files.
2014-07-01 16:18:37 +02:00
e3abf7fc40
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-07-01 10:38:14 +02:00
7af8f8b768
Fix compilation with GCC
2014-06-30 19:58:44 +02:00
f257b07d78
Fix type of the cell base
2014-06-30 19:57:52 +02:00
22e086e2ff
Add a CMakeLists.txt file for T3 tests (needed for TBB)
2014-06-30 16:35:23 +02:00
82811b9a05
Tests of parallel DT and RT
2014-06-30 16:24:04 +02:00
82c89aa58e
Fix template params
2014-06-30 15:52:24 +02:00
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
9eb766b039
CONCURRENT_MESH_3 => CGAL_CONCURRENT_MESH_3
2014-06-25 12:53:15 +02:00
a09ed46810
Thread-safe version of incident_cells and incident_facets
2014-06-23 10:45:26 +02:00
48a8abb278
Use Face_circulator for incident_cells_2
2014-06-23 09:20:57 +02:00
9f5927af61
Move function from C3T3_helpers to TDS
...
Move C3T3_helpers::get_incident_cells_without_using_tds_data to TDS::incident_cells_threadsafe
2014-06-23 08:21:09 +02:00
80e02ba85c
We don't need C++11 anymore
2014-06-19 16:59:00 +02:00
0230e979e2
Merge branch 'CGAL-use_leda-GF-OLD' into CGAL-use_leda-GF
...
Conflicts:
Arrangement_on_surface_2/test/Arrangement_on_surface_2/construction_test_suite_generator.cpp
Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp
Documentation/doc/Installation.txt
Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
2014-06-18 22:50:06 +02:00
5de63179f0
setMouseBindingDescription API has been updated in libQGLViewer 2.5.0
2014-06-18 15:45:22 +02:00
30e47d01a1
Added the ability to export the surface
2014-06-17 14:54:10 +02:00
5ae8464a81
Code clean-up (unused variable)
2014-06-17 14:51:31 +02:00
eebad0e1a4
Add applications to help comparison between T2/T3 and Td
2014-06-16 19:35:04 +02:00
956bdabe0e
Addition of find_package(Qt5) file and command into CMakeList of LCC, Triangulation_3 and Surface_mensher demonstrations.
2014-06-12 21:46:52 +02:00
6ec9415dc1
Demonstrations LCC and Trigulation_3 and surface mesher working.
2014-06-12 14:34:19 +02:00
4ca1c8a6c1
Remove some bad assert in test_RT_cell_base_with_weighted_circumcenter_3.cpp.
...
These asserts should have tested that the wighted_circumcenter is well
invalidate in some cases. However, we can't access to the private pointer.
So we can't check that the pointer is NULL when invalidate_circumcenter is
called. These asserts tested that the new computed weighted circumcenter has
a different address after invalidate_circumcenter. But, that fact isn't
guaranteed.
2014-06-05 15:02:13 +02:00
62fe81758a
Rename test_regular_triangulation_cell_base_with_weighted_circumcenter_3.cpp.
...
It generated a too long file path for some Windows tools (linker).
2014-06-04 15:16:56 +02:00
c496b52d0c
The documentation of the member function swap is added.
...
rhs is renamed other in this member function.
2014-06-04 14:38:34 +02:00
250c079439
Implement the copy-and-swap idiom for the assigment operator.
2014-06-04 14:04:52 +02:00
144545cbf2
Fix Regular_triangulation_cell_base_with_weighted_circumcenter_3.
...
The default value for the template parameter 'Cell base' is replaced by
Regular_triangulation_cell_base_3. (The doc is updated.)
The operator= is fixed.
A test file is added for this class.
Trivial bug-fix for master
2014-06-03 19:34:29 +02:00
7145f7db0b
Replaced some C++11 lambda functions by functors +change mutex (static=>member)
2014-06-03 18:18:12 +02:00
5f09ccde1a
Compilation effective de la demonstration Linear Cell Complex. Commencement du portage de Triangulation_3.
2014-06-01 22:46:14 +02:00
05efa677a1
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
...
Conflicts:
NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h
NewKernel_d/test/NewKernel_d/Epick_d.cpp
2014-05-28 14:53:26 +02:00
c9c8335811
More code clean-up
2014-05-27 13:46:34 +02:00
ce17a717c7
Restore some profiling code and remove some
2014-05-27 13:33:33 +02:00
2f78d27bd3
Code clean-up
2014-05-27 13:21:16 +02:00
dfe800bc40
Clean-up debug code (global lock)
2014-05-27 12:16:29 +02:00
3fa09693a3
Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
...
Conflicts:
Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h
Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
Mesh_3/include/CGAL/Mesh_polyhedron_3.h
Mesh_3/test/Mesh_3/test_meshing_polylines_only.cpp
STL_Extension/include/CGAL/Compact_container.h
STL_Extension/test/STL_Extension/test_Compact_container.cpp
2014-05-21 18:24:17 +02:00
3a0f46f1d2
suppress automatic link for 'Fast'
2014-05-19 09:59:44 +02:00
f3c00442fd
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-05-14 19:05:40 +02:00
6721cb970c
Fix include
2014-05-14 17:35:39 +02:00
db3a642de4
Missing include
2014-05-14 17:35:16 +02:00
7e00af50f5
Merge branch 'Triangulation_3-faster_incident_edges-GF'
...
Approved by the release manager
2014-05-14 17:03:41 +02:00
9299cce708
Add an example that compares a sequential and a parallel construction of Delaunay_3
2014-05-13 16:46:57 +02:00
e97506adb7
Merge branch 'Triangulation_3-regular_cell_base_with_circumcenter-GF'
...
Resolve conflicts in Mesh_3/include/CGAL/Mesh_3/config.h
This branch implements the small feature described here :
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/circumcenter%28%29_in_RT3_cell_base
It makes consistent implementations of dual(cell) in RT3 and DT3 :
they both return cell->circumcenter(gt) now
Approved by the release manager
2014-05-13 14:52:13 +02:00
d80d4508d6
typo
2014-05-13 14:38:26 +02:00
8bc6e6136d
fix a warning from clang. Actually highlighted a real error : gt was missing
2014-05-12 14:55:11 +02:00
1b5f70c871
fix deprecation warning
2014-05-12 12:57:33 +02:00
3d0e6f2a4f
boost::unorerdered_set::reserve() was only introduced with Boost 1.50
2014-05-09 11:08:38 +02:00
1ff9694206
int -> std::size_t
2014-05-08 13:41:33 +02:00
3cc64eb19e
Call unordered_set::reserve()
2014-05-07 11:51:25 +02:00
2ed094d23c
cleanup
2014-05-07 11:14:36 +02:00
d1a6046fcd
Vertex_extractor gets a partial specialisation for Vertex::Has_visited
2014-05-07 11:00:05 +02:00
09876e23fa
Add bool visited to the Vertex in order to avoid a map
2014-04-29 14:04:27 +02:00
3812e53d64
Add flat_set
2014-04-29 06:47:32 +02:00
d74653ece0
Replace std::map by boost::unordered_map in TDS_3::incident_edges
2014-04-28 16:18:13 +02:00
e07baefb17
Change the way we compute the exact circumcenter when needed
...
In some rare cases, we need to switch to exact computation for the circumcenter.
Some code for this computation is now moved from RT3 to Refine_facets.
2014-04-15 18:54:12 +02:00
Sébastien Loriot
Andreas Fabri
Laurent Rineau
Philipp Möller
Maxime Gimeno
Sebastien Loriot
Clement Jamin
Guillaume Damiand
Monique Teillaud
Daniel Funke
Jane Tournois
Aurélien Vialon
Mael Rouxel-Labbé
Aymeric PELLE