Commit Graph

1437 Commits

Author SHA1 Message Date
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
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
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
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 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
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
Andreas Fabri e5ec58b920 Enable to fix the coordinates of boundary vertices 2023-07-17 16:43:12 +01: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
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
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 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
Sébastien Loriot c1294a0eaa boost::integral_constant ---> std::integral_constant 2023-04-29 09:42:15 +02:00
Laurent Rineau 2a41598bd7 cosmetic changes (indent, spaces, naming) 2023-04-27 12:04:02 +02:00
Laurent Rineau 661512b284 add a test of CGAL::fwd_make_array 2023-04-26 16:48:30 +02:00
Sébastien Loriot a6098368a9 really move it 2023-04-26 13:24:36 +02:00
Andreas Fabri 68261eb0f1 STL_extension: Add parameter for value type to Prevent_deref 2023-04-26 10:55:59 +01:00
Sébastien Loriot 72624bb0f1 fix narrowing 2023-04-26 09:55:14 +02:00
Jane Tournois b76f640a41 Merge branch 'Mesh_3-edge_min_size-GF' into Mesh_3-min_size-jtournois
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_dialog.ui
2023-04-24 13:59:48 +02:00
Jane Tournois e30ccd2cc5 Merge branch 'Mesh_3-add_minimal_size_criterion_new-jtournois' into Mesh_3-min_size-jtournois 2023-04-24 12:56:40 +01:00
Sébastien Loriot cf45dd3d5b boost::is_base_of -> std::is_base_of 2023-04-23 22:37:07 +02:00
Sébastien Loriot b039040f73 boost::is_convertible -> std::is_convertible 2023-04-23 22:37:07 +02:00
Sébastien Loriot a1b2dd014d boost::is_pointer -> std::is_pointer 2023-04-23 22:37:07 +02:00
Sébastien Loriot d4d2225801 boost::is_reference -> std::is_reference 2023-04-23 22:37:07 +02:00
Sébastien Loriot 6fd9476cd7 boost::is_integral -> std::is_integral 2023-04-23 22:37:07 +02:00
Sébastien Loriot 390cccf63b boost::is_empty -> std::is_empty 2023-04-23 22:37:07 +02:00
Sébastien Loriot a88af6c0c6 boost::array -> std::array 2023-04-23 22:37:07 +02:00
Sébastien Loriot b99c384528 boost::remove_pointer -> std::remove_pointer 2023-04-23 22:37:06 +02:00
Sébastien Loriot 8b3acae1c7 boost::remove_reference -> std::remove_reference 2023-04-23 22:36:59 +02:00
Sébastien Loriot fa301554ce boost::remove_v -> std::remove_cv_t 2023-04-23 19:13:56 +02:00
Sébastien Loriot 61834d5a26 boost::remove_const -> std::remove_const_t 2023-04-23 19:07:54 +02:00
Jane Tournois 8c8f8294a8 fix reference type 2023-04-21 12:10:23 +02:00
Jane Tournois cb9a4c6c96 add missing reference_wrapper 2023-04-21 12:10:15 +02:00
Mael Rouxel-Labbé 1a5826f11a Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-04-17 12:48:30 +02:00
Jane Tournois 7eb9a5a0cc Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction_and_weights-GF
# Conflicts:
#	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
2023-04-07 15:11:30 +02:00
Laurent Rineau 1dce90ee79 Merge remote-tracking branch 'cgal/master' into CGAL-allow_Epick_with_float-GF 2023-04-07 10:59:51 +02:00
Sébastien Loriot a1ff847b6a add "brute-force" version of autorefine() 2023-04-06 17:54:44 +02:00
Jane Tournois 3e3f66f75d Merge remote-tracking branch 'cgal/master' into Mesh_3-add_minimal_size_criterion_new-jtournois
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
2023-04-06 12:04:47 +02:00
Sébastien Loriot cb672d4d90 Merge remote-tracking branch 'cgal/master' into PMP-decimation 2023-04-04 14:25:17 +02:00
Sébastien Loriot cfa8c2954f document the property map version of parameters 2023-03-31 14:39:33 +02:00
Laurent Rineau d3a91046a9 Merge pull request #7276 from afabri/PMP_smooth_scale-GF
PMP:  Add np for not scaling smoothed mesh
2023-03-30 18:04:34 +02:00
Sébastien Loriot 661513b16e gaussian -> Gaussian 2023-03-22 19:12:28 +01:00
Sébastien Loriot 664aa7c162 Merge remote-tracking branch 'cgal/master' into HEAD 2023-03-22 18:16:01 +01:00
Jane Tournois b52913b6cc Merge remote-tracking branch 'cgal/master' into Mesh_3-edge_min_size-GF
# Conflicts:
#	Mesh_3/doc/Mesh_3/Doxyfile.in
2023-03-20 14:07:19 +01:00
Mael Rouxel-Labbé 85911f1b64 Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-03-20 10:06:38 +01:00
Mael Rouxel-Labbé 298440062f Update weighted skeleton construction, offsetting, and extrusion to new API 2023-03-18 21:33:40 +01:00
Laurent Rineau 35a1285a12 Merge pull request #6129 from janetournois/Mesh_3-triple_line_extraction-GF
Mesh_3 - add detection of intersection lines from labeled images

