Commit Graph

519 Commits

Author SHA1 Message Date
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 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
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
Andreas Fabri 440a8dfb7b Fix file name 2022-02-03 08:41:04 +00:00
Andreas Fabri 735752bec9 Do the remaining changes after Laurent's check 2022-02-03 08:02:11 +00:00
Sébastien Loriot 993a7b29b0 fix warnings about arithmetic operations on enum
cherry-pick of 364009
2021-11-29 17:59:12 +01:00
Sébastien Loriot 3640099261 fix warnings about arithmetic operations on enum 2021-09-28 15:36:51 +02:00
Guillaume Damiand c71138c3b0 Regenerate clipping plane in initialize_buffers, to adapt it to the possible new bounding box; add methods to retreive the clipping plane as a cgal plane_3. 2021-06-30 18:40:13 +02:00
Guillaume Damiand 29d54bb66b trailling 2021-06-29 19:54:13 +02:00
Guillaume Damiand 53cdabe0c3 Do not delete clipping plane frame, but only hide it, to keep its position. 2021-06-29 17:39:30 +02:00
Guillaume Damiand 1ab891ee35 Do not clear pos buffer of clipping plane. 2021-06-29 15:49:05 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Maxime Gimeno 17602e589e Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF 2021-04-07 09:17:51 +02:00
Maxime Gimeno 5066d5ae4b Fix Qt::midbutton deprecation warning 2021-03-16 13:28:00 +01:00
Laurent Rineau 2d5678bc91
Merge pull request #5406 from gdamiand/gsoc2020-basic-viewer-jyang-gdamiand 2021-03-08 09:21:39 +01:00
Laurent Rineau f712a2a3a0 Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1

Conflicts:
	Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_spheres.vert
	Polyhedron/demo/Polyhedron/resources/shader_spheres.vert
2021-03-03 18:27:33 +01:00
Maxime Gimeno a16bd23d04 Replace Qt::MidButton by Qt::MiddleButton, qhich is the same thing but not deprecated 2021-03-02 09:56:14 +01:00
Guillaume Damiand 1561f3a523 Remove duplicated shaders 2021-02-23 11:11:04 +01:00
Mael Rouxel-Labbé 5efa544734 Merge remote-tracking branch 'cgal/master' into SDG-Fix_doc-GF 2021-02-22 17:19:40 +01:00
Guillaume Damiand 4f6291e3f2
Merge branch 'master' into gsoc2020-basic-viewer-jyang-gdamiand 2021-02-22 09:42:52 +01:00
Maxime Gimeno b80daff6fb Fixes 2021-02-19 11:31:52 +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 d5811d0a41 clang-tidy on tests 2021-02-18 15:15:12 +01:00