Commit Graph

661 Commits

Author SHA1 Message Date
Guillaume Damiand 89f7e05dc6 some drawing functor are necessary non null; review of draw for lcc. 2022-10-14 16:03:25 +02:00
Guillaume Damiand 9c77619fde Remove unused constructor; move function that does not depend on Qt 2022-10-14 15:08:05 +02:00
Guillaume Damiand 47f01c77bc Remove enum duplication 2022-10-14 11:32:58 +02:00
Guillaume Damiand 744986f2a1 spaces 2022-10-14 09:34:51 +02:00
Guillaume Damiand 331bc5c305 add missing licence header 2022-10-14 09:07:19 +02:00
Guillaume Damiand 62201124d3 Merge branch 'EBVs-Mostafa-ashraf19-cgal-dev-OLD' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 09:03:30 +02:00
Guillaume Damiand 24a8004ee0
Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 08:53:12 +02:00
Guillaume Damiand 09ce35d9ba Correct template specialisation for add_in_graphic_buffer functions, lcc and voronoi 2 2022-10-13 11:18:32 +02:00
Guillaume Damiand 91016007cd Some cleanup 2022-10-13 11:11:57 +02:00
Guillaume Damiand 733711384b review + comment 2022-10-13 08:51:41 +02:00
Guillaume Damiand 61a3711c19 Review and indent. 2022-10-13 08:48:11 +02:00
Mostafa-ashraf19 f1274c637c Solved custom KeyPressEvent callback. 2022-10-11 18:28:46 +02:00
Mostafa-ashraf19 8141fab21c Initial commit to adding custom KeyPressEvent. 2022-10-09 01:49:45 +02:00
Mostafa-ashraf19 0e2586f83d Added template arg. 2022-10-08 12:34:46 +02:00
Mostafa-ashraf19 cc4aa7cd9d Applied new APIs version in Voronoi 2, with modifications in Basic_viewer_qt. 2022-10-06 17:48:58 +02:00
Mostafa-ashraf19 7a2f8902ff Added CGAL namespace, new line at EOF. 2022-10-06 15:13:21 +02: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
Mostafa-ashraf19 7886775996 Changed Guard Name 2022-10-03 14:27:40 +02:00
Mostafa-ashraf19 796ec13391 Modified GraphicBuffer class name to snake case. 2022-10-03 13:27:22 +02:00
Mostafa-ashraf19 cb4c77f1eb changed functor names. 2022-09-23 22:23:10 +02:00
Mostafa-ashraf19 bf59ef5003 Generic_functor.h renamed to Drawing_functor.h 2022-09-23 22:23:10 +02:00
Mostafa-ashraf19 6c95908e6c Renamed functors and GB, added handles to test functors. 2022-09-23 18:03:11 +02:00
Mostafa-ashraf19 d78819d54d GraphicBuffer.h renamed to Graphic_buffer.h 2022-09-23 17:50:44 +02:00
Mostafa-ashraf19 79d5e09df7 Initial commit Generic functor. 2022-09-22 17:31:50 +02:00
Laurent Rineau 3b6b6f9018 Polyhedron demo - Fix the display of protecting balls 2022-09-20 16:15:49 +02:00
Guillaume Damiand 899b8eaa82 Bugfix for negate normal 2022-09-12 15:58:04 +02:00
Guillaume Damiand 6076849ea5 Update for basic viewer 2022-09-12 10:55:37 +02:00
Mostafa-ashraf19 b61722fb1c Added template inheritance. 2022-09-10 21:22:18 +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
Mostafa-ashraf19 c8c068ecff Moved draw_buffer function. 2022-07-25 19:45:45 +02:00
Sébastien Loriot 0b63b76008 fix copy/paste error 2022-07-25 16:51:38 +02:00
Mostafa-ashraf19 b8509e4da1 Fixed bugs, migrated variables to graphics buffer, and removes unneeded variables. 2022-07-25 15:08:18 +02:00
Mostafa-ashraf19 1dcca825bd Move vector of texts 2022-07-25 15:05:35 +02:00
Mostafa-ashraf19 02cf9a1999 Trying to solve warning 2022-07-20 18:00:40 +02:00
Mostafa-ashraf19 01289f6221 Trying to solve warninggit add GraphicsView/include/CGAL/GraphicBuffer.h 2022-07-20 17:59:37 +02:00
Mostafa-ashraf19 0bc2f1050f Small modifications 2022-07-20 12:48:29 +02:00
Mostafa-ashraf19 e050176613 Removed forward declaration. 2022-07-20 12:47:29 +02:00
Mostafa-ashraf19 2cc082e2ad Fixed typo, added local kernel. 2022-07-20 12:13:04 +02:00
Mostafa-ashraf19 5d7bb68480 Fixed typo, added forward declaration at basic viewers. 2022-07-20 11:46:30 +02:00
Mostafa-ashraf19 2a3144b7f3 Dealing bounding box from the graphic buffer. TODO for expected would remove 2022-07-20 10:04:47 +02:00
Mostafa-ashraf19 46e1bc7fca Got member elements of basic viewer. added needed methods to work externally. 2022-07-20 10:02:17 +02:00
Mostafa-ashraf19 8778d1c4b4 Handled constructor. 2022-07-20 09:50:38 +02:00
Mostafa-ashraf19 6768426af6 Moved the graphical store elements, and used elements from the graphic buffer.
Moved m_texts, arrays, m_bounding_box.
Handled methods that use basic viewer arrays to use them from the graphic buffer.
Moved a few methods.
2022-07-20 09:40:17 +02:00
Guillaume Damiand a303529e17 small correctioin 2022-07-19 10:47:51 +02:00
Mostafa-ashraf19 e51c41d7d6 Handled buffers check. 2022-07-19 09:39:10 +02:00
Mostafa-ashraf19 a859f50716 fixes bugs, WIP constructor 2022-07-19 09:36:45 +02:00
Guillaume Damiand e92373740e Add constant for init size of window 2022-07-13 10:15:50 +02:00
Mostafa-ashraf19 79a8ed3d24 CGAL: Initial commit for buffer dealing. 2022-07-04 10:28:18 +02:00
Mostafa-ashraf19 32ecb11947 CGAL: Initial commit to handle GraphicBuffer with Basic viewers. 2022-07-04 10:25:59 +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
Laurent Rineau 2cbc381554 Merge pull request #5997 from gdamiand/GraphicsView-is_facet_convex-gdamiand
GraphicsView: Bug Fix in Buffer_for_vao::is_facet_convex()
2021-09-23 16:13:57 +02:00
Laurent Rineau c891f60eb4 Merge branch '5.2.x-branch' into 5.3.x-branch 2021-09-23 16:12:46 +02:00
Guillaume Damiand 0700e56168 Fix the previous fix in is_facet_convex() 2021-09-17 11:21:23 +02:00
Sébastien Loriot 6f7fd79a1e Merge remote-tracking branch 'cgal/5.3.x-branch' 2021-08-31 19:03:26 +02:00
Maxime Gimeno 66f92a336e Restore compatibility shader code 2021-08-30 11:11:57 +02:00
Maxime Gimeno f7df517f57 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-08-09 09:14:23 +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
Maxime Gimeno 2d5f91f763 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-05-27 09:06:59 +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 735567531b RENAME 2021-03-19 12:00:08 +01: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
Laurent Rineau 11e3c689ed Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1
2021-03-03 16:39:47 +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 fa1a355751 Merge branch '5.1.x-branch' into 5.2.x-branch 2021-02-18 15:19:05 +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
Maxime Gimeno 23b1024f1b fix direction-constraint in qglviewer 2021-02-18 14:01:15 +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