ff0836ec79
cleanup
2018-05-17 10:20:56 +02:00
6fae94ad90
fix trackball transparency in T3 demo
2018-05-17 10:20:55 +02:00
6584abd90b
Use integrated qglviewer for 3D demos
2018-05-17 10:20:55 +02:00
a0427ec756
Fixed abusing Triangulation_cell_base_3 for Delaunay triangulations
...
TriangulationCellBase_3 does not request a circumcenter;
DelaunayTriangulationCellBase_3 does.
Delaunay_triangulation_3 only compiled because
Triangulation_cell_base_3 (and Triangulation_ds_cell_base_3 !)
provided circumcenter() operators and DT3 inherited T3's TDS.
- The circumcenter() functions are removed where they shouldn't exist
- DT3 uses DT_cell_base_3 as cell base instead of T_cell_base_3
- Concepts/Classes that supposedly only required TriangulationCellBase_3
and then built Delaunay triangulations with that (Alpha Shapes, etc.)
are upgraded to request DelaunayTriangulationCellBase_3 (anyway, it
wouldn't compile if you actually provided a model of
TriangulationCellBase_3)
- Fixed various wrong templates in classes/concepts such as
MeshVertexBase_3 not refining RegularTriangulationVertexBase_3
and (only in the doc) defaulting to Triangulation_vertex_base_3
- Removed the deprecated class (for 4+ years) T_cell_base_with_circumcenter
2018-04-26 13:21:53 +02:00
c54a6a4980
Put CGAL::random_shuffle() in the subnamespace cpp98
2018-04-11 09:32:23 +01:00
3955f031bd
Fix examples/tests/demos
2018-04-04 14:18:22 +01:00
01af331c72
use https for all links to www.cgal.org and doc.cgal.org
2018-03-14 15:59:38 +01:00
f12b3bf302
Prefix CMake options with `CGAL_`
...
- in `examples/Mesh_3/`,
- in `examples/Point_set_processing_3/`,
- in `demo/Polyhedron/`, and
- in `demo/Triangulation_3/`.
2018-03-08 12:07:49 +01:00
e00c4f67d6
Fix missing propagations of PSP named parameters API change
2018-01-10 16:39:34 +01:00
3c6640bf59
Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
...
Renewal of CMake scripts: header-only, ctest, CMake>=3.1
# Conflicts:
# Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
6ec4c12031
Do not use OpenGL directly, but only using Qt5 OpenGL classes
2017-11-28 17:58:12 +01:00
891a83840e
Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF
2017-11-17 15:03:57 +01:00
21dabf1b1b
Add compilation tests for demos
2017-11-16 18:45:33 +01:00
bbee705221
Add compilation tests for demos
2017-11-16 18:38:15 +01:00
0681ac6dbc
Fix the TBB_USE_FILE warnings
2017-11-15 17:00:02 +01:00
a9365554c9
Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
...
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
fe24a4db68
Explicit the dependencies of QGLViewer
2017-11-14 14:08:55 +01:00
6b300501aa
T3 demo does not need script
2017-11-14 11:13:17 +01:00
e2a1dd87ff
Add SVG component
2017-11-13 17:57:33 +01:00
ee57fc2d6c
add SPDX identifier for files under the GPL-3+ license
2017-11-12 10:17:51 +01:00
62c70d41ca
Renew the handle of policies, for CMake-3.10
...
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.
`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
9bb2d4433f
Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch'
2017-08-04 13:37:58 +02:00
831f0239cb
Fix CMP0071 warning.
2017-08-03 10:38:19 +02:00
40d65ab16f
Disable CTest for demo/Triangulation_3_Geomview_demos/
2017-07-11 14:55:50 +02:00
8104d153af
Fixes
...
Conflicts:
Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
2017-07-10 16:16:34 +02:00
14482af5ea
Add missing semicolon.
2017-07-10 16:11:10 +02:00
d03fc56520
Fix Triangulation_3 demo for QGLViewer v2.7
2017-07-10 16:11:10 +02:00
3a97734a70
fix T3 demo for QGLViewer v2.7.0
2017-07-10 16:11:09 +02:00
1a5d74f020
Fixes
2017-07-03 09:39:12 +02:00
ccec9f45c8
Add missing semicolon.
2017-07-03 09:35:15 +02:00
722776b78e
Fix Triangulation_3 demo for QGLViewer v2.7
2017-07-03 09:35:14 +02:00
9bf422ad5b
fix T3 demo for QGLViewer v2.7.0
2017-07-03 09:35:14 +02:00
419e6b4a4a
Remove deprecated call to CGAL_SVN_REVISION and fix about functions in the help menu.
2017-06-06 15:07:11 +02:00
5ae96fc2aa
Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found.
2017-05-23 16:12:56 +02:00
e78bef8a9c
update project name of demos
2016-09-08 00:13:34 +02:00
8ac37cc7df
Add missing link with glu in demo.
2016-06-02 12:25:39 +02:00
10469f9c4e
Update with master
2016-05-25 10:58:55 +02:00
524a8da107
Remove glu from all the CMakeLists
2016-04-14 09:29:50 +02:00
f2c68b25cd
Update CMakeLists.txt of all demos for header-only mode
2016-03-09 17:23:20 +01:00
881e4d3199
request Core only in examples, tests and demos when really needed
2016-03-07 22:36:57 +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
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
c9f16f8984
Define the OpenGL functions typedefs
...
- PFNGLDRAWARRAYSINSTANCEDARBPROC
- PFNGLVERTEXATTRIBDIVISORARBPROC
Definitions found in glext.h from Mesa.
2015-08-18 18:46:02 +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
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
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +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
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
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
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
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
bb3264c563
remove conditions that are outdated
2015-02-05 14:46:36 +01: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
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
3e873a1f5c
Fix #ifdef mismatch bug
2014-07-01 17:02:09 +02:00
1bb441317d
Add missing CGAL_ prefix
2014-07-01 16:57:26 +02:00
e3abf7fc40
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-07-01 10:38:14 +02:00
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
5de63179f0
setMouseBindingDescription API has been updated in libQGLViewer 2.5.0
2014-06-18 15:45:22 +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
5f09ccde1a
Compilation effective de la demonstration Linear Cell Complex. Commencement du portage de Triangulation_3.
2014-06-01 22:46:14 +02:00
f3c00442fd
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-05-14 19:05:40 +02:00
1b5f70c871
fix deprecation warning
2014-05-12 12:57:33 +02:00
6e8625845b
Code and comments clean-up
2014-04-08 10:26:00 +02:00
6b65ad71da
Changes in the "lock data structure" concept and models
...
The concept is now much more generic (SurjectiveLockDataStructure).
The names have been changed accordingly.
2013-10-16 12:17:56 +02:00
72d877ffc7
Updated the TDS typedef in the T3 demo
2013-10-14 17:55:13 +02:00
04c1a83977
Minor alignment change
2013-06-28 15:18:13 +02:00
079c39eef4
Update CMakeLists according to changes in FindTBB
2013-06-28 15:16:49 +02:00
eeeb6cc841
Smaller tag names (continued)
2013-05-28 15:42:39 +02:00
1cc98e9abd
Updated doc + code clean-up
2013-04-03 17:34:21 +02:00
9b3b218b9c
Bugfix
...
The sequential version doesn't know what "TBB" is!
2013-03-27 14:31:09 +01:00
db6b4e9559
Updated the demo (parallel code)
2013-03-27 14:02:09 +01:00
de1f43e30b
The remove is now fully parallel.
...
The remove operations are done in parallel as long as the dimension stays = 3, then the few remaining points are removed sequentially.
2013-03-27 13:47:40 +01:00
3eae2927e7
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-03-04 15:50:57 +01:00
8d5352e15f
Better grid lock data structure.
...
There is just one grid lock data structure class now, with several specialization.
Moreover, now the type of the lock data structure is only defined in the triangulation.
2013-02-18 12:58:57 +01:00
bce43fbb8e
Improved the way parallelism is handle in Mesh_3/Triangulation_3
...
Added a better support for parallelism in Triangulation_3.
Simplified how to enable/disable concurrency in Mesh_3.
Moved the Compact_container stategies to a new file.
2013-02-15 18:07:43 +01:00
516579f454
reverse accidental commit of a cmake target
2013-02-15 09:27:12 +01:00
Andreas Fabri
Maxime Gimeno
Mael Rouxel-Labbé
Sébastien Loriot
Laurent Rineau
Simon Giraudot
Guillaume Damiand
Clement Jamin
Aurélien Vialon
Jane Tournois