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

1509 Commits

Author SHA1 Message Date
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Laurent Rineau 6d28829737 Merge pull request #6316 from sloriot/CGAL-boost_progress 
Use non-deprecated API for boost progress
 2022-02-22 18:24:47 +01:00
Laurent Rineau 98f7d25a20 Merge pull request #6316 from sloriot/CGAL-boost_progress 
Use non-deprecated API for boost progress
 2022-02-22 18:23:37 +01:00
Sébastien Loriot 0dca23cbf8 progress_display is replaced starting boost 1.72 2022-02-18 15:53:54 +01:00
Sébastien Loriot b4d37aff47 use non-deprecated API 2022-02-18 15:53:54 +01: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
Mael Rouxel-Labbé 625848e629 Fix missing ':' in various namespaces 2021-10-04 13:21:47 +02: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
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +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
Maxime Gimeno e6c767d5c9 Simplify the GNUC versions tests 2021-05-12 15:45:07 +02:00
Maxime Gimeno 393ae7dae6 Clean-up boost_version reqs 2021-05-12 15:03:53 +02:00
Sébastien Loriot 12f0e412b5 write_vtu -> write_VTU 2021-05-04 15:12:36 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno 
Update maximum cmake versions
 2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +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
Laurent Rineau c453420dd6 Merge pull request #5513 from maxGimeno/Demo-Fixes-maxGimeno 
Polyhedron_demo: Move LAS code from item to plugin
 2021-03-24 15:05:20 +01: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
Dmitry Anisimov 6346767cb2 added = default to the Lipschitz sizing field 2021-03-16 12:12:49 +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 3ab3b10d47 Merge pull request #5247 from MaelRL/SDG-Fix_doc-GF 
Doc improvements for TDS-related classes
 2021-03-03 17:38:18 +01:00
Laurent Rineau 22b823f066 Merge pull request #5434 from maxGimeno/Doc-Dont_use_small_caps-maxGimeno 
Doc: Don't use small caps
 2021-03-03 17:32:57 +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 cc99fd94ad Demo Pass 2021-02-19 16:02:12 +01:00
Maxime Gimeno b80daff6fb Fixes 2021-02-19 11:31:52 +01:00
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 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
Laurent Rineau 8525561889 Merge pull request #5378 from afabri/SDG-random_shuffle-GF 
Segment Delaunay Graph demos: Use CGAL::cpp98::random_shuffle()
 2021-02-18 15:18:04 +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
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 b134ed8246 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:07:32 +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
Maxime Gimeno fb3746168d remove \sc 2021-02-05 11:10:20 +01:00
Maxime Gimeno 5e63293747 Replace plane manipulation by frame manipulation. 2021-02-03 11:41:07 +01:00
Guillaume Damiand a09a4684f4 Start to use manipulated frame for clipping plane 2021-02-03 08:56:52 +01:00
Guillaume Damiand 77b9ebc19c Update shaders 2021-02-02 12:06:40 +01:00
Guillaume Damiand a7a3931f0a Update shaders 2021-02-02 10:27:57 +01:00
Guillaume Damiand de7dd44307 add licence header 2021-01-27 18:53:59 +01:00
Guillaume Damiand 3b838da50a Re-add clipping plane. 2021-01-27 18:47:38 +01:00
Mael Rouxel-Labbé 1f45360d7a Merge remote-tracking branch 'cgal/master' into SDG-Fix_doc-GF 2021-01-26 09:05:24 +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
Mael Rouxel-Labbé 6b87fe393d Fix various grammar issues 2020-12-05 11:11:33 +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
Maxime Gimeno 06995b543a Add a zoom with z+wheel 2020-09-30 16:28:25 +02:00
Maxime Gimeno bd5d625e7b restore rectangle drawing while zooming on position 2020-09-30 13:12:23 +02:00
Maxime Gimeno 9503a6a18b Remove state of camera. It is supposed to be reinit when launching the app and sometimes it leads to not being to visualize anything 2020-09-29 16:06:35 +02:00
Maxime Gimeno cfa89e9da4 Replace < by O to have it on all keyboards, not only french ones 2020-09-29 15:51:16 +02:00
Sébastien Loriot 30ac63a867 remove trailing whitespaces 2020-08-31 16:08:38 +02:00
Guillaume Damiand 86307add6d Add an option to toggle between 2D and 3D mode for the viewer. 2020-08-31 15:14:53 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Laurent Rineau 4d59f718ac Add setters to set all those Booleans afterwards 2020-07-24 13:10:51 +02:00
Laurent Rineau e831481e6e Make `redraw()` public 2020-07-24 13:10:37 +02:00
Laurent Rineau a1a1ee4496 Move shortcuts and descriptions in the constructor 
@gdamiand Please review this patch
 2020-07-23 17:37:23 +02:00
