Commit Graph

2990 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 525338eec2 Haronize Gt/GT/etc. 2023-05-26 12:52:35 +02:00
Mael Rouxel-Labbé c3873374ce Carry the template parameter (as it should be if it were actually in use)
It is in fact CGAL::Default and unused everywhere, but it's clearer
this way.
2023-05-25 14:56:46 +02:00
Mael Rouxel-Labbé 13f8044027 Remove more (needless) doc appearances of TriangleAccessor 2023-05-25 14:56:16 +02:00
Mael Rouxel-Labbé bc45a00194 Undocument TriangleAccessor_3 and CGAL::Triangle_accessor_3 as they are unused 2023-05-25 12:08:01 +02:00
Andreas Fabri 0c29013c3d Polish 2023-05-23 09:58:41 +01:00
Andreas Fabri 79ce772e71 various 2023-05-22 18:46:09 +01:00
Andreas Fabri 95f150a16c various 2023-05-22 16:51:33 +01:00
Andreas Fabri 585dc0f424 various 2023-05-22 13:36:24 +01:00
Andreas Fabri 710219ed6d various 2023-05-22 13:12:46 +01:00
Andreas Fabri 1b4d4e0eb0 various 2023-05-22 12:49:33 +01:00
Andreas Fabri b1137e9d83 various 2023-05-22 12:19:44 +01:00
Andreas Fabri 9f241c89c5 rename template parameters 2023-05-19 18:42:56 +01:00
Andreas Fabri bf79ecd8ad fixes 2023-05-17 21:05:29 +01:00
Andreas Fabri a827d9ab67 fixes 2023-05-17 11:11:25 +01:00
Andreas Fabri 3ca05f4918 fixes 2023-05-17 09:28:25 +01:00
Andreas Fabri b6531a76d1 fixes 2023-05-16 16:22:48 +01:00
Andreas Fabri fdcdd1a9eb fixes 2023-05-16 12:50:07 +01:00
Andreas Fabri 90773e8806 fixes 2023-05-16 12:41:17 +01:00
Andreas Fabri e9583a69d0 fixes 2023-05-16 12:38:50 +01:00
Andreas Fabri 26369cb81b fixes 2023-05-16 12:33:14 +01:00
Andreas Fabri cec7c3dccc Fix some warnings 2023-05-16 11:57:32 +01:00
Andreas Fabri b3e2beddb4 merge cgal/master 2023-05-16 10:02:36 +01:00
Andreas Fabri f1780e39dd Mesh_3: Move doxygen into header file 2023-05-16 09:32:15 +01:00
Andreas Fabri 7171de7b03 Mesh_3: Move doxygen into header file 2023-05-15 21:59:09 +01:00
Andreas Fabri a940523882 Mesh_3: Move doxygen into header file 2023-05-15 15:52:35 +01: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
Mael 532b82cb9b
Merge branch 'master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-05-04 17:28:47 +02:00
Laurent Rineau 628d8ae43d Merge pull request #7307 from janetournois/Mesh_3-sizing_field_with_aabb_tree-GF
Mesh_3 - Document Sizing_field_with_aabb_tree
2023-05-04 17:22:59 +02:00
Laurent Rineau c2e24424d3 Merge pull request #7415 from janetournois/Mesh_3-triple_lines_with_sqrt-jtournois
Mesh_3 triple lines detection robustness
2023-05-04 17:22:46 +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
Jane Tournois 75806c2497 add local macro for sqrt(17)
and const split_point to make sure the same point is used twice
2023-05-02 12:39:46 +02:00
Jane Tournois dad3407b11 add local macro for sqrt(65) 2023-05-02 11:40:47 +02:00
Jane Tournois 5d0adfda43 avoid conflict with max macro on msvc 2023-05-02 10:12:57 +02:00
Jane Tournois 2f88b29cda replace multiple std::sqrt by macros
with more than 17 digits in case we have number types bigger than double
2023-04-28 17:54:07 +02:00
Jane Tournois ce738685e1 replace approximate values for sqrt(2) and similar 2023-04-28 16:12:26 +02:00
Jane Tournois b014f5ab45 fix template parameter
without that, the template parameter is 'int', deducted from third argument '0'
2023-04-25 15:45:36 +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 2f7d150531 boost::begin/end/empty/size -> std::begin/end/empty/size 2023-04-23 23:01:35 +02: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 9ed6c7acdc remove useless include 2023-04-23 22:37:07 +02:00
Sébastien Loriot e82d970d19 boost::next -> std::next 2023-04-23 22:37:07 +02:00
Sébastien Loriot 99619dc634 boost::prior -> std::prev 2023-04-23 22:37:07 +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
Sébastien Loriot fc034c6a5d boost::unit -> std::uint 2023-04-23 18:40:39 +02:00
Jane Tournois 4be918b51b it's forbidden to compare (size_t < 0) 2023-04-18 17:10:41 +02:00
Laurent Rineau 2559bb6778
Update Mesh_criteria_3.h (the note) 2023-04-17 16:35:01 +02:00
Jane Tournois 7e97a91a34 improve doc
# Conflicts:
#	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
2023-04-17 14:34:34 +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
Sébastien Loriot 9f33e64643 avoid warning 2023-04-12 09:00:24 +02:00
Laurent Rineau e5a2513921 Merge pull request #7359 from janetournois/Mesh_3-exude_mesh_3_np-jtournois
Mesh_3 - fix default parameters of `CGAL::exude_mesh_3(c3t3)`
2023-04-11 14:19:00 +02:00
Jane Tournois 662534e8f3 fix template type
avoid using "0" type, int, that would make a data corruption inside
the modified image
2023-04-07 15:52:47 +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
Jane Tournois e34cd8d938 doc 2023-04-07 14:54:29 +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
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
Jane Tournois e4ec27fc5c doc review 2023-04-03 11:29:26 +02:00
Jane Tournois eb0fc7fa05 Merge remote-tracking branch 'cgal/master' into Mesh_3-sizing_field_with_aabb_tree-GF
# Conflicts:
#	Mesh_3/include/CGAL/Sizing_field_with_aabb_tree.h
2023-03-31 15:43:23 +02:00
Jane Tournois 327527d666
Apply suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2023-03-31 14:51:58 +02:00
Laurent Rineau 6cd65d23b4 Merge pull request #7275 from lrineau/Mesh_3-improve__Sizing_field_with_aabb_tree-GF
Mesh_3: Improve Sizing_field_with_aabb_tree speed
2023-03-31 11:10:56 +02:00
Laurent Rineau 281de129ed Merge pull request #7280 from janetournois/Mesh_3-improve_initialization-jtournois
Mesh_3 - improve initialization when features are inserted
2023-03-31 11:10:54 +02:00
Jane Tournois ed3a6f966f
Apply suggestions from code review
Co-authored-by: Andreas Fabri <andreas.fabri@geometryfactory.com>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2023-03-30 11:34:50 +02:00
Jane Tournois 4b632c29ff remove NP template parameter where it's not necessary
* add CGAL_DEPRECATED
* fix ambiguity between exude_mesh_3(c3t3) (one param) versions
by removing default time_limit
2023-03-30 10:40:28 +02:00
Jane Tournois 522c04e9a3
doc
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2023-03-27 11:09:40 +02:00
Jane Tournois 7f0087ee72 doc 2023-03-24 14:10:39 +01:00
Jane Tournois 03fc6bbdb2 doc 2023-03-24 11:00:26 +01:00
Mael Rouxel-Labbé f5fd746503 Fix stack-use-after-scope error 2023-03-23 17:30:54 +01:00
Jane Tournois ac5ccbd62f Merge remote-tracking branch 'cgal/master' into Mesh_3-sizing_field_with_aabb_tree-GF
# Conflicts:
#	Mesh_3/doc/Mesh_3/PackageDescription.txt
2023-03-23 13:53:48 +01:00
Laurent Rineau 693d166835 more debug information 2023-03-22 15:58:55 +01:00
Laurent Rineau 873d98fcbf "simplify" the 6 constructors by using delegating-cstr 2023-03-22 15:50:31 +01:00
Laurent Rineau 728e013cc5 bug-fix: a one-char typo 2023-03-22 15:39:43 +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
Jane Tournois 2f591dedd9 doc 2023-03-20 13:03:12 +01:00
Jane Tournois 6ae2f004e7 doc in Mesh_criteria_3 2023-03-20 12:57:20 +01:00
Mael Rouxel-Labbé cd0c81a98a Merge remote-tracking branch 'cgal/master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-03-20 10:14:27 +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
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
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
Jane Tournois 98754f2e21 move doc to header 2023-03-09 13:07:42 +00:00
Jane Tournois 30016253ae doc 2023-03-07 13:19:18 +01:00
Jane Tournois 66636a68fc add namespace CGAL 2023-03-07 12:37:29 +01:00
Jane Tournois 09abe79562 typos 2023-03-07 09:15:23 +01:00
Jane Tournois 6bacd852bd doc
and reorganize typedefs
2023-03-06 17:23:42 +01:00
Jane Tournois 6e1dd6a4d7 reorganize header for documentation 2023-03-06 12:15:44 +01:00
Jane Tournois 9c85204d3a move doc to header and create new group for MeshDomainField_3 2023-03-03 18:05:54 +01:00
Jane Tournois 8b9c7afef7 move header 2023-03-03 15:12:56 +01:00
Jane Tournois d79493bd62 allow to give empty weights image and just ignore it 2023-02-27 16:02:14 +01:00
Jane Tournois c0b76f22ad merge postprocessing weights function in feature detection
to avoid duplicating code

