Commit Graph

33 Commits

Author SHA1 Message Date
Maxime Gimeno f80f318503 WIP Shader fixes 2018-07-03 13:53:57 +02:00
Jane 93d9e8e227 Remove problematic gl calls 2018-06-29 18:40:25 +02:00
Maxime Gimeno 301416c151 Pass to OpenGL_ES_2 2018-06-29 12:06:06 +02:00
Maxime Gimeno 2f4f22d236 Merge remote-tracking branch 'cgal/master' into Demo-Add_transparency-GF 2018-06-21 11:42:26 +02:00
Maxime Gimeno 8e7fc0b852 Merge master to solve conflicts. 2018-06-13 09:40:56 +02:00
Laurent Rineau 1df3c3e922 Merge branch 'master' into GraphicsView-no_using_namespace_std-GF 2018-06-12 17:37:15 +02:00
Laurent Rineau 1f646405e8 Fix -Wconversion warnings (and a few others) in QGLViewer 2018-06-05 14:48:24 +02:00
Maxime Gimeno 21359581c4 Add viewer's modifications to CGAL_Qt5 2018-06-04 12:00:22 +02:00
Andreas Fabri 1969ee9853 Fix the license header, as the dual licensing does not apply to pur fork 2018-05-31 10:05:46 +01:00
Maxime Gimeno d617e33253 Add possibly missing include QMouseEvent containing the Qt::NoButton enum. 2018-05-18 10:02:09 +02:00
Andreas Fabri 3804bf6983 Fix Triangulation_3 demo (CGAL_PI) 2018-05-18 08:01:26 +01:00
Maxime Gimeno f7d0fc72cd fix the <:: error 2018-05-17 10:20:57 +02:00
Maxime Gimeno 03aa69c039 Clean-up the code:
Remove deprecated functions
Remove useless file
2018-05-17 10:20:57 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Jane Tournois 7d49e2fb17 make the copy-constructor private, and do not define it,
to make sure it will not be used.

and add missing include
2018-05-17 10:20:56 +02:00
Laurent Rineau 02d5c69066 typo: frok/fork 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0d4c153da2 Fix ImageInterface UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 1c8b2a02c9 use CGAL_QT_EXPORT 2018-05-17 10:20:56 +02:00
Maxime Gimeno 55c3048a69 Remove GPL_EXCEPTION and add GeometryFactory 2018 copyrights 2018-05-17 10:20:56 +02:00
Maxime Gimeno c570c7ea7d Change text in licenzse headers tospecify this is a fork 2018-05-17 10:20:56 +02:00
Maxime Gimeno f1162b9914 Add missing tags in license headers 2018-05-17 10:20:56 +02:00
Maxime Gimeno cadee2cac1 force GPL 3.0 to test. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 495b087c6f Finish snapshot implem 2018-05-17 10:20:56 +02:00
Maxime Gimeno 37c52e6bbc WIP SnapShot and SPDX LICENSE update. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 18e38c2344 Fix license GPL 3+ into GPL 3 2018-05-17 10:20:56 +02:00
Maxime Gimeno 8df643f390 update licenses 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0c74a68952 WIP Header_only 2018-05-17 10:20:55 +02:00
Maxime Gimeno cbc0ce1130 remove snapsjot functions and files from qglviewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 50c471253a Move context creation to qglviewer. Replace initializeGL() by init()in demo viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 39a0b8a8d5 Restore pivot point drawing 2018-05-17 10:20:55 +02:00
Maxime Gimeno 3995c80524 fix warning in camera and fix fps display in cgal_qt5 so we don't have to overwrite it in the viewer
Begin the implementation of the graphcal hints
2018-05-17 10:20:55 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Maxime Gimeno c0c7bd095d WIP: Include QGLViewer inside CGAL_qt5 2018-05-17 10:20:55 +02:00