Commit Graph

2387 Commits

Author SHA1 Message Date
Sébastien Loriot 593ff5371c Merge remote-tracking branch 'cgal/master' into HEAD 2022-02-01 20:11:27 +01:00
Laurent Rineau a22b459637 Merge pull request #6259 from afabri/Mesh_3-permissive-GF
Mesh_3: Fixes for VC++ with option /permissive-
2022-01-21 16:08:30 +01:00
Andreas Fabri ade80dcf4d Fix initialisation of atomic 2022-01-20 08:44:38 +00:00
Andreas Fabri d4f9be848c Mesh_3: Fixes for VC++ with option /permissive- 2022-01-19 13:58:51 +00:00
Sébastien Loriot c169c41240 Merge remote-tracking branch 'maxGimeno/PMP-Example_of_new_mp_function-maxGimeno' into HEAD 2022-01-12 13:33:49 +01:00
Laurent Rineau 398e71d37d Merge pull request #6155 from sloriot/STL_extension-Modifiable_priority_queue_clean_up
Add option to use a relaxed order
2022-01-12 12:21:53 +01:00
Sébastien Loriot 1c3e09f562 rename internal namespace
default_values -> default_values_for_mesh_3
2022-01-10 18:36:32 +01:00
Sébastien Loriot 1e7785b427 do not use PMP::parameters namespace 2022-01-04 16:00:38 +01:00
Laurent Rineau 7cada272e8
Merge pull request #6124 from janetournois/Mesh_3-polyhedral_complex_in_demo-GF 2022-01-03 16:48:37 +01:00
Laurent Rineau 7e0f325f87 Merge pull request #6196 from MaelRL/Mesh_3-Remove_trailing_semicolon-GF
Fix: remove extra ';'
2022-01-03 16:26:05 +01:00
Mael Rouxel-Labbé 91d862d997 Remove extra ';' 2021-12-23 11:58:28 +01:00
Sébastien Loriot f26de8e819 use the container in STL_extension and not the internal one 2021-11-30 13:20:15 +01:00
Jane Tournois e6bacfb226 make polyhedral complex usable with Surface_mesh 2021-11-12 10:44:41 +01:00
Sébastien Loriot 9543deb304 Merge pull request #6046 from MaelRL/PM-Fix_pmaps_reference_types_master-GF
Various fixes for property maps (master)
2021-10-29 17:40:15 +02:00
Laurent Rineau ca89949169 Merge pull request #5597 from lrineau/Mesh_3-weighted_images-GF
Mesh_3: Add weighted images
2021-10-29 17:01:33 +02:00
Laurent Rineau bb7253638e Merge pull request #6040 from lrineau/Mesh_3-remove_const_in_Set_of_indices-lrineau
CGAL/Mesh_3/experimental/AABB_filtered_projection_traits.h: Remove  boost::remove_const<..> from the index type
2021-10-29 16:59:59 +02:00
Laurent Rineau aca24f489b Merge pull request #6054 from janetournois/Mesh_3-uninitialized_warnings-GF
Mesh_3 - fix maybe uninitialized warning
2021-10-29 16:59:45 +02:00
Jane Tournois b664ee54c3 workaround deprecation warning of versions < 5 of ITK 2021-10-29 12:27:04 +02:00
Jane Tournois a9318b3832 fix maybe uninitialized warning 2021-10-15 09:48:54 +02:00
Mael Rouxel-Labbé 131242bb80 Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_5.3-GF 2021-10-12 09:29:23 +02:00
Mael Rouxel-Labbé 8166579e55 Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_master-GF 2021-10-11 19:58:07 +02:00
Jane Tournois c8918a9b0d fix conversion warning 2021-10-11 13:19:40 +02:00
Jane Tournois 9041574b9e remove free function remove_isolated_vertices_in_mesh_3
a member function of C3T3 is enough
2021-10-11 12:24:10 +02:00
Laurent Rineau 1af4f9336b Remove boost::remove_const<..> for the index type
It does not seem to be necessary. Actually, I really do not see why it
could have been necessary in the past.
2021-10-08 16:24:51 +02:00
Mael Rouxel-Labbé 590ddf8015 Various fixes for pmaps:
- Use `value_type` when the returned type is not a reference
- Enforce `reference = value_type` if the returned type is not
  a reference (to avoid `typename PM::reference r = get(m, k)`,
  which will take a ref to a temporary if the `reference`
  typedef is an actualy reference)
