Commit Graph

1862 Commits

Author SHA1 Message Date
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
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
Sébastien Loriot 0ee31a5d4f remove extra parenthesis 2023-06-19 19:17:49 +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 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
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 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