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
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
5a427a85b3
Addition of the SGI FREE SOFTWARE LICENSE B in the Scene.cpp file.
2016-02-01 12:18:40 +01:00
9abf38bfce
warning fix
...
- replaced gluErrorString by its source code in Mesh_3
- replaced gluProject by its modified source code in P3T3
- deleted volume_planes files in Polyhedron/demo/Polyhedron, as the real ones are in Plugins/Mesh_3_plugin
2016-02-01 09:02:36 +01:00
d71d959a0e
FIx for mac
2016-01-20 09:39:35 +01:00
4463e53d0a
Revert "add a dependency on the Qt5::QSQLiteDriverPlugin"
...
This reverts commit 156b267d85https://github.com/CGAL/cgal/issues/254#issuecomment-132605984
2015-08-19 15:57:35 +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
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
88e41a6bf7
Mesa Fix :
...
- context set to 2.1
- shaders versions set to 120
2015-08-10 11:17:24 +02:00
4c37b2d80a
Mesa Fix :
...
- context set to 2.1
- shaders version set to 120
- instanced rendering managed with ARB extension
- if extension cannot be found, the wireframe mode is forced.
2015-08-10 11:07:04 +02:00
16da0d60ea
readd QUIET to be consistant with other packages
2015-08-07 14:40:01 +02:00
156b267d85
add a dependency on the Qt5::QSQLiteDriverPlugin
2015-08-07 14:37:57 +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
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
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
2daae8eb1b
static_casts
2015-07-09 16:18:01 +02:00
ede49f1b48
Fix a warning -Wnarrowing
2015-07-08 16:00:01 +02:00
f17d91f4e3
Fix warnings about unused variables/local types/local functions
2015-07-08 15:01:36 +02:00
76a1911042
A viewer to specify the OpenGL context for QGLViewer's constructor
2015-07-08 13:10:11 +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
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
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
4a2e163620
Changed() fixed
2015-07-07 09:49:10 +02:00
7b95334c69
Changed fixed.
2015-07-07 09:44:50 +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
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
c5d196f78c
remaining demos
2015-05-06 18:53:44 +02:00
ba4ede5f50
Clean-up
...
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
2015-04-24 12:54:05 +02:00
b01dbe1f2d
Addition of a destructor.
...
- Added a destructor to take care of the buffers and VAOs.
2015-04-16 09:48:06 +02:00
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
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
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
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
2e47961cce
Successfully upgraded to Qt5.
2015-04-01 13:40:02 +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
caa3164db5
Rename Periodic_3_triangulation_traits_3 Periodic_3_Delaunay_triangulation_traits_3.
...
Classes Periodic_3_triangulation_traits_3 and
Periodic_3_triangulation_traits_base_3 are renamed.
Tests, examples, ... are updated.
Doc is updated.
Periodic_3_triangulation_traits_3.h is set deprecated.
2014-11-26 18:23:21 +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
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
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
283807572f
restore correct permissions (not-executable)
2014-08-01 10:32:42 +02:00
Maxime Gimeno
Sébastien Loriot
Laurent Rineau
Andreas Fabri
Aymeric PELLE
Aurélien Vialon