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
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
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
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
Laurent Rineau
fcc574c24c
better debug messages
2023-06-29 17:03:16 +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
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
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
Laurent Rineau
7a55a30b31
Merge remote-tracking branch 'afabri/STL_extension-Fix_Prevent_deref-GF' into Triangulation_3-CDT_3-lrineau
...
# Conflicts:
# Kernel_23/include/CGAL/Kernel/function_objects.h
# Kernel_23/include/CGAL/Kernel/interface_macros.h
# Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt
2023-05-02 16:05:54 +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
5c339515cf
Merge branch 'CGAL-rename_ctest_test_names-GF' into Triangulation_3-CDT_3-lrineau
...
# Conflicts:
# Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
# Triangulation_3/benchmark/Triangulation_3/CMakeLists.txt
2023-03-15 14:32:28 +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
Laurent Rineau
e03279ec13
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
2023-03-08 16:54:47 +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
Sébastien Loriot
9242a810c4
Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau
2023-02-07 11:31:55 +01:00
Laurent Rineau
cddb01ab68
Merge pull request #7253 from lrineau/Triangulation_2-improve-CDT_2_debugging-GF
...
STL_Extension/Triangulation_2: improve CDT_2 debug messages
2023-02-06 14:17:40 +01:00
Laurent Rineau
e8d1095526
Use Output_rep to display debug info
2023-02-06 10:00:58 +01:00
Laurent Rineau
bf6d67951c
Introduce Base_with_time_stamp
2023-02-06 10:00:55 +01:00
Laurent Rineau
d3cbf432ec
Merge pull request #7201 from GilesBathgate/General-remove_boost_lexical_string_cast-GilesBathgate
...
Replace use of boost::lexical_cast<std::string> with std::to_string
2023-02-02 10:58:17 +01:00
Sven Oesau
d5fa4491a3
update on documentation
2023-02-01 11:32:17 +01:00
Sébastien Loriot
9e137bca24
Merge 'cgal/master'
2023-01-31 12:26:55 +01:00
Giles Bathgate
679ee1f870
Remove use of the safe-bool idiom, replace with explicit operator bool
2023-01-30 19:39:42 +00:00
Sven Oesau
4717cf3727
Merge branch 'master' into Kinetic_shape_reconstruction-new_package-soesau
2023-01-29 15:25:18 +01:00
Laurent Rineau
5f8930db8c
Merge branch '5.5.x-branch'
...
# Conflicts:
# Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp
# Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp
# Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp
# Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp
# Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
# Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
2023-01-27 21:16:14 +01:00
Sven Oesau
f741e3516d
addition of Kinetic_shape_partitioning_Traits_3
...
separation of Kinetic_shape_reconstruction_3 into Kinetic_shape_partitioning_3 and Kinetic_shape_reconstruction_3 (WIP)
adding Linear_cell_complex to dependencies
renaming a few parameters in KSR::Parameters_3
removal and renaming of named parameters
one pass on the documentation
2023-01-27 19:21:15 +01:00
Jane Tournois
293f851f46
rename NP detect_features to features_detector
2023-01-24 12:18:17 +01:00
Sébastien Loriot
69c21bccc3
Merge 'master'
2023-01-24 11:29:48 +01:00
Sven Oesau
4b87b331e7
Merge remote-tracking branch 'master/master' into Kinetic_shape_reconstruction-new_package-soesau
2023-01-18 14:44:02 +01:00
Mael Rouxel-Labbé
92413a6f79
Clarify resize(array) to be specific to arrays (it also matched maps and sets)
2023-01-16 14:30:04 +01:00
Giles Bathgate
22b069720a
Replace use of lexical_cast<std::string> with std::to_string
...
use std::prev in Plane_3_Triangle_3_intersection.h do to lack of
implicit header include.
2023-01-15 17:23:04 +00:00
Mael Rouxel-Labbé
4ee5f28c54
Refactor Isosurfacing_3
2023-01-14 00:00:54 +01:00
Jane Tournois
46617ad48f
add input_features named parameter
...
this way the user can
* detect features (on bbox and inside image),
AND
* provide his own features
WARNING : features MUST NOT overlap, or feature protection will endlessly loop
2023-01-13 16:13:52 +01:00
Mael
4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113
2023-01-04 10:06:45 +01:00
hoskillua
f6855fef22
single vertex computation
...
implemented single vertex curvature computation
compared against the whole mesh computation on both cases of no radius and with radius on some vertices
still need to add tests, documentation and an example file
2023-01-03 12:13:26 +02:00
Sébastien Loriot
2e0bc5ec99
Revert "Prevent_deref shall not return a reference to the iterator as it can be copied"
...
it seems to have dramatic consequences on the runtime when using Polyhedron in test_pmp_clip
for example.
This reverts commit 7c4123152b .
2022-12-22 17:25:58 +01:00
Sébastien Loriot
f372bbe7c2
make smooth an option that is OFF by default
2022-12-19 14:35:16 +01:00
Laurent Rineau
20c67be903
Merge pull request #7115 from MaelRL/T3-test_cleaning-GF
...
(Partial) Cleaning of Triangulation_3 tests
# Conflicts:
# Kernel_23/include/CGAL/Kernel/interface_macros.h
2022-12-13 15:24:38 +01:00
Andreas Fabri
39ebebdb5b
merge master
2022-12-08 16:49:09 +00:00
Mael
0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113
2022-12-06 22:21:06 +01:00
Jane Tournois
07fb42117c
add named parameters and doc
2022-12-05 15:56:56 +01:00
Laurent Rineau
e8ec440859
Merge branch 'master' into Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF
...
# Conflicts:
# STL_Extension/doc/STL_Extension/CGAL/Concurrent_compact_container.h
2022-12-05 14:51:31 +01:00
Laurent Rineau
67b5c791e9
Merge pull request #7075 from MaelRL/CGAL-Fix_some_links-GF
...
Update some links + https
2022-12-05 12:22:06 +01:00
Laurent Rineau
5443a005bd
Repair the binary I/O of CDT_3
2022-12-05 09:56:14 +01:00
Mael
da0b13699c
Merge branch 'master' into Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF
2022-12-02 23:19:29 +01:00
Andreas Fabri
8ddf7848a0
forward call instead of duplicated code
2022-11-30 10:03:45 +00:00
Andreas Fabri
699454ae84
STL Extensions: Correct spelling
2022-11-29 13:22:00 +00:00
Andreas Fabri
7babddf443
PMP: Replace parameter with named parameter
2022-11-29 12:45:47 +00:00
Laurent Rineau
5c943e558c
Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
...
Fix autotest_cgal_with_ctest
2022-11-25 10:15:07 +01:00
Laurent Rineau
b363b7e4af
Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
...
Fix autotest_cgal_with_ctest
2022-11-25 10:14:18 +01:00
Mael Rouxel-Labbé
b5c21e1f5d
Http -> https + update some dead links
2022-11-23 18:54:37 +01:00
Sébastien Loriot
fd00ce2d02
seems that the no_parameter function is no longer needed
2022-11-21 16:02:04 +01:00
Sébastien Loriot
7322c7908d
try to workaround warnings
2022-11-21 14:09:08 +01:00
hoskillua
e302b02f76
Docs: adding bibtex, ack of DGtal, Authors + Renaming vars + minor fix
...
+ removing last commit's approach
2022-11-19 11:02:26 +02:00
Sébastien Loriot
4d797b55c4
try working around a warning
2022-11-17 19:03:30 +01:00
albert-github
eed54a0ae5
spelling corrections
...
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
2022-11-15 18:45:39 +01:00
albert-github
3674c937f7
spelling corrections
...
Some spelling corrections (Directories starting with `M`-` N`),
some backward work
some forward work
2022-11-15 15:21:01 +01:00
Laurent Rineau
ac44c7138d
Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau
2022-11-14 10:26:41 +01:00
Laurent Rineau
2e90313b07
In cpp20 namespace: CGAL::cpp20::remove_cvref
2022-11-09 10:50:01 +01:00
hoskillua
866287a98e
minor naming conventions fixes
2022-11-08 20:13:04 +02:00
Jane Tournois
4ebbe922bd
Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF
...
# Conflicts:
# BGL/include/CGAL/boost/parameter.h
# Installation/CHANGES.md
# Mesh_3/doc/Mesh_3/CGAL/Labeled_mesh_domain_3.h
# Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
+ fix compilation
+ prepare for using detect_features
2022-11-08 16:17:33 +01:00
Laurent Rineau
92d8d1c805
Merge remote-tracking branch 'cgal/master' into CGAL-allow_Epick_with_float-GF
...
# Conflicts:
# Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
2022-11-08 12:11:06 +01:00
Laurent Rineau
8c9281f440
Merge pull request #6642 from sloriot/gsoc2022-boost_np
...
Replace usage of Boost parameters with CGAL named function parameters
2022-11-07 10:08:38 +01:00
Sébastien Loriot
a9162809c4
fields should be taken by const ref
2022-10-31 10:18:39 +01:00
Laurent Rineau
d24b180293
Merge branch 'master' into gsoc2022-boost_np
2022-10-28 15:39:36 +02:00
Laurent Rineau
51a1179d3b
Add c++20 std::remove_cvref, for convenience
...
@mglisse Next time you need it... it is now here.
2022-10-28 12:07:58 +02:00
Sébastien Loriot
0cac6a9da8
Merge remote-tracking branch 'sloriot/PMP-decimation' into PMP-decimation
2022-10-25 14:55:57 +02:00
Sébastien Loriot
7c4123152b
Prevent_deref shall not return a reference to the iterator as it can be copied
...
iterator being taken by copy usually, if a function takes a
an iterator by copy and that function returns the reference
type of the deref operator then a reference to a temporary
will be returned.
2022-10-24 17:58:52 +02:00
Sébastien Loriot
9179a2d41b
fix conversion warning
2022-10-24 09:17:40 +02:00
Sébastien Loriot
2285a79148
fix warning
2022-10-21 09:31:03 +02:00
Sébastien Loriot
4ca779d991
fix warning
2022-10-20 11:22:40 +02:00
Sébastien Loriot
645e33aa56
fix warnings
2022-10-19 17:00:03 +02:00
Sébastien Loriot
40c1fdc03d
use MSVC overload for everybody
...
clang master also have issue with the generic variadic versions
2022-10-18 06:05:13 +02:00
Andreas Fabri
c04dceb71d
Merge master
2022-10-14 14:40:58 +01:00
Andreas Fabri
469a0362b5
Take Laurent's review into account
2022-10-14 11:34:34 +01:00
Laurent Rineau
b232f4bcfd
Merge pull request #6942 from sloriot/CGAL-header_clean_up
...
Clean up in headers
2022-10-13 15:17:39 +02:00
Mael Rouxel-Labbé
2c23a6d5c5
Revert back to wrapping result_type to distinguish FT-necessary operator()s
2022-10-12 21:24:59 +02:00
Sébastien Loriot
56eb3c59e1
apply suggestions from review
2022-10-11 14:50:50 +02:00
Andreas Fabri
def163afc2
Update STL_Extension/include/CGAL/assertions.h
...
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-10-07 14:25:18 +02:00
Andreas Fabri
fa3f8a5872
Do the test if we want to assert at runtime only when CGAL_ENABLE_DISABLE_ASSERTIONS_AT_RUNTIME is defined
2022-10-07 11:21:02 +01:00
Sébastien Loriot
f3d0d76f6b
add or move include guards
2022-10-06 15:35:41 +02:00
Sébastien Loriot
c0ff903d21
fix default values
2022-10-05 21:41:20 +02:00
Andreas Fabri
9b357c6aff
Reintroduce the runtime switch to enable/disable assrtions
2022-10-04 10:35:05 +01:00
Sébastien Loriot
fc4c86a491
try to work around MSVC 2015 bugs...
2022-09-30 15:54:30 +02:00
albert-github
39c752dfd1
Update STL_Extension/include/CGAL/In_place_list.h
...
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-09-29 10:32:10 +02:00