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

204 Commits

Author SHA1 Message Date
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
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
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
Laurent Rineau fb2a9eac90 Merge remote-tracking branch 'cgal/master' into pr/afabri/8528 2024-10-21 16:32:51 +02:00
Laurent Rineau 868e35140b fixes 2024-10-21 16:18:10 +02:00
Sébastien Loriot 0b9b42ace5 Merge remote-tracking branch 'cgal/5.6.x-branch' 2024-10-18 18:00:08 +02:00
Sébastien Loriot 619875392c Merge branch 'gsoc2023' into master 2024-10-18 14:33:31 +02:00
Laurent Rineau 96cd3e6f09 Merge remote-tracking branch 'cgal/master' into pr/afabri/8528 2024-10-17 00:25:24 +02:00
Laurent Rineau c0b59bd117 second batch of modifications after review 2024-10-16 17:34:26 +02:00
Laurent Rineau 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
Sébastien Loriot 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
Sébastien Loriot 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
Laurent Rineau 2cd3575376 rename to add "conforming" 2024-10-10 16:01:00 +02:00
Andreas Fabri 4bde1e658e missing ) 2024-10-10 07:39:00 +01:00
Andreas Fabri 63d2a26c00 Use Boost::serialization and Boost::iostreams 2024-10-09 13:21:51 +01:00
Andreas Fabri 9bf4134043 Only link with Boost::program_options - Supported the minimum required cmake 2024-10-09 13:14:11 +01:00
Andreas Fabri 9e75ab340d Use add_compile_definitions 2024-10-09 11:58:52 +01:00
Andreas Fabri ad8ece612d more plugins depend on Eigen 2024-10-08 22:45:25 +01:00
Andreas Fabri 59903f107f I guess this was before inherited from one of the item classes @lrineau 2024-10-08 22:19:57 +01:00
Andreas Fabri 527569346e CGAL: Modernize CMakeLists.txt 2024-10-08 17:02:41 +01:00
Jane Tournois b7b48b107c
add QUIET 
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
 2024-10-08 11:44:17 +02:00
Sébastien Loriot f30fffd5c3 fix warnings and incorrect filename 2024-10-08 11:07:22 +02:00
Sven Oesau 662330183c removed unused parameter 2024-10-08 09:01:00 +02:00
Sven Oesau 779df70cac bugfix for empty point size/normal length sliders in context menu 2024-10-07 08:23:06 +02:00
albert-github dd02af92a2 issue #8515 Spelling mistakes found checking `en-GB` to `en-US` 
Spelling corrections, `en-GB` -> `en-US`
 2024-10-05 11:28:29 +02:00
Sven Oesau 42d8c22d7c remove warning 
fixed crash when estimating normals from context menu
 2024-10-04 09:18:22 +02:00
Jane Tournois c1f2236ee3 Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement 
# Conflicts:
#	Installation/CHANGES.md
 2024-09-30 14:02:09 +02:00
Jane Tournois 5f2afe2e36
fix typedefs (code review) 
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
 2024-09-26 11:58:20 +02:00
Jane Tournois b3a8530dcf use new API with named paremeter initial_points_generator in demo 
and fix compilation issues
 2024-09-24 11:05:41 +02:00
Andreas Fabri 7d849ee2d3 Merge remote-tracking branch 'cgal/master' into BGL-Openmesh_selection-GF 2024-09-17 08:48:44 +01:00
Sébastien Loriot 41b096c91a Merge remote-tracking branch 'cgal/5.6.x-branch' 2024-09-11 17:23:50 +02:00
Sven Oesau 073309a07f fix crash on repeating steps in the reconstruction pipeline 2024-09-10 14:36:58 +02:00
Jane Tournois 2eb80332ba create selection item only when OM file contains feature vertices or edges 2024-09-10 11:07:39 +02:00
Jane Tournois 1066666ad8 Merge remote-tracking branch 'cgal/master' into BGL-Openmesh_selection-GF 2024-09-09 15:26:04 +01:00
Laurent Rineau 37f3bcfaab Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2024-09-09 10:57:33 +02:00
Andreas Fabri 705729e45e cleanup 2024-09-08 12:17:24 +01:00
Jane Tournois 2145d262d3 add write_OM() and use it in OM_io_plugin 2024-09-05 17:14:53 +02:00
Jane Tournois 07fac94de2 use CGAL::OpenMesh_support 2024-09-05 17:13:43 +02:00
Sven Oesau 830d13734d copy from siggraph24 branch 
added parameter estimation
 2024-08-30 16:29:43 +02:00