- clean example code
- remove all feature detection includes from generate_label_weights.h
- duplicate polylines_to_protect() to make its name more explicit
polylines_to_protect_on_bbox()
2023-02-24 17:28:30 +01:00
Jane Tournois 4c24841aaf insert postprocessing of weights in feature detection functors 2023-02-24 12:08:40 +01:00
Jane Tournois d1e79542f2 wip 2023-02-23 16:10:06 +01:00
Laurent Rineau 6c372eabcb fix typos 2023-02-23 15:15:11 +01:00
Laurent Rineau b5cbd09708
Update Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
Co-authored-by: Jane Tournois <janetournois@users.noreply.github.com>
2023-02-23 14:44:03 +01:00
Jane Tournois 2d1fb95155 remove with_features named parameter 2023-02-23 14:41:52 +01:00
Laurent Rineau 58c60f5625 add links to create_labeled_image_mesh_domain 2023-02-23 14:13:25 +01:00
Laurent Rineau 04a9f165b4 rephrase 2023-02-23 14:13:11 +01:00
Jane Tournois 9d38e85262 Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF 2023-02-23 12:11:37 +00: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 917cfe3f83 fix doc and constness for features_detector operator() 2023-02-23 11:57:00 +01:00
Jane Tournois 094f07ccfc trailing whitespaces 2023-02-23 10:46:40 +01:00
Jane Tournois b25dba99e8 doc 2023-02-23 10:40:49 +01:00
Laurent Rineau 8d2edc7825 Fix warning
The warning was from MSVC:
``` CGAL/Mesh_3/experimental/Sizing_field_with_aabb_tree.h(236): warning C4267: 'argument': conversion from 'size_t' to 'const int', possible loss of data
```
2023-02-23 10:20:02 +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
Laurent Rineau 157b24876e compatibility with C++14 (previous code was C++20) 2023-02-22 14:29:31 +01:00
Jane Tournois 6a1977c2c2 Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF
# Conflicts:
#	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp

and fix compilation of mesh_3D_image_with_detection_of_features.cpp
2023-02-21 11:22:09 +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
Jane Tournois de1369d8ec improve initialization when features are inserted
when the c3t3 contains no cells after initialization by features,
it may be needed to add more points for initialization, even when
the nb of facets in complex is > 0
It is the case for example when facets cover a very small part, or
too few connected components of the domain
2023-02-21 09:28:48 +00:00
Sébastien Loriot 56c0618d79 more const missing 2023-02-20 15:30:42 +01:00
Sébastien Loriot e249f59f38 add missing const 2023-02-20 14:38:38 +01:00
Laurent Rineau a15c868d2c
Update Mesh_3/include/CGAL/Mesh_3/experimental/Sizing_field_with_aabb_tree.h 2023-02-17 19:44:39 +01:00
Laurent Rineau b8f5a4b0d4 Use per-patch kd-trees to speed up the sizing field 2023-02-17 18:51:20 +01:00
Laurent Rineau ded4daa4fe Fix spelling typos 2023-02-17 16:17:35 +01:00
Laurent Rineau f7aed432f7 Make Sizing_field_with_aabb_tree a lightweight object carrying a shared_ptr 2023-02-17 14:37:10 +01:00
Mael Rouxel-Labbé 68067c039f Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-02-14 12:26:50 +01:00
Mael Rouxel-Labbé 9d9a51731a Fix typo 2023-02-09 23:27:01 +01:00
Jane Tournois 520ecebf5b it seems that only msvc 2015 has an issue with "template" here 2023-02-07 12:43:46 +01:00
Jane Tournois 51675616ad attempt to fix a "maybe uninitialized" warning 2023-02-07 12:13:58 +01:00
Jane Tournois 9ef9fd0636 avoid possibly dangling reference to a temporary 2023-02-07 11:57:40 +01:00
Jane Tournois be3574fb6d fix warning: moving a temporary object prevents copy elision 2023-02-07 11:23:17 +01:00
Laurent Rineau 5d4e0dd9b5 Merge pull request #6954 from janetournois/Mesh_3-minor_fixes_debug_code-jtournois
Mesh 3 - minor fixes in debug code
2023-02-02 10:58:27 +01:00
Sébastien Loriot 9e137bca24 Merge 'cgal/master' 2023-01-31 12:26:55 +01:00
Mael 8f703b54cb
Merge branch 'master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-01-27 21:48:32 +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
Laurent Rineau fc61b42864 Merge pull request #6858 from sloriot/Doc-exclude_internal
Ignore internal directories
2023-01-27 21:02:29 +01:00
Laurent Rineau 57b538e43a Merge pull request #7098 from afabri/Mesh_3-determinism_test-GF
Mesh_3: Add test for determinism when not checking for features
2023-01-27 21:02:21 +01:00
Laurent Rineau 49e6076f19 Merge pull request #7167 from janetournois/Mesh_3-detect_cc_fix_dim2-jtournois
Mesh_3 - fix initialization of labeled images
2023-01-27 20:52:07 +01:00
Jane Tournois 8b5238891d generate_label_weights() must be inline
because it is not a template function
2023-01-27 11:11:17 +01:00
Jane Tournois 5ad5ae563b attempt to fix doc 2023-01-24 17:44:17 +01:00
Jane Tournois 869cfd7309 add missing "template" 2023-01-24 14:33:12 +01:00
Jane Tournois 293f851f46 rename NP detect_features to features_detector 2023-01-24 12:18:17 +01:00
Jane Tournois dcf6589789 doc about example with std::cref 2023-01-24 11:49:31 +01:00
Jane Tournois 21f2411757 doc 2023-01-24 11:36:58 +01:00
Jane Tournois 0a3322004c doc 2023-01-24 11:24:12 +01:00
Jane Tournois 682a07a24f doc 2023-01-24 10:55:14 +01:00
Jane Tournois ed4acde2c1 remove domain from parameters
it is not necessary anymore in detection functors
the named constructor performs domain.add_features()
2023-01-24 10:53:26 +01:00
Jane Tournois dd4722caa7 mesh domain is now const
and cleaning (add_input_features has become useless)
2023-01-23 21:49:17 +01:00
Jane Tournois ef9f917395 Merge branch 'Mesh_3-triple_line_extraction-GF' of https://github.com/janetournois/cgal into Mesh_3-triple_line_extraction-GF 2023-01-23 13:28:54 +00:00
Jane Tournois b7dcf1c2e1
indentation
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2023-01-23 14:28:12 +01:00
Jane Tournois 4e8011b347 make sure reference type is used as return type 2023-01-23 14:26:00 +01:00
Jane Tournois 4a13b9385c
Apply suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2023-01-23 12:16:01 +01:00
Jane Tournois fca18230e7 user manual 2023-01-20 16:11:40 +01:00
Jane Tournois 7bbe3b9d56 documentation 2023-01-20 14:40:03 +01:00
Jane Tournois aeb1b73959 make create_labeled_image_mesh_domain return auto
to avoid the need of keeping return type consistent with
code inside the named constructor
2023-01-20 10:36:32 +01:00
Jane Tournois cf5979189c deal with input features + detected features in a valid feature graph
+ remove Feature_range.h. A range of polylines can be given directly to
the named parameter `input_features`
+ fix the demo behaviour
2023-01-19 15:15:42 +01:00
Jane Tournois f0c4fa1e01 add missing return 2023-01-17 17:01:55 +01:00
Jane Tournois 9bff52fb21 fix compilation for domain with no features 2023-01-17 16:38:35 +01:00