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

384 Commits

Author SHA1 Message Date
Laurent Rineau 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
Laurent Rineau 55c30d0808 Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only 2015-08-04 10:55:26 +02:00
Laurent Rineau c6e8f8baa2 Do not build the demo when WITH_CGAL_Qt5=OFF 2015-08-03 17:09:52 +02:00
Laurent Rineau cb0bdd3ad2 Remove warnings about unused moc files 
Should fix #194.
 2015-08-03 16:27:28 +02:00
Laurent Rineau aa72eaa371 Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF 
Qt5 support, GSoC 2014

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support

In this commit, I have fixed the permissions of the file:
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points

In this commit, I have also modified:
	Installation/changes.html
 2015-07-17 14:13:37 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 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
Andreas Fabri 2daae8eb1b static_casts 2015-07-09 16:18:01 +02:00
Laurent Rineau ede49f1b48 Fix a warning -Wnarrowing 2015-07-08 16:00:01 +02:00
Laurent Rineau f17d91f4e3 Fix warnings about unused variables/local types/local functions 2015-07-08 15:01:36 +02:00
Maxime Gimeno 76a1911042 A viewer to specify the OpenGL context for QGLViewer's constructor 2015-07-08 13:10:11 +02:00
Maxime Gimeno 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
Maxime Gimeno 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
Sébastien Loriot 1d4358e052 update qt urls 2015-07-08 09:48:45 +02:00
Sébastien Loriot e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Sébastien Loriot 84dfabf3b4 remove REQUIRED keyword for CGAL_Qt5 in demos 
The handling should be with a status message
 2015-07-07 11:23:46 +02:00
Maxime Gimeno 4a2e163620 Changed() fixed 2015-07-07 09:49:10 +02:00
Maxime Gimeno 7b95334c69 Changed fixed. 2015-07-07 09:44:50 +02:00
Laurent Rineau 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
Maxime Gimeno 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
Laurent Rineau de7db3ca68 Merge pull request #111 from aympelle/Periodic_3_Delaunay_triangulation_traits_3-APelle 
- Rename `Periodic_3_triangulation_traits_3` to `Periodic_3_Delaunay_triangulation_traits_3`.
- Rename the concept `Periodic_3TriangulationTraits_3` to `Periodic_3DelaunayTriangulationTraits_3`.
- Create `Periodic_3_triangulation_traits_3`.
- Create the concept `Periodic_3TriangulationTraits_3`.

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/rename_p3tt3_p3dtt3
 2015-06-17 09:59:33 +02:00
Aymeric PELLE 72f9d2ccbb Add tests for backward compatibility. 2015-06-10 23:39:18 +02:00
Aymeric PELLE dab94dbcb5 Complete copyright years. 2015-06-10 14:11:47 +02:00
Aymeric PELLE 7be51168fd Fix copyright years. 2015-06-10 00:44:56 +02:00
Aymeric PELLE 72c30d6eef Add copyright info. 2015-06-09 18:44:15 +02:00
Aymeric PELLE 6e3e79977b Include P3TT3.h after declaring Filtered_periodic_predicate. 2015-06-08 17:30:30 +02:00
Aymeric PELLE 2abe69b7c0 Fix : add an include for removing an error on Windows. 2015-06-01 20:20:50 +02:00
Aymeric PELLE b4133b40ca P3DTT_base_3 inherites from P3TT_base_3 now. 
Fix : P3TT_base_3 did have Delaunay functions.
CGAL_DEPRECATED is used on P3TT3.
 2015-05-29 20:02:00 +02:00
Aymeric PELLE 7438f17852 Minor fix : remove note in P3DTT3 concept. 2015-05-18 19:07:30 +02:00
Aymeric PELLE e56c1cfbd9 Remove \cgalModif... macros and fix link problems. 2015-05-07 15:48:06 +02:00
Aymeric PELLE 7092718826 Add a warning for P3TT3. 2015-05-07 15:35:52 +02:00
Aymeric PELLE a3dc72f5d2 Doc : Move types and functions from P3TT3 concept to P3DTT3 concept. 2015-05-06 19:42:30 +02:00
Andreas Fabri c5d196f78c remaining demos 2015-05-06 18:53:44 +02:00
Aymeric PELLE 7ce4c9c759 Missing \cgalRefines. 2015-05-06 14:06:41 +02:00
Aymeric PELLE b8f0e24a68 Remove doc of P3TT3 concept from doc of P3DTT3 concept. 2015-05-05 16:45:52 +02:00
Aymeric PELLE 0f233129f1 Fix links and traits names. 2015-05-05 15:33:36 +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 b01dbe1f2d Addition of a destructor. 
- Added a destructor to take care of the buffers and VAOs.
 2015-04-16 09:48:06 +02:00
Maxime Gimeno 978885384c Upgrade of periodic_Lloyd_3_demo 
- Implementation of shader rendering
- suppression of the function gl_draw_surface
 2015-04-16 09:17:20 +02:00
Maxime Gimeno 9fb08ad647 End of deletion of the useless functions 
-deleted remaining references to make_draw_list that made the program crash
 2015-04-15 13:07:24 +02:00
Maxime Gimeno a45d2fc063 Upgrade of Periodic_triangulation_3_demo 
- Had to create cylinders from scratch to replace glu
- Had to redo every transformation calculation to fit my cylinder model
- Had to replace the length of a tube by a scaling to be able to use instanced rendering
 2015-04-15 12:52:39 +02:00
Maxime Gimeno 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
Maxime Gimeno 2e47961cce Successfully upgraded to Qt5. 2015-04-01 13:40:02 +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
Andreas Fabri 1631be5368 Merge branch 'Periodic_3-split_test_for_MSVC-GF' 
Approved by the release manager
 2015-01-15 12:40:36 +01:00
Andreas Fabri af09f13a81 do not test Lazy_exact_nt<Expr> 2015-01-12 12:28:07 +01:00
Aymeric PELLE f511291e38 Trivial warning fix : Fix Missing statement in P3T3::point(Cell_handle, int). 2015-01-12 11:56:38 +01:00
Andreas Fabri c42e1c8744 derecursify operator== 2015-01-09 16:15:35 +01:00