Sebastien Loriot 9ded34f6dd
Mesh_3 - bug fixes for `edge_distance` and `edge_min_size` (#8405) 
## Summary of Changes

While experimenting on self-intersecting polyhedral surfaces, I met two
bugs:
* `edge_min_size` was not enough taken into account in
`Protect_edges_sizing_field`,
* `edge_distance` was missing the information of which `curve_id` the
edge belongs to (available using internal code)
causing crashes.

## Release Management

* Affected package(s): Mesh_3
* License and copyright ownership: unchanged
 2024-08-26 15:24:29 +02:00
Sebastien Loriot fb9120fb30
Remove outdated Qt version checks (#8402) 
## Summary of Changes

This PR removes outdated conditional blocks that check for specific Qt
versions since CGAL now uses Qt6 exclusively.

## Release Management

* Issue(s) solved (if any): #8381
 2024-08-26 15:23:54 +02:00
Andreas Fabri 302e2fe594 We are only interested in features 2024-08-22 14:53:11 +01:00
Andreas Fabri 496019ae4e Add a selection item for edges marked in the om file 2024-08-22 13:25:31 +01:00
Andreas Fabri 4832f06ae4 Add plugin to read OpenMesh .om files 2024-08-22 11:40:27 +01:00
Sébastien Loriot a1a7b65275 remove remaining QT_VERSION_CHECK 2024-08-19 13:01:09 +02:00
Sebastien Loriot ac9a701342
remove leftover 2024-08-19 12:53:37 +02:00
Nicolas Saillant 1286d8b636 Remove deprecated Qt version checks 2024-08-19 12:02:19 +02:00
Sebastien Loriot 47c417a785
Deal with duplicate lines (#8396) 
## Summary of Changes

Deal with Issue #8348 

## Release Management

* Affected package(s):  Triangulation_2 and Periodic_triangulation_2
* Issue(s) solved (if any): fix #8348 
* License and copyright ownership:  unchanged
 2024-08-19 11:17:50 +02:00
Sebastien Loriot 862a3b6539
Update CMakeLists.txt for recent VTK to fix CMake Warning (#8279) 
## Summary of Changes

Versions >= 9 of VTK trigger the following CMake warning using CGAL's
CMakeLists
```
CMake Deprecation Warning at C:/dev/VTK-9.2.2/build/lib/cmake/vtk-9.2/vtk-use-file-deprecated.cmake:1 (message):
  The `VTK_USE_FILE` is no longer used starting with 8.90.
Call Stack (most recent call first):
  CMakeLists.txt:32 (include)
```

I suggest this modification of the CMakeLists of Mesh_3 examples, that
also requires moving to VTK 9 (9.0 was released in 2020).
If this modification and new requirement are validated, I can apply the
change everywhere.

## Release Management

* Affected package(s): Mesh_3 for now
* License and copyright ownership: unchanged
 2024-08-19 11:14:31 +02:00
Andreas Fabri 12468ccf4a Address #8401 2024-08-09 11:32:26 +01:00
Jane Tournois fa97ae8612 add missing not-nullptr check 2024-08-08 17:31:14 +02:00
Jane Tournois 4d38aa566e improve Mesh_3 log in demo 2024-08-08 17:30:22 +02:00
Nicolas Saillant bf10f945a9 Remove deprecated Qt version checks and unused code 2024-08-07 10:00:59 +02:00
Laurent Rineau cae4cbfd98 new version of the cdt_3 plugin: can take a colorized surface_mesh as input 2024-07-29 20:10:01 +02:00
Laurent Rineau 20e2fa76ad simplification 2024-07-29 00:18:13 +02:00
Laurent Rineau c61e61e910 fix memory leaks 2024-07-28 23:43:30 +02:00
Laurent Rineau cbc249d7d6 cdt_3 plugin 2024-07-28 01:03:21 +02:00