Commit Graph

4876 Commits

Author SHA1 Message Date
Efi Fogel 857f276dea Applied small fixes 2023-05-08 21:43:06 +03:00
Efi Fogel c1bf94e610 Merge branch 'master' into Bso_2-draw-efif 2023-05-08 17:31:26 +03:00
Efi Fogel ff456cb602 Added descriptions of fixes to the Polygon and 2D Regularized Boolean Set Operations packages 2023-05-08 17:26:55 +03:00
Mael Rouxel-Labbé 2b51f0a66e Merge remote-tracking branch 'cgal/master' into CGAL-Prepare_CHANGES.md_5.6-GF 2023-05-05 16:33:33 +02:00
Jane Tournois 73a7d4ff09 Merge remote-tracking branch 'cgal/master' into Mesh_3-min_size-jtournois
# Conflicts:
#	Installation/CHANGES.md
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
#	STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h
2023-05-05 09:17:33 +02:00
Mael 532b82cb9b
Merge branch 'master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-05-04 17:28:47 +02:00
Laurent Rineau 628d8ae43d Merge pull request #7307 from janetournois/Mesh_3-sizing_field_with_aabb_tree-GF
Mesh_3 - Document Sizing_field_with_aabb_tree
2023-05-04 17:22:59 +02:00
Laurent Rineau d2bc415a15 Merge pull request #6950 from lrineau/CGAL-allow_Epick_with_float-GF
Simple_precision_epick: an Epick-like kernel with float as FT
2023-05-04 16:37:17 +02:00
Laurent Rineau 1449281db9 Merge pull request #7264 from MaelRL/SLS-Weighted_skeleton-GF
Weighted straight line skeletons
2023-05-04 16:37:12 +02:00
Laurent Rineau 15c98093c0 Merge pull request #7411 from lrineau/CGAL-fix_worktree_with_space-GF
CMake: allow spaces in git working directory
2023-05-04 16:37:01 +02:00
Laurent Rineau eaa2c8cd71 Merge branch '5.4.x-branch' into 5.5.x-branch 2023-05-04 16:35:30 +02:00
Mael Rouxel-Labbé 556dea9d7d Update CHANGES.md 2023-05-03 20:39:51 +02:00
Laurent Rineau 1a6ece1cea Qt5::Svg is now only optional for CGAL_Qt5 2023-04-27 17:27:23 +02:00
Mael Rouxel-Labbé dc4f9ec2a7 Merge remote-tracking branch 'cgal/master' into CGAL-Prepare_CHANGES.md_5.6-GF 2023-04-27 12:46:03 +02:00
Laurent Rineau 28da6e7c74 CMake: allow spaces in git working directory 2023-04-26 16:24:01 +02:00
Jane Tournois 7833d6440b merge tet meshing sections in CHANGES.md, and reorder items 2023-04-24 18:26:36 +02:00
Laurent Rineau b8f23d4feb Merge pull request #7255 from lrineau/CGAL-rename_ctest_test_names-GF
CGAL CTest support: rename the test names
2023-04-24 14:08:27 +02:00
Jane Tournois b76f640a41 Merge branch 'Mesh_3-edge_min_size-GF' into Mesh_3-min_size-jtournois
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_dialog.ui
2023-04-24 13:59:48 +02:00
Jane Tournois e30ccd2cc5 Merge branch 'Mesh_3-add_minimal_size_criterion_new-jtournois' into Mesh_3-min_size-jtournois 2023-04-24 12:56:40 +01:00
Mael Rouxel-Labbé bad7775b53 Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-04-21 13:06:47 +02:00
Laurent Rineau 5690c51f50 Merge pull request #7339 from efifogel/Ms_2-Hole_filter-efif
Minkowski_sum_2: fix hole filter
2023-04-21 11:21:31 +02:00
Laurent Rineau 7cb29b5d0a Merge pull request #7353 from MaelRL/PMP-Triangulate_PS-GF
Add triangulate Polygon Soup
2023-04-21 11:21:28 +02:00
Laurent Rineau eb0cdd276d Merge pull request #7363 from afabri/Eigen-is_byte_container-GF
Installation: Workaround for boost::mp / Eigen problem
2023-04-21 11:21:26 +02:00
Laurent Rineau 38823ee9c4 Merge pull request #7386 from janetournois/Installation-gmp-jtournois
Installation - add new possible GMP lib name for MSVC
2023-04-21 11:21:21 +02:00
Laurent Rineau ad30839e6b Merge pull request #7370 from sloriot/PMP-soup_self_intersections
Add self-intersection test and report functions for triangle soups
2023-04-21 11:20:52 +02:00
Laurent Rineau 731a774a4f Merge pull request #7386 from janetournois/Installation-gmp-jtournois
Installation - add new possible GMP lib name for MSVC
2023-04-21 11:18:56 +02:00
Laurent Rineau 205236832e Merge remote-tracking branch 'cgal/master' into CGAL-rename_ctest_test_names-GF
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt
2023-04-21 10:47:17 +02:00
Mael Rouxel-Labbé c455782c7b prepare CHANGES.md for 5.6 (wip) 2023-04-18 12:41:29 +02:00
Mael Rouxel-Labbé b8e82b9c05 Merge remote-tracking branch 'cgal/master' into PMP-Triangulate_PS-GF 2023-04-18 12:16:27 +02:00
Laurent Rineau 60b5642b7c only use msvc::no_unique_address with C++20 or later 2023-04-18 11:40:12 +02:00
Jane Tournois bba019e066 changes 2023-04-18 10:02:15 +02:00
Jane Tournois 57f06aa287 merge "Tetrahedral Mesh Generation" and "3D Mesh Generation"
"3D Mesh Generation" is the right package name
2023-04-18 09:45:27 +02:00
Mael Rouxel-Labbé 1a5826f11a Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-04-17 12:48:30 +02:00
Laurent Rineau 594682dde3 Merge pull request #5461 from sloriot/PMP-decimation
Add coplanar decimation
2023-04-17 10:14:07 +02:00
Laurent Rineau 12c8e60e6e fix name of a custom target on Windows 2023-04-17 10:07:35 +02:00
Laurent Rineau 1a544abe4b fix a previous merge conflict resolution 2023-04-14 11:04:09 +02:00
Laurent Rineau feeaa6719c Merge remote-tracking branch 'cgal/master' into CGAL-boost_mp_exact_ring_selector
# Conflicts:
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
2023-04-14 11:02:20 +02:00
Sébastien Loriot 84d51db75e do not overwrite existing properties 2023-04-14 10:59:33 +02:00
Laurent Rineau 11ff3c57bd
Merge branch 'master' into CGAL-boost_mp_exact_ring_selector 2023-04-14 09:44:23 +02:00
Jane Tournois d4b5fec0a6 be verbose when loading succeeded 2023-04-13 16:40:15 +02:00
Jane Tournois 3077d8b657 remove useless definitions 2023-04-13 16:33:20 +02:00
Jane Tournois 37c0b5eaa6 add gmp-10 as a hint for findGMP
and add GMP_DIR and MPFR_DIR as hints to find all includes and libs
2023-04-13 16:17:22 +02:00
Jane Tournois 3c6a4c16c4 add debug info for the testsuite 2023-04-13 16:17:22 +02:00
Jane Tournois 8fe0633fb5 add new possible gmp name for MSVC
gmp-10 was compiled with vcpkg and installed on Christo
2023-04-13 16:17:21 +02:00
Sébastien Loriot 7889f8aa6b remove commented line 2023-04-13 09:02:59 +02:00
Sébastien Loriot 089fc821c9 hide a developer friendly way to easily switch with the default exact nt in EPICK/EPECK 2023-04-07 18:41:13 +02:00
Sébastien Loriot 6b71a94254 remove warnings about using GMP as being required 2023-04-07 13:59:38 +02:00
Laurent Rineau 1dce90ee79 Merge remote-tracking branch 'cgal/master' into CGAL-allow_Epick_with_float-GF 2023-04-07 10:59:51 +02:00
Laurent Rineau df17ad5e24
Add a comment to the closing #endif 2023-04-06 12:47:07 +02:00
Jane Tournois 3e3f66f75d Merge remote-tracking branch 'cgal/master' into Mesh_3-add_minimal_size_criterion_new-jtournois
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
2023-04-06 12:04:47 +02:00
Laurent Rineau bc919403d4 Preparation for CGAL-5.6-beta1 2023-04-06 11:48:17 +02:00
Sébastien Loriot cb672d4d90 Merge remote-tracking branch 'cgal/master' into PMP-decimation 2023-04-04 14:25:17 +02:00
Andreas Fabri b5f44bdac1 Activate workaround only for boost < 1.79 2023-04-04 10:55:31 +01:00
Andreas Fabri 3d9e589853 Remove default value 2023-04-04 10:42:17 +01:00
Andreas Fabri a9cf79e512 Add more partial specializations 2023-04-04 10:21:00 +01:00
Andreas Fabri 49b8f1f7fb Add partial specializations of boost::multiprecision::is_byte_container 2023-04-04 09:20:13 +01:00
Efi Fogel 23f3813458 Fixed typos in Minkowski sum bug fix description 2023-04-01 11:48:51 +03:00
Mael dce2d9b780
Merge branch 'master' into PMP-Triangulate_PS-GF 2023-03-31 13:21:44 +02:00
Laurent Rineau d3a91046a9 Merge pull request #7276 from afabri/PMP_smooth_scale-GF
PMP:  Add np for not scaling smoothed mesh
2023-03-30 18:04:34 +02:00
Mael Rouxel-Labbé 70363a3b9c Update CHANGES.md 2023-03-29 15:29:29 +02:00
Mael Rouxel-Labbé ff54473e63 Rename package to Straight_skeleton_extrusion_2, move /examples to SLS 2023-03-27 11:51:17 +02:00
Jane Tournois ffd9c8574c CHANGES.md 2023-03-24 14:31:21 +01:00
Mael Rouxel-Labbé a7e0226bfa Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-03-23 11:45:12 +01:00
Laurent Rineau b75c443110 Merge pull request #7313 from SaillantNicolas/CMAKE_AUTOUIC_move_ImageInterfaceui
CMAKE_AUTOUIC Place the ImageInterface.ui file in its original directory.
2023-03-21 16:14:14 +01:00
Mael Rouxel-Labbé cd0c81a98a Merge remote-tracking branch 'cgal/master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-03-20 10:14:27 +01:00
Mael Rouxel-Labbé 85911f1b64 Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-03-20 10:06:38 +01:00
Efi Fogel c32272876b Added a description of a yet another bug fir in the Minkowski_sum_2 package 2023-03-19 15:41:26 +02:00
Mael Rouxel-Labbé 81fe8c3b29 Add a word about non cubical domains in changes.md 2023-03-17 14:43:53 +01:00
Laurent Rineau 2f0203be10 Merge pull request #7255 from lrineau/CGAL-rename_ctest_test_names-GF
CGAL CTest support: rename the test names

# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
2023-03-15 14:23:32 +01:00
Laurent Rineau 35a1285a12 Merge pull request #6129 from janetournois/Mesh_3-triple_line_extraction-GF
Mesh_3 - add detection of intersection lines from labeled images

# Conflicts:
#	Installation/CHANGES.md
2023-03-13 16:46:07 +01:00
Mael Rouxel-Labbé 8b15d03b50 Move extrude_skeleton.h to its own package 2023-03-10 16:40:19 +01:00
Laurent Rineau d2223cdd9b Fix compilation bug 2023-03-09 15:20:39 +01:00
Sébastien Loriot b1d2744821 Merge branch 'master' into PMP-decimation 2023-03-02 14:24:27 +01:00
Laurent Rineau 2df895989b Next release will be 5.5.3 2023-02-28 20:45:46 +01:00
Laurent Rineau f7a7a4bbce Next release will be 5.4.5 2023-02-28 20:43:57 +01:00
Sébastien Loriot af20bbf953 update changes 2023-02-24 17:20:21 +01:00
Laurent Rineau e9710fa9c2 remove the definition of BOOST_PARAMETER_MAX_ARITY 2023-02-23 14:23:59 +01:00
Jane Tournois 0d550a5938 Merge remote-tracking branch 'cgal/master' into pr/janetournois/7116
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
2023-02-23 13:06:59 +01:00
Andreas Fabri 4a5ada051a Add to changes.md; Update @see in order to show to non-deprecated function 2023-02-23 11:35:12 +00:00
Jane Tournois e8e3eaa7b4 Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
2023-02-21 11:05:30 +01:00
Sébastien Loriot 640910288b Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-16 14:18:17 +01:00
Sébastien Loriot d6193b25b1 update changes 2023-02-16 14:16:28 +01:00
Laurent Rineau 73bda7c846
LCC: Add an incremental builder (#7210)
## Summary of Changes

The code exists already and only the documentation is missing. It is
pretty close to the incremental builder of `Polyhedron_3`.

## Release Management

* Affected package(s): Linear_cell_complex
* Feature/Small Feature (if any):
[link](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Linear_cell_complex_incremental_builder_3),
pre-approved by @gdamiand the 2th Feb 2023.
* Link to compiled documentation [Reference
Manual](https://cgal.github.io/7210/v0/Linear_cell_complex/classCGAL_1_1Linear__cell__complex__incremental__builder__3.html)
and subsection for an
[example](https://cgal.github.io/7210/v0/Linear_cell_complex/index.html#Linear_cell_complexIncrementalBuilderExample).
* License and copyright ownership: cnrs
2023-02-16 11:16:20 +01:00
Laurent Rineau a5052f4cd8 Merge pull request #6835 from MaelRL/CGAL-Clean_CMakeLists.txt-GF
Some CMakeLists.txts cleaning
2023-02-16 10:52:29 +01:00
Laurent Rineau 1675956251 Merge pull request #7254 from lrineau/Installation-fix_CMAKE_NO_SYSTEM_FROM_IMPORTED-GF
Fix CMAKE_NO_SYSTEM_FROM_IMPORTED
2023-02-16 10:52:16 +01:00
Efi Fogel ccdb5a0b54 Merge remote-tracking branch 'cgal/master' into Aos_2-conics-efif 2023-02-15 14:36:44 +02:00
Sébastien Loriot fbe559adc9 Merge 'cgal/master' into PMP-decimation 2023-02-14 08:33:24 +01:00
Laurent Rineau 8ba8953def
PMP remeshing with Mesh_3 - improve changes.md (#7258)
## Summary of Changes

Improve changes.md
2023-02-13 12:12:15 +01:00
Jane Tournois 66c1fb0a83 improve changes 2023-02-07 14:51:50 +01:00
Jane Tournois 1ba1810816 mention mesh_3 2023-02-07 14:47:01 +01:00
Sébastien Loriot 9242a810c4 Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-07 11:31:55 +01:00
Laurent Rineau 6df18b668c CGAL CTest support: rename the test names
Now that CTest test names can contain whitespace, we can have
better looking names. That is also more practicle because we can now
copy-paste the target name in `compilation of  <target_name>`.
2023-02-06 12:04:57 +01:00
Laurent Rineau 89cf5c5547 Fix CMAKE_NO_SYSTEM_FROM_IMPORTED 2023-02-06 10:13:11 +01:00
Andreas Fabri c716775fc0 Add to change log 2023-02-02 12:33:29 +00:00
Sébastien Loriot 9e137bca24 Merge 'cgal/master' 2023-01-31 12:26:55 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Mael 8f703b54cb
Merge branch 'master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-01-27 21:48:32 +01:00
Laurent Rineau 5f8930db8c Merge branch '5.5.x-branch'
# Conflicts:
#	Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp
#	Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
#	Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
2023-01-27 21:16:14 +01:00
Laurent Rineau b911480418 Merge pull request #7168 from efifogel/Ms_2-missed_hole-efif
Minkowski_sim_2: fix missed hole
2023-01-27 21:02:06 +01:00
Laurent Rineau 8fbb9c5eaf Merge pull request #7129 from sloriot/CGAL-config_clean_up
Leopard is retired for quite some time now
2023-01-27 20:52:25 +01:00