- Do not use `put_get_helper` if the property map is not a `lvalue`
  **mutable** property map: the `put()` is `map[k] = v`, which
  is broken if `operator[]` does not return a reference
- The concept `boost::lvalue_property_map_tag` requires `operator[](key)`,
  not a reference in `get(map, key)`. You can have a readable property map
  returning a reference through its `get(map, key)`, but if there is
  no `operator[]`, it's just a `boost::readable_property_map_tag`
- Some const correctness to avoid copying maps with state
  or heavy keys in `get(map, key)` / `put(map, key, value)`
- Base the category of a wrapping pmap on what it offers instead
  of just forwarding the base property map's category
- Tried to do something like mutable lvalue pmap:
  * `value_type& operator[](key&)`
  * `ref get(map, const key&)`
  * `put(map, const key&, const value_type&)`
  and non-mutable lvalue pmap:
  * `const value_type& operator[](const key&)`
  * `ref get(map, const key&)`
  but not everything fits properly...
2021-10-08 15:38:47 +02:00
Mael Rouxel-Labbé df560987a6 Whitespace & cleaning changes 2021-10-08 12:13:43 +02:00
Laurent Rineau a5e3469e78 Merge pull request #6011 from janetournois/Mesh_3-prevent_bad_initialization-jtournois
Mesh_3 - warning message after bad initialization
2021-10-06 12:04:54 +02:00
Jane Tournois ac7b637247 make types consistent with non-weighted label images 2021-10-05 10:27:03 +02:00
Jane Tournois f5eeffbbf6 remove unnecessary inheritance 2021-10-04 16:41:40 +02:00
Jane Tournois 5b2e4d1501 replace std::unary_function, that is deprecated in C++11 2021-10-04 16:09:50 +02:00
Jane Tournois a6d486f11a add missing cast 2021-10-04 15:23:44 +02:00
Jane Tournois dd493fdc9a loop on i because label is not used 2021-10-04 12:11:45 +02:00
Jane Tournois 932639eb6f move warning code to have it happen when c3t3 has already been scanned 2021-09-30 11:24:21 +02:00
Jane Tournois 591141b600 use v->meshing_info() for performances
it avoids creating two std::set of vertices, and the use of
std::set_difference
2021-09-27 14:57:10 +02:00
Jane Tournois db5e638ac2 un-document remove_far_points_in_mesh_3 and merge with remove_isolated_vertices_in_mesh_3 2021-09-27 11:47:43 +02:00
Jane Tournois dc0dad1577 remove wrong recommendation 2021-09-27 11:02:42 +02:00
Jane Tournois 8864d3fb7e fix iterator type 2021-09-24 17:50:57 +02:00
Jane Tournois 0f4c64b7f4 fix iterator type 2021-09-24 17:34:27 +02:00
Jane Tournois 7545d2e302 document remove_isolated_vertices_in_mesh_3() 2021-09-24 17:15:36 +02:00
Jane Tournois 2c40d3f639 Merge branch 'Mesh_3-document_remove_far_points-GF' into Mesh_3-isolated_vertices-jtournois 2021-09-24 17:06:45 +02:00
Jane Tournois 66f62dec9e add new function to remove isolated vertices
i.e. vertices that are part of the triangulation but do not
belong to a cell of the complex
2021-09-24 17:04:15 +02:00
Jane Tournois b58c67d712 use macros 2021-09-24 14:41:10 +02:00
Jane Tournois 6d42c1ddf2 add warning message for the case when initialization has failed 2021-09-24 11:14:29 +02:00
Jane Tournois 4b3fee813f ITK is not needed in c3t3_item, and find with the required components only 2021-09-23 14:46:40 +02:00
Jane Tournois 17215709a7 create CGAL::Image_3 for weights before counting non-white pixels
and avoid implicit conversion to CGAL::Image_3 in the call
to count_non_white_pixels, which was then calling the destructor of
CGAL::Image_3, deleting `weights` at the same time
2021-09-23 10:46:28 +02:00
Jane Tournois 0bc25f9f20 doc (add dependency and new link) 2021-09-21 21:44:40 +02:00
Jane Tournois 8bfb4e4464 avoid all triple for loops on i,j,k 2021-09-21 19:45:51 +02:00
Jane Tournois 666a54097d documents weights size 2021-09-20 12:00:11 +02:00
Jane Tournois bad72db82d document CGAL::remove_far_points_in_mesh_3() 2021-09-17 16:03:06 +02:00
Sébastien Loriot 5945e48a3e restore sub-directories accidently removed in 98e471849b 2021-09-17 08:14:06 +02:00