Commit Graph

27 Commits

Author SHA1 Message Date
Sébastien Loriot 5db2fd0195 fix CK3 demo 2023-08-04 10:39:37 +02:00
Mael 8226666398
Merge branch 'master' into Triangulation_on_sphere_2-GF 2021-04-17 11:22:30 +02:00
Mael Rouxel-Labbé ede18b776c Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2021-03-18 10:42:52 +01:00
Maxime Gimeno 7eefc0152a Upgrade demo to Qt5 and modern openGL (base don Circular_kernel_3 demo) 2021-03-16 10:50:20 +01:00
Maxime Gimeno cc99fd94ad Demo Pass 2021-02-19 16:02:12 +01:00
Maxime Gimeno 0e4345741c Do the cpp too 2021-02-10 08:55:34 +01:00
Maxime Gimeno dfc613c342 Add missing makeCurrent() 2021-01-21 10:22:51 +01:00
Maxime Gimeno 17e83d573d Fix demos 2021-01-08 11:40:09 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Maxime Gimeno 660ebe9e81 Add missing highp and remove unwanted highp 2019-08-05 14:16:02 +02:00
Maxime Gimeno 8ae27f4c9c Fix Circular_kernel and PCA demo 2018-07-13 13:56:46 +02:00
Andreas Fabri 990a682798 Fix Circular_kernel_3 demo (CGAL_PI) 2018-05-23 16:21:57 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Laurent Rineau 6ec4c12031 Do not use OpenGL directly, but only using Qt5 OpenGL classes 2017-11-28 17:58:12 +01:00
Maxime Gimeno 0a37521263 Revert "Fix for the context"
This reverts commit 552aaa159f.

Conflicts:
	Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
2016-02-11 14:16:04 +01:00
Maxime Gimeno 552aaa159f Fix for the context 2016-02-09 14:48:26 +01:00
Maxime Gimeno a3addbfd9b Fix
- Polyhedron : spaces in a shader made it invalid
- Circular Kernel : green intersection spheres are back : wrong attribute in the draw function
- Alpha Shapes : "in" remained in the shaders.
2015-08-14 13:56:43 +02:00
Maxime Gimeno 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
Maxime Gimeno 8680431afc Mesa Fix
- Replaced the 3.3 context by a 2.1 context.
- Added the extension search for instanced rendering.
- Added an alternate rendering with points instead of spheres for the case the extensions cannot be found.
2015-08-10 10:02:30 +02:00
Andreas Fabri 2289e5a2af static_ccasts 2015-07-09 13:05:22 +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
Andreas Fabri 3c46e5262d less typenames 2015-07-07 16:45:26 +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 7ba2835c1f Upgrade to OpenGL 3.3 with Qt wrappers
- no more glu dependency
- smooth spheres
- less light but gestion of the light on the circles
2015-04-09 15:31:54 +02:00
Sébastien Loriot 2c90de93ed New demo for CK3 using libQGLviewer 2010-01-18 15:04:21 +00:00