Commit Graph

1351 Commits

Author SHA1 Message Date
Laurent Rineau 1025b72abe Merge pull request #5378 from afabri/SDG-random_shuffle-GF
Segment Delaunay Graph demos: Use CGAL::cpp98::random_shuffle()
2021-02-18 15:19:20 +01:00
Laurent Rineau db338aa1ee Merge pull request #5417 from maxGimeno/Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno
QGLViewer: remove the need for Qt5::Xml
2021-02-18 15:19:06 +01:00
Laurent Rineau 5bd98167d4 Merge pull request #5462 from maxGimeno/CGAL-Fix_qt_warnings-maxGimeno
Fix Qt warnings
2021-02-18 15:18:53 +01:00
Maxime Gimeno 0a085569bf Fix parent error 2021-02-17 08:37:57 +01:00
Maxime Gimeno 38f1b179c0 Test the dynamic_cast rsult 2021-02-16 09:56:32 +01:00
Maxime Gimeno 0010df67e6 Remove useless if. 2021-02-16 08:57:47 +01:00
Maxime Gimeno 4a6aa7e024 use Qt::MiddleButton instead of MidButton(deprecated since 5.6 or earlier) 2021-02-15 15:22:41 +01:00
Maxime Gimeno a74914ecbd Fix warning null pointer 2021-02-15 15:18:02 +01:00
Maxime Gimeno 2500331070 Merge remote-tracking branch 'cgal/master' into Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno 2021-02-09 12:33:52 +01:00
Maxime Gimeno c9a020bb1a Remove remaining includes 2021-02-09 12:28:58 +01:00
Maxime Gimeno 9cd0d450f9 Remove QDomElements and need for QtXml 2021-02-09 11:31:34 +01:00
Laurent Rineau c5ba414c72 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:12:42 +01:00
Laurent Rineau 5380ffd257 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:05:55 +01:00
Laurent Rineau ca9febf3b8 Merge pull request #5063 from maxGimeno/CMake-modernization-maxGimeno
CMake modernization

# Conflicts:
#	CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
2021-01-22 15:25:54 +01:00
Maxime Gimeno a91d63699f Fix PCA demo and remove debug warnings 2021-01-21 11:06:01 +01:00
Andreas Fabri fbecff5692 Use CGAL::cpp98::random_shuffle() 2021-01-21 10:02:37 +01:00
Sébastien Loriot bc161f2ae9 Merge 'CGAL-Eigen3_support-5.2' 2021-01-15 10:59:20 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Maxime Gimeno 2255f8e8ea Merge remote-tracking branch 'cgal/master' into CMake-modernization-maxGimeno 2021-01-13 14:34:09 +01:00
Maxime Gimeno 9a202e2bbc Add missing headers 2021-01-12 13:27:31 +01:00
Maxime Gimeno 04753381e5 Rename file and add ::Qt 2021-01-12 13:22:34 +01:00
Maxime Gimeno 95192d6d4b factorize context initialization 2021-01-12 13:08:58 +01:00
Maxime Gimeno 3ec3ffc518 WIP 2021-01-12 11:05:10 +01:00
Maxime Gimeno 78f1b28e41 Fix message about context not made current 2021-01-08 12:46:39 +01:00
Maxime Gimeno 2a212bb2a8 Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples 2021-01-07 13:06:40 +01:00
Maxime Gimeno 4f3c4256b0 Use version150 2021-01-07 12:03:46 +01:00
Laurent Rineau 9db83004d5 Merge pull request #5107 from maxGimeno/Demo-Optical_zoom_to_pointer-maxGimeno
GraphicsView: Zoom enhancement
2021-01-06 16:11:51 +01:00
Maxime Gimeno f5c32f126f copy demo resources in the cmake module dir during release creation and fetch it from here during installation 2020-11-20 12:20:54 +01:00
Maxime Gimeno cc00d293df Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-11-06 09:37:18 +01:00
Laurent Rineau 19394196f1 Merge pull request #5096 from maxGimeno/GraphicsView-is_facet_convex-maxGimeno
GraphicsView: Fix is_facet_convex()
2020-11-05 08:49:33 +01:00
Laurent Rineau 604e3525b6 Merge pull request #5096 from maxGimeno/GraphicsView-is_facet_convex-maxGimeno
GraphicsView: Fix is_facet_convex()
2020-11-04 20:46:04 +01:00
Maxime Gimeno 2ad4c16b6e Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-26 15:00:53 +01:00
Maxime Gimeno b116a92be3 Center the camera on the cursor at first tick of optical zoom 2020-10-23 13:35:05 +02:00
Maxime Gimeno 08469076fc Remove false key binding 2020-10-22 14:06:09 +02:00
Maxime Gimeno 166ad7c8c8 Fix cases where V1 and V2 are collinear 2020-10-20 14:50:18 +02:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Laurent Rineau 86e1fc18ce Merge pull request #4876 from lrineau/GraphicsView-Basic_viewer_improvements-GF
Improvements to Basic_viewer
2020-10-16 13:43:10 +02:00
Maxime Gimeno 121a23d964 WIP look at on optical zoom 2020-10-14 16:13:14 +02:00
Maxime Gimeno 107c4350d0 remove all /src directories 2020-10-14 11:22:49 +02:00
Laurent Rineau 9c97b1dafc Remove trailing whitespaces 2020-10-13 14:34:42 +02:00
Maxime Gimeno 2ed89ef35e simplify CGAL_setup dependencies. 2020-10-12 12:24:13 +02:00
Laurent Rineau 7a48e35ffe Merge pull request #5042 from maxGimeno/Viewer-Zoom_to_rectangle
Viewer zoom to rectangle
2020-10-09 16:50:24 +02:00
Maxime Gimeno a28dd524b7 another warning fix 2020-10-07 09:59:18 +02:00
Maxime Gimeno dcbb50a134 fix warning 2020-10-06 12:58:45 +02:00
Maxime Gimeno 39f97ca56b remove NOT CGAL_HEADER_ONLY 2020-10-05 15:44:05 +02:00
Maxime Gimeno 43a49605e0 Fix conflicts 2020-10-05 13:20:40 +02:00
Sebastien Loriot 9a9acceb10
Merge pull request #4761 from maxGimeno/GraphicsView-Fixes_for_Regular_triangulation_2-maxGimeno
GraphicsView: Regular_triangulation_2 enhancements
2020-10-02 15:20:20 +02:00
Maxime Gimeno e75b70064a Recenter the scene resets the FOV 2020-10-01 10:05:18 +02:00
Maxime Gimeno a175741570 Add help for optical zoom 2020-10-01 09:10:33 +02:00