Commit Graph

2134 Commits

Author SHA1 Message Date
Jane Tournois 026850cf97 use initial points vector 2024-09-19 12:24:18 +02:00
Jane Tournois ce9cd9e596 wip PR https://github.com/CGAL/cgal/pull/7798 2024-09-17 18:04:40 +02:00
Andreas Fabri 54a5a10b8e resolve merge conflict 2024-09-10 08:40:22 +01:00
Andreas Fabri 82805a0c69 Re-add the fix 2024-09-10 08:35:23 +01:00
Andreas Fabri 726b9c9485 Show the problem in a test 2024-09-10 08:34:52 +01:00
Andreas Fabri 2983aa2ae3 Merge remote-tracking branch 'cgal/master' into Frechet-dev 2024-09-09 12:06:15 +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 22151a582f STL_extension: Add conversion operator 2024-09-08 12:26:21 +01:00
Sébastien Loriot 4cf1f4b214 CONFIG options is only needed if a FindXXX.cmake exists 2024-09-04 14:48:07 +02:00
Jane Tournois 3f6083e6ff use CGAL::OpenMesh_support in examples and tests 2024-08-27 14:06:16 +02:00
Laurent Rineau 600c63aca1 fix compilation with C++17 2024-07-09 01:37:41 +02:00
Laurent Rineau ed4fb14f74 merge master (WIP: need #8273) 2024-07-01 16:38:56 +02:00
Laurent Rineau e20cee0fcb new version, after review 2024-07-01 16:02:45 +02:00
Mael Rouxel-Labbé 67aba3fefe Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-06-20 10:18:49 +02:00
Sébastien Loriot 9e2f375d10 check if Kernel provides the nested type 2024-06-19 11:21:44 +02:00
Laurent Rineau 089cb17bcf
Poisson: fix dependencies (#8282) 2024-06-13 12:55:34 +02:00
Laurent Rineau 6f4b598b6a Merge pull request #8278 from albert-github/feature/bug_spell_20240511
Spelling correction
2024-06-13 12:48:43 +02:00
Sébastien Loriot 86866e232e remove Surface_mesher from doc deps 2024-06-12 20:34:54 +02:00
Laurent Rineau 1b534cd347 Merge pull request #8248 from sloriot/CGAL-deprecate_Surface_mesher
deprecate Surface_mesher package
2024-06-12 10:06:14 +02:00
Laurent Rineau 32893b91c0 Merge pull request #8263 from lrineau/CGAL-update_minimal_cmake-GF
cmake_minimum_required(VERSION 3.12...3.29)
2024-06-12 10:06:12 +02:00
albert-github c35a0a7f11 Spelling correction
Spelling correction due to updated dictionary.
(dictionary was updated after the previous spelling correction :-( )
2024-06-11 10:12:12 +02:00
Laurent Rineau 3a223ebd1e cmake_minimum_required(VERSION 3.12...3.29) 2024-06-06 20:19:44 +02:00
Laurent Rineau 6c6814dd2f ...and sort the files 2024-06-06 10:17:23 +02:00
Laurent Rineau 76a829e6d4 move manifold tags to <CGAL/tags.h> 2024-06-05 19:08:29 +02:00
albert-github 36c8b7589d Spelling corrections
Last batch (for now) of spelling corrections in doxygen and normal comments
2024-05-31 19:05:34 +02:00
Sebastien Loriot d06a57a292
Mesh_3 edge_distance criterion : an upper bound for the distances of the feature edge to the input feature (#7532)
## Summary of Changes

Fixes issue #5110.
Adds a edge_distance criteria to the mesh generation process.
This criteria is an upper bound for the distance from the edge to the 1D
feature.

## Release Management

* Affected package(s): Mesh_3
* Issue(s) solved (if any): fix #5110
* Link to small feature page :
[Mesh_3_edge_distance_criteria](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Mesh_3_edge_distance_criteria)
* Link to compiled documentation
[*here*](https://cgal.github.io/7532/v1/Manual/index.html):
*
[Mesh_edge_criteria_3](https://cgal.github.io/7532/v1/Mesh_3/classCGAL_1_1Mesh__edge__criteria__3.html)
  * [Mesh_criteria_3](https://cgal.github.io/7532/v1/Mesh_3)
2024-05-27 10:58:15 +02:00
Sebastien Loriot 596fa09e20
Kinetic Shape Partition (#7198)
PR for Kinetic Partitioning and Reconstruction feature.

* Affected package(s): Kinetic Partitioning and Reconstruction
* Issue(s) solved (if any): 
* Feature/Small Feature (if any):
[link](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Kinetic_Shape_Partition_3)
* Link to compiled documentation:
[link](https://cgal.github.io/7198/v0/Manual/packages.html#PkgKineticSpacePartition)
* License and copyright ownership:  GeometryFactory/Inria

**TODO:**
- [x] check branch size (for @sloriot)
2024-05-26 17:51:49 +02:00
Sébastien Loriot ddbd2e6818 Merge remote-tracking branch 'cgal/master' 2024-05-24 14:18:24 +02:00
Laurent Rineau 0c0b22ba92 add tests and assertions for the timestamper 2024-05-23 16:35:54 +02:00
Laurent Rineau 6160887748 fix warning
```
include\CGAL/Compact_container.h(443): warning C4101: 'ts': unreferenced local variable
```

https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-6.0-Ic-248/Minkowski_sum_2/TestReport_Christo_MSVC2017-Debug-64bits.gz
2024-05-22 12:22:56 +02:00
Laurent Rineau 70464ea107 Merge remote-tracking branch 'afabri/STL_extension-Fix_Prevent_deref-GF' into pr/lrineau/8170 2024-05-21 18:55:11 +02:00
Laurent Rineau 797c056577 Prevent_deref, major changes
Now the second parameter is the `reference` type and no longer the `value_type`.
2024-05-21 08:53:48 +02:00
Laurent Rineau e96aaf37ad Merge branch 'master' into pr/afabri/7410 2024-05-17 23:03:55 +02:00
Laurent Rineau e9fb0190c3 Merge pull request #7373 from sloriot/Kernel-Perfect_forwarding
Add some perfect forwarding in the Kernel
2024-05-15 16:12:23 +02:00
Andreas Fabri 008752cedc Use macro CGAL_NO_UNIQUE_ADDRESS 2024-05-13 11:01:36 +01:00
Andreas Fabri ffc5541ce7 CGAL_USE 2024-05-13 10:50:50 +01:00
ange-clement 8575f53583 Doc upgrades + simplified initial_points_generator parameter + fixed memory leaks 2024-05-02 17:29:23 +02:00
ange-clement 50dfc18d4a Merge branch 'Mesh-3-rework-make-mesh-point-initialization-2-aclement' of https://github.com/ange-clement/cgal into Mesh-3-rework-make-mesh-point-initialization-2-aclement 2024-05-02 17:19:57 +02:00
ange-clement fa6e044414 Merge branch 'master' of https://github.com/CGAL/cgal into Mesh-3-rework-make-mesh-point-initialization-2-aclement 2024-05-02 14:47:50 +02:00
Andreas Fabri 10e9de8e04 Move CGAL_USE(1) 2024-04-30 09:29:30 +01:00
Laurent Rineau 0095302f2d fix the test for buggy MSVC 2017 2024-04-30 10:18:45 +02:00
Laurent Rineau 9db8b7f17b remove extra include 2024-04-26 16:41:01 +02:00
Laurent Rineau d9d5a02375 fix CC time_stamper 2024-04-26 16:39:01 +02:00
Laurent Rineau 488668b54b remove less_cpp14 2024-04-26 16:38:09 +02:00
Laurent Rineau 33c3d22bf8 simpler timestamp system 2024-04-26 16:36:39 +02:00
Laurent Rineau ec1d97bea9 fix the timestamp system 2024-04-26 16:36:39 +02:00
Laurent Rineau ce58f38b76 move With_point_and_info_tag to Compact_container.h 2024-04-26 16:36:33 +02:00
Laurent Rineau 4d95e4c987 fix a compilation error with C++<20 2024-04-26 16:35:21 +02:00
Laurent Rineau 11402dfeb9 Add With_offset_tag 2024-04-26 16:35:14 +02:00
Laurent Rineau 69aa7b878b use using instead of typedef (and use base cstr) 2024-04-26 16:34:00 +02:00
Laurent Rineau 7579026503 add the last static_assert to the test 2024-04-26 16:31:23 +02:00
Andreas Fabri 3ce808553b Add issue 2024-04-26 16:29:16 +02:00
Laurent Rineau ad30644ed5 add CGAL::Scope_exit
Example of use:

```c++
    Scope_exit guard{[&] {
      for(auto v : region_vertices) {
        v->clear_mark(Vertex_marker::REGION_BORDER);
        v->clear_mark(Vertex_marker::REGION_INSIDE);
      }
    }};
```

with CTAD, or:

```c++
    auto cleanup_tds_data = make_scope_exit([&] {
      for(auto c : cells) {
        c->tds_data().clear();
      }
    });
```
2024-04-26 16:10:23 +02:00
Laurent Rineau 4c75012cca oformat(x, tag) passed the tag value to the Output_rep
That allows to pass an integral offset to the displayed time stamps.

The goal is to set it to -1, to display vertices IDs that are identical
to the input vertices indices of the `Surface_mesh``.
2024-04-26 13:29:31 +02:00
Laurent Rineau 952d34c6ea cosmetic changes (indent, spaces, naming) 2024-04-26 13:09:05 +02:00
Andreas Fabri 53b438eeeb STL_extension: Add parameter for value type to Prevent_deref 2024-04-26 13:08:06 +02:00
Laurent Rineau 98f1e53020 Improve I/O
- `IO::oformat` can display triangulations vertex handles
  with point, using `With_point_tag{}` as second argument,

- improve the compatibility with C++20 `<format>`: now the precision
  can be specified in the format string.

Backport: master
2024-04-26 12:05:08 +02:00
Laurent Rineau 15349f0bda simplify the code for MSVC 2017 (compiler bug_ 2024-04-26 10:39:41 +02:00
Laurent Rineau 5eeeb649e0 remove CGAL::cpp17, useless now that CGAL requires C++17 2024-04-25 09:17:57 +02:00
Laurent Rineau 0fa27bc857 Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2024-04-24 16:51:27 +02:00
Laurent Rineau f305159a26 Merge remote-tracking branch 'cgal/master' into pr/sloriot/7373 2024-04-23 14:37:29 +02:00
Laurent Rineau 940a7ebe9f fix make_array with is_convertible_without_narrowing 2024-04-23 14:29:33 +02:00
Laurent Rineau ca1f11d715 Add CGAL::is_convertible_without_narrowing
... and `CGAL::cpp20::type_identity`.
2024-04-23 13:33:07 +02:00
Laurent Rineau aad04f71d3 fix CC time_stamper 2024-04-22 14:23:24 +02:00
Laurent Rineau 2bb3f9a0d3 make_array is not useful here 2024-04-19 17:24:24 +02:00
Laurent Rineau 736ab7a555 make_array now use perfect forwarding, and remove fwd_make_array 2024-04-19 16:47:47 +02:00
Laurent Rineau 4206382ac7 fix the doc 2024-04-19 16:46:26 +02:00
Jane Tournois c19be601fc Merge remote-tracking branch 'cgal/master' into Mesh-3-edge-distance-criterium-aclement 2024-04-16 14:39:43 +01:00
Laurent Rineau 561256ee0b use override instead of virtual 2024-04-15 15:37:12 +02:00
Laurent Rineau 8250d8636a add CGAL::Scope_exit
Example of use:

```c++
    Scope_exit guard{[&] {
      for(auto v : region_vertices) {
        v->clear_mark(Vertex_marker::REGION_BORDER);
        v->clear_mark(Vertex_marker::REGION_INSIDE);
      }
    }};
```

with CTAD, or:

```c++
    auto cleanup_tds_data = make_scope_exit([&] {
      for(auto c : cells) {
        c->tds_data().clear();
      }
    });
```
2024-04-11 17:38:48 +02:00
Laurent Rineau d02457a9a5 make_sorted_pair, for any aggregate with 2 members 2024-04-10 11:57:33 +02:00
Jane Tournois 61d4de64b0 Merge remote-tracking branch 'cgal/master' into Tet_remeshing-with_sizing_field-jtournois 2024-04-09 12:45:48 +01:00
Sébastien Loriot f2a2051911 do not use deprecated include path 2024-04-05 19:00:01 +02:00
ange-clement da690fda11 Fixed warning unused variables 2024-04-05 11:09:33 +02:00
ange-clement 5b0f1fc4c2 Merge branch 'master' of https://github.com/CGAL/cgal into Mesh-3-rework-make-mesh-point-initialization-2-aclement 2024-03-29 16:46:24 +01:00
ange-clement e64e28d5ef Made initial_point parameter work with any Range
With doc and example (
 example "mesh_3D_image_with_initial_points.cpp" has been renamed to  "mesh_3D_image_with_image_initialization.cpp")
2024-03-29 16:29:07 +01:00
ange-clement 3cfea618e5 as in PR #7844, removed _sizing_field parameter for edge_distance. 2024-03-28 11:39:33 +01:00
ange-clement 70fd9113e7 Merge branch 'master' of https://github.com/CGAL/cgal into Mesh-3-edge-distance-criterium-aclement 2024-03-28 11:36:39 +01:00
hoskillua 916e5f55c5 Making PostProcessing QEM Optional (np) 2024-03-28 11:45:44 +02:00
Laurent Rineau 1926ffd619 Merge remote-tracking branch 'cgal/master' into Kernel-Perfect_forwarding 2024-03-27 17:00:45 +01:00
Laurent Rineau 87bc0c8ad1 C++17 is now required since CGAL-6.0 2024-03-27 11:05:41 +01:00
Sven Oesau 490c99f32b Merge remote-tracking branch 'cgal/master' into Kinetic_shape_reconstruction-new_package-soesau 2024-03-26 17:29:04 +01:00
Sébastien Loriot 38339b7e4e Merge remote-tracking branch 'cgal/master' into HEAD 2024-03-25 16:14:08 +01:00
Mael Rouxel-Labbé 89a5d30069 Fix template parameter of specialization + const correctness 2024-02-27 15:55:18 +01:00
Mael Rouxel-Labbé d6240a6098 Add name parameter for Isosurfacing_3 2024-02-23 10:41:02 +01:00
Laurent Rineau b112f2db75 simpler timestamp system 2024-02-22 13:40:58 +01:00
Laurent Rineau 971082296c fix the timestamp system 2024-02-21 12:07:55 +01:00
Laurent Rineau 4bef1ac665 move With_point_and_info_tag to Compact_container.h 2024-02-13 13:04:13 +01:00
Jane Tournois b48760af26 use do_not_triangulate_faces
a NP that already existed before this PR
2024-02-12 17:08:46 +01:00
Jane Tournois 6ed6aa681a improve add_bbox using make_hexahedron and Iso_cuboid_3 2024-02-12 16:32:52 +01:00
Laurent Rineau f984af0a6c fix a compilation error with C++<20 2024-01-22 23:03:53 +01:00
Laurent Rineau 73c5a2cf5f Add With_offset_tag 2024-01-16 15:27:48 +01:00
Laurent Rineau f753446633 oformat(x, tag) passed the tag value to the Output_rep
That allows to pass an integral offset to the displayed time stamps.

The goal is to set it to -1, to display vertices IDs that are identical to the input vertices indices of `the Surface_mesh`.
2024-01-15 09:45:25 +01:00
Mael Rouxel-Labbé d483b3bdfd Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-01-09 13:52:46 +01:00
Laurent Rineau 06288f3f04 improve the code reproducibility 2024-01-05 16:38:53 +01:00
Jane Tournois 9e69592328 Merge remote-tracking branch 'cgal/master' into Tet_remeshing-wip-jtournois 2024-01-04 09:28:51 +00:00
Jane Tournois c315deec6e Merge branch 'Tet_remeshing-with_sizing_field-jtournois' into Tet_remeshing-wip-jtournois
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_plugin.cpp
#	Tetrahedral_remeshing/doc/Tetrahedral_remeshing/examples.txt
#	Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt
#	Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h
#	Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/split_long_edges.h
#	Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h
2024-01-04 10:25:54 +01:00
Sebastien Loriot caecbe29c7
Replace boost::mpl (#7813)
- `boost::mpl::if_` --> `std::conditional`
- `boost::enable_if` -> `std::enable_if`
- `boost::mpl::and_` -> `&&`
- `boost::mpl::or_` -> `||`
- `boost::constant::bool_` -> `std::bool_constant`
- ...
2023-12-26 17:33:36 +01:00
Laurent Rineau 9a944e563c Merge remote-tracking branch 'cgal/master' into PMP-BF_autorefine
# Conflicts:
#	Installation/CHANGES.md
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
2023-12-13 15:57:30 +01:00
Laurent Rineau 222fafc411 Merge pull request #7805 from MaelRL/AW3-Resume_aw3-GF
Alpha wrapping: re-use and resume functionalities
2023-12-11 13:56:29 +01:00
Laurent Rineau ef881a1aa9 Merge pull request #7844 from janetournois/Mesh_3-remove_unused_criteria-GF
Mesh_3 - `Mesh_criteria_3` cleaning
2023-12-11 13:56:26 +01:00
Laurent Rineau b4820031eb Merge pull request #7911 from sloriot/M3-params_errors
Mesh_3: Fix copy/paste errors in parameters
2023-12-11 13:54:47 +01:00
Sébastien Loriot d75e4f2f54 Merge remote-tracking branch 'cgal/master' into PMP-BF_autorefine 2023-12-08 13:26:06 +01:00
Mael Rouxel-Labbé dd0cc2ee5c Fix a few copy-paste bugs 2023-12-05 22:15:01 +01:00
Jane Tournois 8a2b2bbcb3 add hidden named parameter for extra flip-and-smooth iterations 2023-12-01 16:13:46 +01:00
Mael Rouxel-Labbé 1dc0ba2c3a Merge remote-tracking branch 'cgal/master' into AW3-Resume_aw3-GF 2023-11-29 16:53:37 +01:00
Sébastien Loriot 6cd28f751e use std integral_constant 2023-11-23 09:39:17 +01:00
Sebastien Loriot 5c62ae44c8
PMP::isotropic_remeshing - add variable sizing field (#4891)
## Summary of Changes

This PR introduces the possibility to chose a variable sizing field for
isotropic remeshing.

## Release Management

* Affected package(s): PMP
* Feature/Small Feature (if any):
[Here](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Curvature-adaptive_remeshing)
-- **pre-approval on 2023/10/24**
* Link to compiled documentation (obligatory for small feature) [*wrong
link name to be changed*](httpssss://wrong_URL_to_be_changed/Manual/Pkg)
* License and copyright ownership: unchanged
* Depends on #6760

## TODO:
- [x] check branch size (for @sloriot)
- [x] handle the update of the interpolated curvature branch (for
@sloriot)
2023-11-19 16:35:32 +01:00
Laurent Rineau 223454ab57 Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2023-11-16 16:01:01 +01:00
Laurent Rineau 7b8c90ec3b
Merge branch 'master' into Mesh-3-edge-distance-criterium-aclement 2023-11-16 14:53:25 +01:00
Laurent Rineau 472fa14be9
Surface_mesh_approximation: Deal with boundary edges (#7574)
## Summary of Changes

Add a named parameter to distinguish between the approximation error for
boundary and non-boundary edges of the input mesh.

## Release Management

* Affected package(s): Surface_mesh_approximation
* Feature/Small Feature (if any): 
* Link to compiled documentation (obligatory for small feature) [*wrong
link name to be changed*](httpssss://wrong_URL_to_be_changed/Manual/Pkg)
* License and copyright ownership:  unchanged
2023-11-16 14:51:05 +01:00
Ivan Pađen 627a36fac7 Combining tangential relaxations in one function WIP 2023-11-16 09:37:41 +01:00
Sven Oesau 18aa5f6125 bugfix 2023-11-15 19:11:00 +01:00
Sven Oesau 79b451a511 added two missing named parameters 2023-11-15 18:52:14 +01:00
Laurent Rineau 69d9025736 Merge pull request #6760 from hoskillua/gsoc2022
GSoC2022 - Interpolated Corrected Curvatures

# Conflicts:
#	Installation/CHANGES.md
2023-11-15 16:00:36 +01:00
ange-clement c9eabbf101 Fix demo errors 2023-11-10 18:20:58 +01:00
ange-clement ec7a6ac876 Added meshing parameter : initial_points 2023-11-10 17:06:04 +01:00
Sébastien Loriot 4344c3cc27 replace boost::mpl::or_ 2023-11-10 16:34:19 +01:00
Sébastien Loriot 2277013d84 replace boost::mpl::and_ 2023-11-10 16:19:26 +01:00
Sven Oesau 2b254121fe merging LCC creation, point on face projection for reconstruction and fixed t-functions 2023-11-08 13:54:41 +01:00
ange-clement ca7548b341 Removed example +
Modified example mesh_3D_image_with_custom_initialization to use new API
+ Changed InitialPointsGenerator concept : outputs
std::tuple<Weighted_point_3, int, Index> instead of
std::tuple<Point_3, int, Index>
+ custom initialization will be called even if a feature detector is set
2023-11-07 15:25:50 +01:00
Laurent Rineau 25de4ee6b7 Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2023-11-07 15:02:43 +01:00
Sébastien Loriot 3176178224 fix compilation issues 2023-11-06 11:43:29 +01:00
ange-clement 455e8654f7 Fix error 2023-11-06 09:48:35 +01:00
ange-clement ea11f328d6 Doc update +
Changed initial_point_generator default parameter +
Fix previous change from pair to tuple
2023-11-03 17:44:05 +01:00
Jane Tournois 093660ce43 remove unused and undocumented criterion cell_radius_edge 2023-11-02 14:27:31 +01:00
Jane Tournois 361c5c5009 remove all the _sizing_field parameters that have never been used
they were removed from the documentation before being merged in the master branch
see SVN commit
1614a89e32
2023-11-02 14:13:07 +01:00
ange-clement d7f110e428 Changed InitialPointsGenerator concept :
The points' dimensions are also outputed by the initialisation.
2023-10-31 15:34:42 +01:00
hoskillua bbc5a345b8 adaptive clustering first version 2023-10-31 09:00:25 +01:00
ange-clement ec5539eac3 Revision 1 :
Doc fix +
Deleted default_initial_points_generation() +
Created Construct_initial_points_gray_image.h
2023-10-25 14:57:48 +02:00
ange-clement e5d26511dc Fix unvoluntary copy 2023-10-17 17:54:27 +02:00
ange-clement 268fd8b53c Fix CI confusion between typedef and struct 2023-10-17 15:47:31 +02:00
ange-clement f2af65444d Use parameters instead of template
Allows easier initialisation
2023-10-17 15:39:42 +02:00
Mael Rouxel-Labbé 847795ec00 Hide cavity behind a named parameter 2023-10-17 13:01:18 +02:00
ange-clement 9fc7230e64 Fix CI 2023-10-16 14:04:45 +02:00
ange-clement 0d0c1f3213 Fix CI 2023-10-16 13:26:20 +02:00
ange-clement bec5358ff1 Fix CI 2023-10-16 12:39:04 +02:00
ange-clement 3937c5df34 Implemented make_mesh_3 param :
initial_points_generator
2023-10-13 14:51:43 +02:00
ange-clement 00514ec7dc Merge branch 'master' of https://github.com/CGAL/cgal into Mesh-3-edge-distance-criterium-aclement 2023-10-10 15:06:02 +02:00
Sven Oesau 10cda49c66 Merge remote-tracking branch 'remotes/orth/orthtree-generalization' into Kinetic_shape_reconstruction-new_package-soesau 2023-09-25 12:37:38 +02:00
Sébastien Loriot 8700394122 boost::mpl::if_ -> std::conditional 2023-09-24 22:57:20 +02:00
JacksonCampolattaro 4c6084159a Add boost::span to STL_Extension for compatibility with older versions of Boost 2023-09-24 14:25:47 +02:00
Mael Rouxel-Labbé 5304f739b9 Enable restarting from a previous wrap 2023-09-20 12:57:02 +02:00
Laurent Rineau aa09a28df8 Merge remote-tracking branch 'cgal/master' into STL_extension-Fix_Prevent_deref-GF 2023-09-19 16:22:49 +02:00
Sébastien Loriot af95dae8c6 Merge remote-tracking branch 'cgal/master' into HEAD 2023-09-12 15:27:54 +02:00
ange-clement a23c9d44ca Merge branch 'master' into Mesh-3-edge-distance-criterium-aclement 2023-09-07 10:54:10 +02:00
Laurent Rineau 46923342ad Merge pull request #7576 from albert-github/feature/issue_7395
issue #7395 Improvement of layout of model relations

# Conflicts:
#	Kernel_23/doc/Kernel_23/CGAL/Vector_2.h
2023-09-07 10:48:34 +02:00
Laurent Rineau b32a8331ed Merge branch '5.6.x-branch'
# Conflicts:
#	Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
2023-09-07 10:41:33 +02:00
Laurent Rineau a8fae00bf1 missing header 2023-09-07 10:35:03 +02:00
Sébastien Loriot a528464f31 Merge branch 'cgal/master' into PMP-BF_autorefine 2023-08-28 13:44:44 +02:00
hoskillua a94a7337c2 Merge remote-tracking branch 'upstream/master' into gsoc2022 2023-08-25 14:51:46 +03:00
Ivan Paden 613b0a8914 Merge branch 'master' into PMP-add_sizing_in_isotropic_remeshing-GF 2023-08-21 22:18:37 +02:00
albert-github 93001308f4 Merge branch 'master' into feature/issue_7395
# Conflicts:
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h
2023-08-18 11:10:42 +02:00
Sébastien Loriot eada3ee8ca Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl' 2023-08-14 14:19:25 +02:00
Sébastien Loriot 5db243629a try working around an error with MSVC2017
`error C2338: Sorry: std::any doesn't support over-aligned types at this time.`
2023-08-14 14:02:39 +02:00
Jane Tournois b7aeab378f Merge remote-tracking branch 'cgal/master' into PMP-add_sizing_in_isotropic_remeshing-GF 2023-08-01 12:22:15 +02:00
Laurent Rineau 24b9d126da Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau
# Conflicts:
#	STL_Extension/include/CGAL/iterator.h
#	Triangulation_3/test/Triangulation_3/CMakeLists.txt
2023-07-18 15:37:52 +02:00
albert-github ad41766454 issue #7395 Improvement of layout of model relations
Corrected `cgalModels` to `cgalHasModes` inside `cgalHasNodelsBegin` / `cgalHasModelsEnd`
2023-07-18 13:23:37 +02:00
Andreas Fabri e5ec58b920 Enable to fix the coordinates of boundary vertices 2023-07-17 16:43:12 +01:00
albert-github de3ba0f47c Merge remote-tracking branch 'upstream/master' into feature/issue_7395 2023-07-17 10:17:34 +02:00
albert-github 4e5578d469 issue #7395 Improvement of layout of model relations
- based on review
2023-07-15 13:12:15 +02:00
albert-github a0320dd7b4 Merge branch 'master' into feature/issue_7395
# Conflicts:
#	Polyhedron/doc/Polyhedron/Concepts/PolyhedronItems_3.h
2023-07-13 10:33:18 +02:00
Laurent Rineau d10e9387c2 Merge branch 'master' into CGAL-add_missing_test
# Conflicts:
#	STL_Extension/test/STL_Extension/test_skiplist.cpp
2023-07-12 15:48:42 +02:00
Laurent Rineau 4a2c7a668d Merge pull request #7571 from albert-github/feature/issue_7454
issue #7454 Consistency of BigO notations
2023-07-12 15:29:56 +02:00
albert-github 301728a8a9 issue #7395 Improvement of layout of model relations
- Completed the cgalModels part
2023-07-09 12:43:36 +02:00
Sébastien Loriot 01ecc02e71 fix conversion warnings 2023-07-06 17:51:07 +02:00
Sébastien Loriot d55638cfd1 remove unused variable 2023-07-06 17:49:14 +02:00
albert-github ee2a55279d issue #7395 Improvement of layout of model relations
- Completed the cgalHasModel part
- corrected spelling of `Has Model` and `Is Model Of` to `Has model` and `Is model of`
2023-07-06 17:35:34 +02:00
Sébastien Loriot b86a1fed32 Merge remote-tracking branch 'sloriot/PMP-BF_autorefine' into PMP-BF_autorefine 2023-07-05 17:59:29 +02:00
Laurent Rineau 04077e9f4f Merge pull request #7535 from lrineau/Triangulation_3-fix_simplex_traverser-GF-CGAL-5.6
fix simplex traverser for CGAL 5.6
2023-07-05 16:32:36 +02:00
Sébastien Loriot b66afab814 Merge remote-tracking branch 'sloriot/CGAL-using_c++17_stl' into HEAD 2023-07-05 11:29:35 +02:00
Andreas Fabri 75a0366160 Surface_mesh_approximation: Deal with boundary edges 2023-07-05 08:44:38 +01:00
albert-github b3af96caa1 issue #7454 Consistency of BigO notations
Create `cgalBigO` marco and used it.
(`The macro `cgalBigOLarge` is for special situations where we need bigger round brackets)
2023-07-04 16:23:14 +02:00
Laurent Rineau fcc574c24c better debug messages 2023-06-29 17:03:16 +02:00
Andreas Fabri a9d99b3ece int -> std::size_t 2023-06-29 09:24:15 +01:00
Andreas Fabri 33969b7929 Why does this compile without the second template parameter??? 2023-06-28 11:21:16 +01:00
Sébastien Loriot 04a9026d37 make sure the iterator is bidirectional
(even if it's not strictly conforming to the C++ standard)
2023-06-28 09:58:54 +02:00
Sébastien Loriot efd8b2d38b add more missing tests 2023-06-27 11:18:20 +02:00
Sébastien Loriot 891fd47365 add missing test 2023-06-27 10:01:58 +02:00
Laurent Rineau a85ce74720 Merge branch 'Triangulation_3-fix_simplex_traverser-GF-CGAL-5.6' into Triangulation_3-CDT_3-lrineau 2023-06-22 15:28:48 +02:00
Sébastien Loriot dfc386d65b Merge branch 'master' into HEAD 2023-06-22 14:05:45 +02:00
Sébastien Loriot 7d0dd109b3 fix for variant/optional<variant> 2023-06-21 11:19:58 +02:00
Laurent Rineau ad9efd0e18 Merge branch '5.6.x-branch' into Triangulation_3-fix_simplex_traverser-GF-CGAL-5.6
# Conflicts:
#	STL_Extension/include/CGAL/Base_with_time_stamp.h
#	Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h
#	Triangulation_3/test/Triangulation_3/CMakeLists.txt
2023-06-20 16:03:30 +02:00
Laurent Rineau 367466c434 Merge branch '5.5.x-branch' into Triangulation_3-fix_simplex_traverser-GF 2023-06-20 14:48:05 +02:00
Ange Clement 53704ac50f edge_distance changed from a value to a scalar field 2023-06-20 14:40:58 +02:00
Sébastien Loriot 0ee31a5d4f remove extra parenthesis 2023-06-19 19:17:49 +02:00
Ange Clement d2b8627fba framework for edge_distance criterium 2023-06-19 12:46:17 +02:00
Sébastien Loriot f936680600 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 18:48:39 +02:00
Sébastien Loriot 640c98f21e add utility to avoid duplicate in variant + use it in SMDS_3 2023-06-15 11:34:14 +02:00
Sébastien Loriot 9cdfe70abb Merge remote-tracking branch 'sloriot/CGAL-toward_6.0' 2023-06-15 11:34:09 +02:00
Sébastien Loriot 9a0bdb5d96 boost::variant ---> std::variant 2023-06-15 10:57:10 +02:00
Sébastien Loriot 557b64e4a6 boost::any ==> std::any 2023-06-15 10:57:09 +02:00
Sébastien Loriot 604dcdc435 boost::optional => std::optional 2023-06-15 10:57:09 +02:00
Sébastien Loriot bbc4d08ee0 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 10:47:07 +02:00
Sébastien Loriot c8a88b9014 remove CGAL_static_assertion* 2023-06-15 10:42:10 +02:00
Sébastien Loriot 852b3b664b expand -CGAL_CPP17_INLINE macro 2023-06-15 10:40:54 +02:00
Laurent Rineau 01e22be3b6 Merge pull request #7496 from lrineau/Triangulation_3-fix_regular_with_TBB-GF
Regular_triangulation_3: fix another race-condition
2023-06-07 17:36:41 +02:00
Laurent Rineau 6ab1337951 Merge pull request #7496 from lrineau/Triangulation_3-fix_regular_with_TBB-GF
Regular_triangulation_3: fix another race-condition
2023-06-07 17:36:25 +02:00
Laurent Rineau 8cd8bc7b06 another fix of a race-condition 2023-06-04 20:49:02 +02:00
Sebastien Loriot 002adea3ee
CGAL: Enable user to provide set_use_assertions() (#7440)
_Please use the following template to help us managing pull requests._

## Summary of Changes

As suggested by @GilesBathgate in Issue #7222 we give the (undocumented)
possibility to a user provided function.

## Release Management

* Affected package(s): STL_Extension
* License and copyright ownership: unchanged
2023-05-22 09:20:08 +02:00