Sébastien Loriot
50716b777f
do not use deprecated function
2025-05-12 11:36:53 +02:00
Jane Tournois
71120ff1f2
fix cdt3 display
2025-05-09 16:52:24 +02:00
Laurent Rineau
a8fb8c5981
fix compilation of cdt_3_plugin
2025-05-09 15:29:01 +02:00
Andreas Fabri
851d03dadb
merge master
2025-05-07 09:13:11 +01:00
Sven Oesau
91dc6a9200
unified face coloring between selection tool and cdt_3 plugin
...
activated selection highlighting for T3 meshes
2025-05-05 16:26:31 +02:00
Laurent Rineau
e95e3935da
stop using `target_precompile_headers` in CGAL Lab
2025-04-28 17:17:45 +02:00
Laurent Rineau
f5a88cf5ca
disable the PCH for vtk_plugin (because of extra preprocessor definitions)
2025-04-25 16:57:29 +02:00
Sébastien Loriot
3d2edeab55
Merge remote-tracking branch 'cgal/6.0.x-branch'
2025-04-24 20:45:32 +02:00
Sébastien Loriot
cb747e8201
Merge pull request #8721 from sloriot/PMP-new_clip
...
Add refine_with_plane and new fast clip method
2025-04-24 20:43:26 +02:00
Sébastien Loriot
4863704023
workaround API change in QT 6.9
2025-04-22 20:49:10 +02:00
Laurent Rineau
99237a3ddf
Merge remote-tracking branch 'refs/remotes/lrineau/Triangulation_3-CDT_3-lrineau' into Triangulation_3-CDT_3-lrineau
2025-04-21 16:07:04 +02:00
Laurent Rineau
52b620ecde
fix PCH issues (tentative)
2025-04-21 16:06:36 +02:00
Laurent Rineau
af5d2a7c00
Merge remote-tracking branch 'refs/remotes/lrineau/Triangulation_3-CDT_3-lrineau' into Triangulation_3-CDT_3-lrineau
2025-04-18 12:48:09 +02:00
Laurent Rineau
b29e24b623
fix PCH issues (tentative)
2025-04-18 12:44:56 +02:00
Sébastien Loriot
c5ab9f9adc
Merge remote-tracking branch 'cgal/6.0.x-branch' into cgal/master
2025-04-10 18:19:14 +02:00
Sébastien Loriot
3b07e3f027
deprecation starts in 6.7
2025-04-09 09:18:22 +02:00
Sébastien Loriot
18bf7051bd
fix deprecation warning
2025-04-08 17:58:37 +02:00
Andreas Fabri
7925d2a08b
merge master
2025-04-08 11:49:02 +01:00
Sven Oesau
e65e2a0950
deleting selection item in OpenMesh plugin when there is no selection
2025-04-07 09:10:00 +02:00
Laurent Rineau
d98f25af92
cdt_3_plugin: fix the issue about TBB
2025-04-04 20:26:03 +02:00
Sébastien Loriot
7ff41a8950
Merge pull request #7837 from hoskillua/gsoc2023
...
GSoC2023 - ACVD for Simplification & Remeshing
2025-04-03 18:00:57 +02:00
Laurent Rineau
f992865fba
bug with Wayland
2025-04-03 16:13:25 +02:00
Sebastien Loriot
ede0864914
BGL - add `CGAL::dijkstra_shortest_path(vs, vt, mesh)` ( #8724 )
...
## Summary of Changes
computes the shortest path between two vertices, using Dijkstra
algorithm
Todo
- [x] write doc and integrate to
- [x] add np
- [x] add measure to define what "shortest" means
- [x] add to ref manual top page
- [x] use in demo code
## Release Management
* Affected package(s): BGL
* [Small
feature](https://cgalwiki.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_CGAL::shortest_path(vs,_vt) )
* Link to compiled documentation
[CGAL::shortest_path_between_two_vertices()](https://cgal.github.io/8724/v0/BGL/group__PkgBGLTraversal.html#ga5627dee8a6fe4d238cb5c91e123aa763 )
* License and copyright ownership: unchanged
2025-04-03 16:07:02 +02:00
Laurent Rineau
e889e638b1
CDT_3: add a dependency to the selection_plugin
2025-04-03 09:38:37 +02:00
Laurent Rineau
4e9ecde5e1
merge my work into cgal/Triangulation_3-CDT_3-lrineau
2025-04-02 15:19:41 +02:00
Jane Tournois
c1a3b2dc09
merge cgal/master
2025-04-02 07:26:08 +01:00
Jane Tournois
017dd11e3c
fix counting facets in demo
2025-04-01 18:01:18 +02:00
Laurent Rineau
c71487deb4
fix a bug with Wayland: the dialog must be a child of the main widget
2025-03-31 14:43:07 +02:00
Laurent Rineau
9d791ce3ec
refactor the CDT_3 plugin
2025-03-31 14:42:44 +02:00
Mael Rouxel-Labbé
adf8e5ad6a
it's > its
2025-03-28 21:18:55 +01:00
Mael Rouxel-Labbé
e38e29f279
dont > don't
2025-03-28 20:52:22 +01:00
Sébastien Loriot
5a83d07e6d
Merge remote-tracking branch 'cgal/6.0.x-branch' into master
2025-03-28 18:16:42 +01:00
Sébastien Loriot
a3db73dc68
Merge remote-tracking branch 'cgal/5.6.x-branch' into cgal/6.0.x-branch
2025-03-28 18:15:16 +01:00
Jane Tournois
c4a6721d83
use CDT plugin on polygon soup
2025-03-27 16:30:51 +01:00
Sébastien Loriot
9f98b28eff
add do_not_triangulate_faces option in the plugin + fixes
2025-03-25 23:25:34 +01:00
Laurent Rineau
6b97b34a10
Merge 'cgal/master' into Triangulation_3-CDT_3-lrineau
2025-03-21 18:01:23 +01:00
Jane Tournois
bcac630220
rename to dijkstra_shortest_path()
2025-03-18 17:11:00 +01:00
Mael Rouxel-Labbé
1c3ecfa2dd
Update API from linear_subdivision to Loop/CatmullClark + NP
2025-03-17 17:14:51 +01:00
Jane Tournois
d2abc3626b
fix CDT + Tetrahedral_remeshing in the demo
2025-03-17 14:36:18 +01:00
Sebastien Loriot
82bd9a01ff
fix an issue with the offset meshing plugin ( #8779 )
2025-03-14 20:09:22 +01:00
Sébastien Loriot
0ecfcb9962
typo
2025-03-12 14:40:09 +01:00
Laurent Rineau
a3e64cffbc
fix an issue with the offset meshing plugin
2025-03-10 17:21:08 +01:00
Sébastien Loriot
ad7e4754aa
Merge remote-tracking branch 'cgal/6.0.x-branch' into master
2025-03-07 17:26:54 +01:00
Andreas Fabri
6eaeb7a148
merge cgal/master
2025-02-28 08:55:20 +00:00
Jane Tournois
d6018ee8ca
open the ofstream in binary mode to be consistent with BINARY parameter in CGAL::IO::output_to_vtu()
2025-02-27 16:52:12 +01:00
Jane Tournois
2d4c17a088
deal with cells with subdomain_index 0
2025-02-27 15:13:20 +01:00
Mael Rouxel-Labbé
ab082b29f1
Make it possible to enter target coordinates in Selection item's "Move Point"
2025-02-26 00:11:08 +01:00
Mael Rouxel-Labbé
a1763eee4e
Use linear mask/subdivision
2025-02-20 11:10:19 +01:00
Sébastien Loriot
c8ccdc6908
rename function/file
2025-02-13 16:41:16 +01:00
Sébastien Loriot
b949cc1eba
fix compilation issues
2025-02-13 01:28:57 +01:00
Sébastien Loriot
b589c88869
Merge remote-tracking branch 'cgal/master' into gsoc2023-hoskillua
2025-02-13 01:00:12 +01:00
Sébastien Loriot
837dfc45ab
fix pmap for curvature based version
2025-02-13 00:43:58 +01:00
Sébastien Loriot
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
Sébastien Loriot
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
Sébastien Loriot
ae9d1bc7ad
write the result in the input mesh
2025-02-12 20:00:15 +01:00
Sébastien Loriot
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
Sebastien Loriot
14b83f0d3e
boost::tie -> std::tie ( #8715 )
2025-02-12 19:36:19 +01:00
Laurent Rineau
87e979160f
min/max issues
2025-02-12 13:38:49 +01:00
Laurent Rineau
a2571bbab8
Merge remote-tracking branch 'lrineau/CGAL-followup_PR_8170-lrineau' into Triangulation_3-CDT_3-lrineau
2025-02-11 18:26:52 +01:00
Sébastien Loriot
e6961ef94c
factorize qem metric and non qem metric impl
2025-02-10 21:33:46 +01:00
Sébastien Loriot
328230c40e
warnings and TODOs
2025-02-10 19:50:43 +01:00
Sébastien Loriot
2060b222c5
remove leftover
2025-02-09 18:48:14 +01:00
Laurent Rineau
8eefb7f173
Merge branch 'master' into pr/lrineau/8273
2025-02-07 16:10:52 +01:00
Sebastien Loriot
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
Sebastien Loriot
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
Laurent Rineau
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
Jane Tournois
dc3fabfb66
use shortest_path_between_two_vertices() in demo
2025-02-03 15:42:44 +01:00
Sébastien Loriot
4737f58130
do not use tie when not needed
2025-01-27 14:02:15 +01:00
Sébastien Loriot
107f3696dc
boost::tie -> std::tie
2025-01-24 14:20:00 +01:00
Sébastien Loriot
b19515e1f8
Merge remote-tracking branch 'cgal/6.0.x-branch'
2025-01-24 08:09:18 +01:00
Sébastien Loriot
7720caa9dc
Merge remote-tracking branch 'cgal/5.6.x-branch' into HEAD
2025-01-24 08:08:33 +01:00
Andreas Fabri
859479f681
Merge remote-tracking branch 'cgal/master' into Frechet-dev
2025-01-20 15:47:37 +00:00
Laurent Rineau
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
Mael Rouxel-Labbé
76e47d40ed
Fix header path
2025-01-10 13:51:57 +01:00
Mael Rouxel-Labbé
9e5dcbf548
Merge remote-tracking branch 'cgal/master' into BGL-Add_remove_deg_2_vertex-GF
2024-12-13 14:44:04 +01:00
Andreas Fabri
a140dfe6bf
read_WKT does not return correct value when opened in binary mode
2024-12-13 13:41:50 +00:00
Mael Rouxel-Labbé
1189356739
Add discrete curvatures to display plugin
2024-12-10 21:17:57 +01:00
Mael Rouxel-Labbé
f7c36ea81d
Make the bottom and top of the ramp not have same colors
2024-12-10 17:10:11 +01:00
Sébastien Loriot
078053314e
Merge remote-tracking branch 'cgal/6.0.x-branch' in master
2024-12-10 16:33:32 +01:00
Sebastien Loriot
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
Mael Rouxel-Labbé
450e213857
Move "remove_almost_degenerate_faces()" to the correct repair menu
2024-12-09 15:36:19 +01:00
Sven Oesau
c5500d972b
plugin bugfix
2024-12-09 11:06:43 +01:00
Sébastien Loriot
caf716cf47
Merge remote-tracking branch 'cgal/6.0.x-branch' in master
2024-12-06 09:58:43 +01:00
Jane Tournois
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
Laurent Rineau
196f00c34b
Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau
2024-12-04 11:27:05 +01:00
Jane Tournois
5a717379e7
improve display of parameters in demo log
2024-11-26 17:37:10 +01:00
Laurent Rineau
7ae7f487d8
Merge branch 'master' into Triangulation_3-CDT_3-lrineau
2024-11-22 17:44:41 +01:00
Jane Tournois
7632a01f6c
18->17
...
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2024-11-15 16:22:07 +01:00
Jane Tournois
7c156fa6cd
use NP stream_precision
2024-11-15 14:59:21 +01:00
Sebastien Loriot
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
Laurent Rineau
02632017a5
Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau
2024-11-12 12:33:37 +01:00
Sébastien Loriot
797dde5985
Merge remote-tracking branch 'cgal/6.0.x-branch'
2024-11-08 16:11:22 +01:00
Sébastien Loriot
3abf5e760d
Merge remote-tracking branch 'cgal/5.6.x-branch' into HEAD
2024-11-08 16:09:32 +01:00
Jane Tournois
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
Sébastien Loriot
013214540a
PRIVATE was probably not a good idea for all scene_items ...
2024-10-29 20:27:59 +01:00
Sébastien Loriot
77bfe7d46f
add missing link to TBB
2024-10-24 14:49:18 +02:00
Jane Tournois
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
Jane Tournois
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
Laurent Rineau
88381be445
fix compilation error
2024-10-23 09:55:29 +02:00
Sébastien Loriot
fb605cdd39
remove -D that is not compatible with "older" cmake versions
2024-10-22 08:19:49 +02:00