# Conflicts:
#	Installation/CHANGES.md
2023-03-13 16:46:07 +01:00
Sébastien Loriot 36b448912e add a first simple post-processing step 2023-03-13 12:00:45 +01:00
Jane Tournois 818b08f331 add edge_min_size
to constrain protecting balls placement to insert no feature smaller
than the given bound
2023-03-09 15:57:08 +01:00
Sven Oesau c9a7b79530 Merge remote-tracking branch 'remotes/origin/master' into Kinetic_shape_reconstruction-new_package-soesau 2023-03-08 19:26:07 +01:00
Sébastien Loriot 33c868818f fix property map for region primitives 2023-03-07 17:55:28 +01:00
Sébastien Loriot 648377f127 fix np name + plug region growing in decimation plugin + change cosinus sign in decimate + update doc 2023-03-02 19:08:10 +01:00
Sébastien Loriot f8cc9e6bd0 rename np 2023-03-02 14:49:17 +01:00
Sébastien Loriot b1d2744821 Merge branch 'master' into PMP-decimation 2023-03-02 14:24:27 +01:00
Sébastien Loriot 6043192a90 fix CI and be more strict also on the operator() call 2023-02-28 16:46:30 +01:00
Sébastien Loriot 12465a6c40 named parameter to pass normal of patches 2023-02-27 17:13:23 +01:00
Sébastien Loriot 52ff9c4e66 add an option to not triangulate patches 2023-02-27 15:16:13 +01:00
Sébastien Loriot da39109d88 fix CI and be more strict also on the operator() call 2023-02-27 09:58:26 +01:00
Mael Rouxel-Labbé 90877e18b5 Add SLS/extrude_skeleton.h 2023-02-24 18:50:53 +01:00
Jane Tournois 17b137bf0c fix reference type 2023-02-24 17:28:40 +01:00
Jane Tournois c469c4d2ac add missing reference_wrapper 2023-02-24 15:12:54 +01:00
Jane Tournois 036ddc57cc differentiate between cref and ref in compatibility wrapper 2023-02-24 13:53:15 +01:00
Sébastien Loriot 39de8cb718 also allow non-const reference 2023-02-24 13:11:46 +01:00
Jane Tournois c6d0f90236 differentiate between cref and ref in compatibility wrapper 2023-02-24 11:18:13 +01:00
Sven Oesau 2ef678a684 Merge remote-tracking branch 'remotes/origin/master' into Kinetic_shape_reconstruction-new_package-soesau 2023-02-24 09:09:01 +01:00
Jane Tournois f08a7c95a3 wip modify weights image when feature protection is used 2023-02-23 16:42:54 +01:00
Sébastien Loriot da2efe69c7 also allow non-const reference 2023-02-23 16:32:47 +01:00
Jane Tournois d1e79542f2 wip 2023-02-23 16:10:06 +01:00
Jane Tournois 0d550a5938 Merge remote-tracking branch 'cgal/master' into pr/janetournois/7116
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
2023-02-23 13:06:59 +01:00
Jane Tournois e2296b581f fix the postprocessing weights function
add a parameter to generate_label_weights() to postprocess weights

and fix example code
2023-02-23 10:19:40 +01:00
Jane Tournois e8e3eaa7b4 Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
2023-02-21 11:05:30 +01:00
Mael Rouxel-Labbé ee13f77810 Various improvements 2023-02-20 10:08:21 +01:00
Andreas Fabri 545009ab7c PMP: Add np for not scaling smoothed mesh 2023-02-19 21:25:25 +00:00
Sébastien Loriot 640910288b Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-16 14:18:17 +01:00
Sébastien Loriot c1165a79aa rename named parameter 2023-02-16 11:25:23 +01:00
Laurent Rineau 166ff0fdc7 Try to fix compilation with MSVC++ 2023-02-14 13:28:07 +01:00
Sven Oesau d96f8ed6b0 Merge branch 'CGAL:master' into Kinetic_shape_reconstruction-new_package-soesau 2023-02-14 08:40:54 +01:00
Sébastien Loriot fbe559adc9 Merge 'cgal/master' into PMP-decimation 2023-02-14 08:33:24 +01:00
Sébastien Loriot 7e38151479 add documentation for remeshing functions + update API
code has not been updated yet
2023-02-09 16:31:00 +01:00