songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
106,004 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

600 Commits

Author SHA1 Message Date
Laurent Rineau 51627e3505 Merge remote-tracking branch 'cgal/master' into CGAL-Qt6-GF 
# Conflicts:
#	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
 2023-11-01 20:59:44 +01:00
Guillaume Damiand a5447a846b Remove warning 2023-10-04 07:59:01 +02:00
Guillaume Damiand 2891528073 Bug fix in drawing of interior faces when the outer boundary is pinched 2023-09-28 19:21:49 +02:00
Laurent Rineau 48f37a14dc remove occurrences of Qt5 2023-09-14 17:02:21 +02:00
Laurent Rineau 2f6d51b49b Remove a few occurrences of CGAL_Qt5 
... and replace by CGAL_Qt6
 2023-09-14 16:33:20 +02:00
Laurent Rineau 4b3279e665 Remove the "Use OpenGL" option from 2D demos 2023-09-13 14:59:10 +02:00
Laurent Rineau 1f13a625b1 restore the OpenGL format in DemosMainWindow 
That still does not work well when the widget is a `QOpenGLWidget`.
We probably need to derive from that class, to call `glClearColor(..)`
in the `paintGL()` method.
 2023-08-30 09:32:31 +02:00
Laurent Rineau 740b57003c Merge remote-tracking branch 'refs/remotes/afabri/CGAL-Qt6-GF' into CGAL-Qt6-GF 2023-08-24 14:20:44 +02:00
Sébastien Loriot 68bc244d02 Merge remote-tracking branch 'cgal/master' into HEAD 2023-08-24 14:14:12 +02:00
Laurent Rineau 48bd7cc0c7 fix deprecation warnings from Qt6 2023-08-24 10:26:21 +02:00
albert-github 1cce66c343 Spelling corrections 
Spelling corrections `a e...` -> `an e...`
 2023-07-30 12:59:17 +02:00
Andreas Fabri 98fa0c089f Fix for crash on Quit 2023-07-18 09:36:05 +01:00
Andreas Fabri a6330295a6 Fix for deprecated warning 2023-06-30 07:56:10 +01:00
Andreas Fabri 63bf2a85b9 Fix for deprecated warning 2023-06-29 09:54:50 +01:00
Sébastien Loriot 573de7f29e Merge branch 'master' 2023-06-22 13:38:49 +02:00
Sébastien Loriot 8966b528fb Merge remote-tracking branch 'cgal/5.5.x-branch' 2023-05-30 19:15:11 +02:00
Sébastien Loriot 0c17d17f62 Merge remote-tracking branch 'cgal/5.4.x-branch' into HEAD 2023-05-30 19:14:44 +02:00
Mael Rouxel-Labbé f1b07a31e3 Add missing include 2023-05-23 19:00:52 +02:00
Laurent Rineau 9bafd13b00 Merge pull request #6721 from efifogel/Aos_2-conics-efif 
Resurect The Conic Traits
 2023-05-11 16:55:35 +02:00
Laurent Rineau 0576e883f9 Merge branch 'CGAL-fix-Qt5-CMake-GF' into CGAL-Qt6-GF 
# Conflicts:
#	AABB_tree/demo/AABB_tree/CMakeLists.txt
#	Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
#	Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
#	Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
#	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/Polygon/CMakeLists.txt
#	GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
#	GraphicsView/demo/Segment_Delaunay_graph_Linf_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/include/CGAL/Qt/DemosMainWindow_impl.h
#	Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt
#	Installation/cmake/modules/CGAL_add_test.cmake
#	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
#	Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
#	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
#	Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
#	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
#	Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
#	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
#	Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
 2023-04-28 13:49:58 +02:00
