Commit Graph

1913 Commits

Author SHA1 Message Date
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
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
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
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 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
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
Sébastien Loriot 3176178224 fix compilation issues 2023-11-06 11:43:29 +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
Mael Rouxel-Labbé 847795ec00 Hide cavity behind a named parameter 2023-10-17 13:01:18 +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
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
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
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
Ivan Paden eb2a023c31 Merge PR #6760 into gsoc2023-adaptive_remesh-ipadjen 2023-05-21 08:50:10 +02:00
Andreas Fabri d076b250ee CGAL: Enable user to provide set_use_assertions() 2023-05-12 11:01:11 +01:00
Laurent Rineau 36b3491672 add a new test case vfefv for the simplex traverser
For the moment, that new test fails.
2023-05-05 15:30:43 +02:00
Laurent Rineau 5893f7f4c4 Introduce Base_with_time_stamp 2023-05-05 14:43:35 +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
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
Sébastien Loriot e0eac4f388 Merge remote-tracking branch 'cgal/master' into HEAD 2023-05-03 18:37:09 +02:00
Laurent Rineau 1b84329710 Merge pull request #7229 from GilesBathgate/General-safe_bool_idiom-GilesBathgate
Remove use of the safe-bool idiom, replace with explicit operator bool
2023-05-03 15:05:45 +02:00