Commit Graph

1913 Commits

Author SHA1 Message Date
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
Sébastien Loriot c1294a0eaa boost::integral_constant ---> std::integral_constant 2023-04-29 09:42:15 +02:00
Laurent Rineau b86667726c add the last static_assert to the test 2023-04-27 12:04:31 +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
Andreas Fabri b3c2bac164 Add issue 2023-04-25 14:20:56 +01: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 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 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
Laurent Rineau 594682dde3 Merge pull request #5461 from sloriot/PMP-decimation
Add coplanar decimation
2023-04-17 10:14:07 +02:00
Laurent Rineau 824976a003 Merge pull request #7236 from albert-github/feature/issue_7231
issue #7231 Improvement of layout of refines relations.
2023-04-17 10:14:01 +02:00
albert-github 8a0b21461d Unexpected backtick
- Corrected some more redundant / missing backticks
- correctes a spelling error (Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Boolean_set_operations_2/Gps_default_dcel.h)
2023-04-11 17:38:37 +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 3620c3b067 Merge pull request #7329 from afabri/Subdivision-Linear-GF
Subdivision: Add example for Linear_mask_3
2023-03-31 11:10:49 +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
Andreas Fabri dbd56de018 merge master 2023-03-17 16:58:36 +01:00
Andreas Fabri 0f6b544e2e Remove a backtick in Compact_container doc 2023-03-17 16:51:09 +01:00
albert-github 2d60f46985 issue #7231 Improvement of layout of refines relations.
- Adjusted cgalRefines according to reviews
- Implemented it in all files
2023-03-14 17:37:50 +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 a5052f4cd8 Merge pull request #6835 from MaelRL/CGAL-Clean_CMakeLists.txt-GF
Some CMakeLists.txts cleaning
2023-02-16 10:52:29 +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 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
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +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
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
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
Andreas Fabri 39ebebdb5b merge master 2022-12-08 16:49:09 +00:00