Commit Graph

7551 Commits

Author SHA1 Message Date
Sébastien Loriot f513a791e2 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-21 15:48:36 +02:00
Sébastien Loriot eef92fbef7 Merge remote-tracking branch 'cgal/5.1.x-branch' 2021-04-21 15:47:06 +02:00
Sebastien Loriot 7a68dfd3fa
Merge pull request #5623 from maxGimeno/Demo-Fix_dll_warning-maxGimeno
Polyhedron_demo : Fix a warning
2021-04-21 15:34:14 +02:00
Sebastien Loriot 4f3c2b7ee4
Merge pull request #5621 from sloriot/Demo-polylines_in_offset_meshing
Add support for protecting features in offset meshing
2021-04-21 15:31:36 +02:00
Sébastien Loriot 39367c2313 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-17 11:14:29 +02:00
Sébastien Loriot cbd95907cd Merge remote-tracking branch 'cgal/5.1.x-branch' into HEAD 2021-04-17 11:11:28 +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
Sebastien Loriot 076cb5fa13
Merge pull request #5573 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron Demo:  Trivial Warning
2021-04-17 10:53:46 +02:00
Maxime Gimeno 9384b064eb Make `children` a pointer to silent an annoying warning about QList<int> not being a dll-interface class. 2021-04-16 13:39:30 +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
Sébastien Loriot fef75785cb handle polyline to protect in offset meshing 2021-04-14 17:38:49 +02:00
Maxime GIMENO 7629e25d40
Update Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2021-04-09 14:26:51 +02:00
Maxime Gimeno 83badb138c Fix description of corner_item 2021-04-09 14:15:04 +02:00
Maxime Gimeno db9b78017e Add nissing viewer->makeCurrent() 2021-04-09 12:56:22 +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 8dc3256685 Merge pull request #5488 from sgiraudot/Classification-Remove_TensorFlow_support-GF
[Small Feature] Remove TensorFlow support
2021-04-06 15:13:15 +02:00
Laurent Rineau ed884ad2e7 Merge pull request #5525 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_dialog-jtournois
Polyhedron demo - improve PMP::isotropic_remeshing dialog box
2021-04-06 15:13:05 +02:00
Laurent Rineau 8247232cf1 Merge pull request #5535 from sloriot/CGAL-more_cmake_support_files
Add more cmake support files
2021-04-06 15:13:04 +02:00
Maxime Gimeno 8f7e12ebdc Fix another similar warning 2021-04-06 13:17:37 +02:00
Maxime Gimeno c349448ec5 add braces 2021-04-01 10:13:19 +02:00
Sebastien Loriot 3a409e6ac2
Update Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-03-31 14:16:56 +02:00
Sébastien Loriot f4a79aebd8 catch const ref 2021-03-31 14:12:43 +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
Laurent Rineau 8886d3fda9 Merge pull request #5529 from maxGimeno/Demo-Fixes_for_5_1-maxGimeno
Polyhedron_demo: Fix Affine_transform_plugin crash
2021-03-24 15:05:12 +01:00
Laurent Rineau 33ed7a9995 Merge pull request #5529 from maxGimeno/Demo-Fixes_for_5_1-maxGimeno
Polyhedron_demo: Fix Affine_transform_plugin crash
2021-03-24 15:00:25 +01:00
Simon Giraudot 8e06889d90 Rebase 2021-03-22 15:17:34 +01:00
Sébastien Loriot 887b7d0eaa add METIS cmake support file 2021-03-18 14:58:04 +01:00
Sébastien Loriot ac15312260 add Ceres support cmake file 2021-03-18 14:47:56 +01:00
Maxime Gimeno fdcd84b031 Use copy_face_graph to duplicate the surface_mesh in affine_transformation to avoid problems related to the extra properties (it may cause a crash in the cas eof the face patch_id map, for example) 2021-03-16 14:18:05 +01:00
Maxime Gimeno 1cc00a32eb Move LAS code from item to plugin to prevent BOOL declaration to conflict with the one form lib3mf. 2021-03-16 13:27:36 +01:00
Jane Tournois b0d871bf8f change the tab-order for options in UI 2021-03-11 15:21:08 +01:00
Jane Tournois 6b50fb2f10 disable nbSmoothing_spinbox when splitEdgesOnly_checkbox is checked 2021-03-11 15:14:34 +01:00
Laurent Rineau ddd2d70274 Merge pull request #5489 from danston/Polyhedron_demo-macos_warnings_fixed-danston
Fixed Polyhedron demo warnings in the macOS test suite
2021-03-10 10:35:18 +01:00
Laurent Rineau 5c8e8f5ec4 Merge pull request #5508 from maxGimeno/Demo-new_features-maxGimeno
Polyhedron Demo: New features
2021-03-10 10:35:13 +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 ab6145babc Merge pull request #5501 from maxGimeno/CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.2-maxGimeno
CMake Fixes when CGAL_Core is disabled (5.2)
2021-03-03 17:20:55 +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
Laurent Rineau 1435e37232 Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1
2021-03-03 16:31:08 +01:00
Maxime GIMENO 2349ba6d39
Update Polyhedron/demo/Polyhedron/MainWindow.cpp
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-03-03 11:51:14 +01:00
Maxime Gimeno 8b058d90d9 Fixes 2021-03-03 11:02:39 +01:00
Maxime Gimeno 714d7091ce WIP save items. Need tests. 2021-03-02 15:44:00 +01:00
Maxime Gimeno b4de351840 Merge branch 'CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.1-maxGimeno' into CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.2-maxGimeno 2021-03-02 10:16:01 +01:00
Maxime Gimeno 7c94a1f2bf Replace condition for a clearer equivalent one, and use APPEND for env property in Arrangement_2 2021-03-02 09:59:28 +01:00
Maxime Gimeno 7d21d5b62d De-activate some things that depend on CGAL_Core if it is not FOUND 2021-03-01 11:27:43 +01:00
Maxime Gimeno bcb9940eb7 WIP for groups in save_scene 2021-02-26 13:05:48 +01:00
Maxime Gimeno 2eac79c326 Fix names of the diff items 2021-02-25 14:20:42 +01:00
Dmitry Anisimov ee2cd7bcde fixed various warnings popping out for the macOS test suite 2021-02-23 15:22:07 +01:00
Simon Giraudot 68a4aa3947 Remove TensorFlow from plugin 2021-02-23 09:17:44 +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