Laurent Rineau 66040cb5f3 A few fix to our LEDA testsuite 2020-07-20 17:13:01 +02:00
Maxime Gimeno 624e8e803a Fix flag fix 2020-06-12 10:34:48 +02:00
Maxime Gimeno a9795c3562 Fix deprecation warnings 2020-06-11 13:11:36 +02:00
Maxime Gimeno dd701e28fa Fix Delaunay point removal 2020-06-02 14:32:22 +02:00
Maxime Gimeno e28a3ac2cc Fix some edge width and add a double click event to add a 0 wheighted point. 2020-06-02 12:55:25 +02:00
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +02:00
Sebastien Loriot 2d3e126450
Merge pull request #4602 from gdamiand/gsoc2019-nccycles-thien 
Surface mesh topology shortest cycle
 2020-04-29 09:10:37 +02:00
Guillaume Damiand 7ec9d576cd Do not re-use standard keys in basic viewer. 2020-04-27 18:55:25 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Sébastien Loriot 58b10a3605 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:58:50 +01:00
Sébastien Loriot c1a42c7d37 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:21 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces 
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
 2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch' 
whitespace+tab removal, merged with option -Xignore-space-change
 2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces 
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
 2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch' 
whitespace+tab removal, merged with option -Xignore-all-space
 2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Sébastien Loriot cc1bd20c7c Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF 
Third party libs: improve documentation + introduce new CMake functions
 2020-03-17 18:19:40 +01:00
Laurent Rineau 789d3314b6
Merge branch 'master' into Polyhedron-demo__add_qtscript_support_to_Mesh_3_plugin-GF 2020-03-13 17:14:13 +01:00
Laurent Rineau e828e60b8d Merge pull request #4521 from maxGimeno/Installation-Fix_CGAL_WITH_Qt5-maxGimeno 
Fix CGAL_Qt5_FOUND issue
 2020-02-14 14:39:11 +01:00
Maxime Gimeno 8645e59f00 Fix Qt5 COMPONENT installation and don't copy Qt/* at installation step. 2020-02-12 14:24:29 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Laurent Rineau 3406bf0c3f Merge remote-tracking branch 'cgal/master' into Polyhedron-demo__add_qtscript_support_to_Mesh_3_plugin-GF 2020-01-28 15:56:42 +01:00
Laurent Rineau bf8205642e Fix conversion warnings 2020-01-20 18:18:45 +01:00
Laurent Rineau 3b1f11dd0d Merge pull request #4383 from gdamiand/Basic_viewer_bugfix-gdamiand 
Basic viewer bugfix
 2020-01-17 16:28:25 +01:00
Guillaume Damiand a666cb0857 Resolve conflict 2020-01-16 08:33:24 +01:00
Laurent Rineau 67b1b0e04f Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand 
Surface mesh topology (new package)
 2020-01-15 17:24:06 +01:00
Laurent Rineau 25bcb34608 Merge pull request #4440 from maxGimeno/CGAL_qt-Fix_deprecation_warnings-maxGimeno 
Graphics_view : Fix QTime warnings
 2020-01-15 17:19:22 +01:00
Maxime Gimeno fd1a14d74e remove obsolete hint fon antialiasing 2020-01-13 16:33:52 +01:00
Maxime Gimeno 2bb22ad954 Replace `QTime`s by `QElapsedTimer`s. It seems the header of QTime has been deprecated but it has not been documented... 2020-01-13 16:32:49 +01:00
Maxime Gimeno 8b30d9c752 remove obsolete hint fon antialiasing 2020-01-13 15:52:36 +01:00
Maxime Gimeno 1968f2cf20 Replace `QTime`s by `QElapsedTimer`s. It seems the header of QTime has been deprecated but it has not been documented... 2020-01-02 10:04:31 +01:00
Guillaume Damiand 535fff1199 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-05 18:21:41 +01:00