Laurent Rineau 1a6ece1cea Qt5::Svg is now only optional for CGAL_Qt5 2023-04-27 17:27:23 +02:00
Sébastien Loriot 3e07f88ab5 catch more 2023-04-24 12:01:17 +02:00
Andreas Fabri ab1d7990d2 various fixes [skip ci] 2023-04-20 11:14:11 +01:00
Andreas Fabri 370e81ef08 AABB Tree demo works 2023-04-19 15:05:33 +01:00
Andreas Fabri 42a9757f2f Fix to have a weak order 2023-04-19 15:05:12 +01:00
Andreas Fabri 47683f2dea The Truiangulation_2/examples which use draw() compile and visualize but have an assertion in a QMap 2023-04-19 14:27:45 +01:00
Andreas Fabri c6ce5fb120 Switch to QT6 for the GraphicsView demos 2023-04-19 12:19:38 +01:00
Luiz Georg 42752d0c53 Add converter to QPolygonF 2023-03-29 11:39:37 -03:00
SaillantNicolas ea7adb83e1
Remove ImageInterface.ui from resources 2023-03-09 14:19:54 +01:00
Nicolas Saillant 8b90cb40b2 Move ImagerInterface.ui into QT folders 2023-03-09 13:29:46 +01:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Andreas Fabri c7fb2f56ae Three: Add an #include# 2022-12-07 09:47:41 +00:00
albert-github 45478184de spelling corrections 
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
 2022-11-15 13:39:40 +01:00
Laurent Rineau be28464cdc Merge pull request #6838 from MaelRL/Polyhedron_Demo-Fix_grid_axes_scaling-GF 
Demo: Fix grid axes scaling + use basic shader
 2022-10-04 13:53:26 +02:00
Laurent Rineau 7a36d9af83 Merge pull request #6863 from lrineau/Polyhedron-demo_fix_display_of_protecting_spheres-GF 
Polyhedron demo - Fix the display of protecting balls (second version)
 2022-10-04 13:52:56 +02:00
Laurent Rineau 3a0a7fe34e Merge pull request #6863 from lrineau/Polyhedron-demo_fix_display_of_protecting_spheres-GF 
Polyhedron demo - Fix the display of protecting balls (second version)
 2022-10-04 13:50:20 +02:00
Laurent Rineau 3b6b6f9018 Polyhedron demo - Fix the display of protecting balls 2022-09-20 16:15:49 +02:00
Mael cf06114d97
Comment out unused variable 2022-09-09 22:21:35 +02:00
Mael Rouxel-Labbé 5c8f36e0ca Fix grid axes scaling + use basic shader 2022-09-07 20:54:21 +02:00
Sébastien Loriot 0b63b76008 fix copy/paste error 2022-07-25 16:51:38 +02:00
Guillaume Damiand e92373740e Add constant for init size of window 2022-07-13 10:15:50 +02:00
Guillaume Damiand 1d9280afae Update basic viewer to set camera mode ealier (following Efi issue). TODO: test if this solves the bug. 2022-07-04 10:04:20 +02:00
Mael Rouxel-Labbé 37390bb6b8 Add dialog-less QGLviewer::saveSnapshot 2022-06-08 12:03:25 +02:00
Sébastien Loriot ebf9fb025a Merge remote-tracking branch 'cgal/5.4.x-branch' 2022-05-26 18:13:59 +02:00
Sébastien Loriot 6f84cbebc2 Merge remote-tracking branch 'cgal/5.3.x-branch' 2022-05-26 18:13:19 +02:00
Laurent Rineau b32619fedd Fix the picking 2022-05-16 17:12:00 +02:00
Laurent Rineau 213da3115f Fix the display of the pivot point 2022-05-16 16:20:13 +02:00
Laurent Rineau 9211f1768f Add a generic read_pixel for other pixel readings 2022-05-12 14:15:01 +02:00
Laurent Rineau 225e3c2217 Add a function read_depth_under_pixel 
The function takes care of HiDPI screen, using `devicePixelRatio()`.
 2022-05-12 12:41:58 +02:00
Laurent Rineau 9ade574b1a Add devicePixelRatio() to Camera 2022-05-12 12:13:08 +02:00