6eaeb7a148
merge cgal/master
2025-02-28 08:55:20 +00:00
06b511cc65
Merge pull request #6088 from sloriot/PMP-add_discrete_curvature
...
Add functions to compute discrete curvatures
2025-02-12 21:22:40 +01:00
9c536ddae6
Merge pull request #8234 from MaelRL/BGL-Add_remove_deg_2_vertex-GF
...
Add an Euler operation to remove degree 2 vertices
2025-02-12 21:17:43 +01:00
043becfe7f
Merge pull request #8273 from lrineau/CGAL-followup_PR_8170-lrineau
...
Improvement backports from CDT_3 branch (Follow-up to PR #8170 )
2025-02-12 19:43:35 +01:00
14b83f0d3e
boost::tie -> std::tie ( #8715 )
2025-02-12 19:36:19 +01:00
2060b222c5
remove leftover
2025-02-09 18:48:14 +01:00
8eefb7f173
Merge branch 'master' into pr/lrineau/8273
2025-02-07 16:10:52 +01:00
e871025f36
update our CMake supported versions to ...3.31 ( #8727 )
...
## Summary of Changes
Update our CMake supported versions to ...3.31. That will suppress the
warnings about `CMP0167` (from CMake 3.30):
```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
Policy CMP0167 is not set: The FindBoost module is removed. Run "cmake
--help-policy CMP0167" for policy details. Use the cmake_policy command to
set the policy and suppress this warning.
```
## Release Management
* Affected package(s): all cmake scripts
* License and copyright ownership: maintenance by GF
2025-02-07 14:03:47 +01:00
54bfdfe04d
Mesh 3 : initial_points_generator parameter for make_mesh_3 point initialization ( #7798 )
...
## Summary of Changes
Added a `initial_points_generator` parameter in make_mesh_3.
With this parameter, we can use a custom functor when initializing the
C3t3 complex.
This functor must follow the
[Initial_points_generator](https://cgal.github.io/7798/v0/Mesh_3/classInitialPointsGenerator.html )
concept.
Tasks:
- [x] Add `initial_points_generator` parameter in `make_mesh_3`
- [x] Make an example
- [x] Write `Construct_initial_points_labeled_image` into a header
- [x] Make `initialize_triangulation_from_labeled_image` use
`Construct_initial_points_labeled_image`
- [x] Change definition of concept `InitialPointsGenerator` to output
`std::tuple<MeshDomain::Point_3, int dimension, MeshDomain::Index>`
(instead of `std::pair<MeshDomain::Point_3, MeshDomain::Index>`)
- [x] Make it pass checks
- [x] Document `initial_points_generator` parameter in `make_mesh_3`
- [x] Document `Construct_initial_points_labeled_image` header
- [x] Document example
- [x] Delete `initialize_triangulation_from_labeled_image` and
`initialize_triangulation_from_gray_image`
- [x] Make an example of labelled and gray image initialisation with the
parameter or the old custom initialization.
- [x] Make small feature page
- [x] add `Construct_initial_points_gray_image.h`, similar to
`Construct_initial_points_labeled_image.h`
- [x] Maybe add a test ?
- [x] announce in `CHANGES.md`, see
https://github.com/CGAL/cgal/pull/7798#issuecomment-2082701644
## Release Management
* Affected package(s): Mesh_3
* Issue(s) solved (if any):
* fix #922
* fix #7469
* discussion #7537
* previous closed PR #7757
* Feature/Small Feature (if any):
[Mesh_3_initial_points_generator_parameter](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Mesh_3_initial_points_generator_parameter )
* Link to compiled documentation
[*here*](https://cgal.github.io/7798/v4/Manual/index.html ):
*
[make_mesh_3](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Functions.html#gac8599a0c967075f740bf8e2e92c4770e )
has been modified to receive the parameters :
*
[initial_points_generator](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Parameters.html#gaf53777b83f1b2f3e7d49275dbab6e46b )
*
[initial_points](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Parameters.html#gae94f38c6cd23cce45a55608e881a546a )
* The
[InitialPointsGenerator](https://cgal.github.io/7798/v4/Mesh_3/classInitialPointsGenerator.html )
concept that the functor must be a model of.
* A model of this concept :
[Construct_initial_points_labeled_image](https://cgal.github.io/7798/v4/Mesh_3/structCGAL_1_1Construct__initial__points__labeled__image.html )
* License and copyright ownership:
2025-02-05 08:29:06 +01:00
e5001d1a50
update our CMake version 3.18...3.31
...
That will suppress the warnings about `CMP0167` (from CMake 3.30):
```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
Policy CMP0167 is not set: The FindBoost module is removed. Run "cmake
--help-policy CMP0167" for policy details. Use the cmake_policy command to
set the policy and suppress this warning.
```
2025-02-04 14:32:37 +01:00
4737f58130
do not use tie when not needed
2025-01-27 14:02:15 +01:00
107f3696dc
boost::tie -> std::tie
2025-01-24 14:20:00 +01:00
b19515e1f8
Merge remote-tracking branch 'cgal/6.0.x-branch'
2025-01-24 08:09:18 +01:00
7720caa9dc
Merge remote-tracking branch 'cgal/5.6.x-branch' into HEAD
2025-01-24 08:08:33 +01:00
859479f681
Merge remote-tracking branch 'cgal/master' into Frechet-dev
2025-01-20 15:47:37 +00:00
d4e6ffddf4
fix protection against min/max macros
...
The regular expression I used was:
```
((?!(?:^.*(\/\/|\/\*).*|^ *\* .*|^[^"]*"(?:"[^"]*"|[^"])*))^(?:.*[ ,\(]|))(\b(?:(?:[A-Za-z]+::)*)(?:max|min))\b *\(
```
2025-01-14 16:12:34 +01:00
76e47d40ed
Fix header path
2025-01-10 13:51:57 +01:00
9e5dcbf548
Merge remote-tracking branch 'cgal/master' into BGL-Add_remove_deg_2_vertex-GF
2024-12-13 14:44:04 +01:00
a140dfe6bf
read_WKT does not return correct value when opened in binary mode
2024-12-13 13:41:50 +00:00
1189356739
Add discrete curvatures to display plugin
2024-12-10 21:17:57 +01:00
f7c36ea81d
Make the bottom and top of the ramp not have same colors
2024-12-10 17:10:11 +01:00
078053314e
Merge remote-tracking branch 'cgal/6.0.x-branch' in master
2024-12-10 16:33:32 +01:00
793b824751
[KSP] Exact intersections bugfix ( #8631 )
...
## Summary of Changes
Switching initial_polygon_iedge_intersections() and
calculate_edge_intersection_time() to Intersection_kernel (epeck)
Resolving potential non-convex partitions
## Release Management
* Affected package(s): KSP
* Issue(s) solved (if any): fix #8624
2024-12-10 16:26:37 +01:00
450e213857
Move "remove_almost_degenerate_faces()" to the correct repair menu
2024-12-09 15:36:19 +01:00
c5500d972b
plugin bugfix
2024-12-09 11:06:43 +01:00
caf716cf47
Merge remote-tracking branch 'cgal/6.0.x-branch' in master
2024-12-06 09:58:43 +01:00
18a0f69ca2
Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
...
# Conflicts:
# Installation/CHANGES.md
2024-12-05 10:17:14 +01:00
5a717379e7
improve display of parameters in demo log
2024-11-26 17:37:10 +01:00
7632a01f6c
18->17
...
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2024-11-15 16:22:07 +01:00
7c156fa6cd
use NP stream_precision
2024-11-15 14:59:21 +01:00
74ea8b1f6c
Add CGAL::IO::read_OM() ( #8427 )
...
## Summary of Changes
Add a function to read an OpenMesh file ( `*.om` ) in CGALlab. This file
format stores also edges and vertices marked as features.
For the moment the function itself is not documented.
## Release Management
* License and copyright ownership: GeometryFactory
2024-11-14 14:12:26 +01:00
797dde5985
Merge remote-tracking branch 'cgal/6.0.x-branch'
2024-11-08 16:11:22 +01:00
3abf5e760d
Merge remote-tracking branch 'cgal/5.6.x-branch' into HEAD
2024-11-08 16:09:32 +01:00
f3abf598ed
Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
...
# Conflicts:
# Mesh_3/examples/Mesh_3/CMakeLists.txt
2024-11-04 12:42:37 +01:00
013214540a
PRIVATE was probably not a good idea for all scene_items ...
2024-10-29 20:27:59 +01:00
77bfe7d46f
add missing link to TBB
2024-10-24 14:49:18 +02:00
f77f9c6847
Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
...
# Conflicts:
# Installation/CHANGES.md
2024-10-23 16:35:56 +02:00
cddb3d5c56
move OM.h IO header to BGL package
...
adapt demo and examples
BGL example TriMesh.cpp does not compile
2024-10-23 11:58:02 +02:00
88381be445
fix compilation error
2024-10-23 09:55:29 +02:00
fb605cdd39
remove -D that is not compatible with "older" cmake versions
2024-10-22 08:19:49 +02:00
fb2a9eac90
Merge remote-tracking branch 'cgal/master' into pr/afabri/8528
2024-10-21 16:32:51 +02:00
868e35140b
fixes
2024-10-21 16:18:10 +02:00
0b9b42ace5
Merge remote-tracking branch 'cgal/5.6.x-branch'
2024-10-18 18:00:08 +02:00
96cd3e6f09
Merge remote-tracking branch 'cgal/master' into pr/afabri/8528
2024-10-17 00:25:24 +02:00
c0b59bd117
second batch of modifications after review
2024-10-16 17:34:26 +02:00
2ca1c4edc1
first batch of modifications during my review
...
[skip ci] (wait for the second batch of modifications)
2024-10-14 17:42:07 +02:00
a99dcceae8
Merge pull request #8519 from albert-github/feature/issue_8515_1
...
issue #8515 Spelling mistakes found checking `en-GB` to `en-US`
2024-10-14 09:42:14 +02:00
d8c8212c03
Merge pull request #8449 from soesau/Lab-Kinetic_surface_reconstruction_plugin-GF
...
Kinetic Surface Reconstruction Plugin
2024-10-14 09:41:42 +02:00
4bde1e658e
missing )
2024-10-10 07:39:00 +01:00
63d2a26c00
Use Boost::serialization and Boost::iostreams
2024-10-09 13:21:51 +01:00
Andreas Fabri
Sébastien Loriot
Laurent Rineau
Mael Rouxel-Labbé
Sven Oesau
Jane Tournois