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
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
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
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
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
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
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
Laurent Rineau
Maxime Gimeno
Sébastien Loriot
Andreas Fabri
Monique Teillaud
Clement Jamin
Jane Tournois