Sébastien Loriot
07421357a7
fix phrasing
2021-11-02 11:52:53 +01:00
Sébastien Loriot
08b1457649
add CGAL::CGAL_Basic_viewer target
2021-11-01 11:07:55 +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
Jane Tournois
0498cace68
add and use CGAL_ITK_support.cmake
2021-10-29 12:27:04 +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
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
f581ff74d3
Merge pull request #5427 from sloriot/CGAL_data-moving_files
...
Regroup data: moving files
# Conflicts:
# Nef_3/archive/triangulation/include/CGAL/partition_is_valid_2.h
2021-10-07 14:44:01 +02:00
Laurent Rineau
1ba982096a
Merge pull request #5094 from sgiraudot/Boolean_operations-Use_GPS_based_polylines-GF
...
[Small Feature] Boolean Operations: Use polyline-based GPS
2021-10-07 14:27:23 +02:00
Sébastien Loriot
1857a25d28
Merge remote-tracking branch 'cgal/master' into CGAL_data-moving_files
2021-10-06 13:50:31 +02:00
Jane Tournois
9beac5e039
hide menu when the input is not a labeled image
2021-10-04 16:08:24 +02:00
Mael Rouxel-Labbé
521c72d57e
Fix typos
2021-10-04 13:34:07 +02:00
Jane Tournois
992f55bf3d
fix warning
2021-10-04 12:10:41 +02:00
Jane Tournois
38122ce61a
disable the weights menu when ITK is not available
2021-10-04 12:10:26 +02:00
Sébastien Loriot
47028cd184
automatically move data files in data dir + update paths
...
Done for OFF/OBJ/STL/XYZ/PWN/PLY
2021-10-04 09:42:49 +02:00
Laurent Rineau
804feece28
Merge pull request #5761 from danston/Weights-unification-danston
...
[Small Feature] Weights Unification
2021-09-29 16:59:34 +02:00
Laurent Rineau
0f26960174
Merge pull request #6019 from sloriot/CGAL-enum_arithm_w
...
Fix warnings about arithmetic operations on enum
2021-09-29 16:59:31 +02:00
Sébastien Loriot
3640099261
fix warnings about arithmetic operations on enum
2021-09-28 15:36:51 +02:00
Sébastien Loriot
d25b5d48ae
remove unused variable
2021-09-27 19:49:00 +02:00
Sébastien Loriot
71932f2f1e
manual fixes
2021-09-23 18:56:29 +02:00
Sébastien Loriot
420f37a365
fix compilation issues
2021-09-23 16:28:23 +02:00
Jane Tournois
96ff627da4
fix CMakeLists.txt
2021-09-23 14:58:07 +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
3df8c33330
Merge remote-tracking branch 'cgal/master' into Mesh_3-weighted_images-GF
...
# Conflicts:
# Polyhedron/demo/Polyhedron/CMakeLists.txt
2021-09-23 11:37:35 +02:00
Jane Tournois
4fdd584154
fix indentation
...
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-09-21 21:47:40 +02:00
Laurent Rineau
16c0aab3cc
Merge pull request #5809 from maxGimeno/Polyhedron_demo-Filtering_c3t3_item_display-maxGimeno
...
Polyhedron Demo: Filtering c3t3 item display
2021-09-21 09:57:46 +02:00
Sebastien Loriot
1d4df77129
Merge pull request #5527 from MaelRL/Distance_3-Add_Tri_Tri-GF
...
Add squared_distance(Tri3, Tri3) + Distance_23 general improvements
2021-09-10 17:38:10 +02:00
Sebastien Loriot
464f71d529
Merge pull request #4908 from maxGimeno/Demo-T3_item-mgimeno
...
Polyhedron demo: Scene_triangulation_3_item
2021-09-10 17:37:22 +02:00
Mael Rouxel-Labbé
80c81a2c17
Fix typo
2021-09-08 15:54:32 +02:00
Dmitry Anisimov
936968fb4f
Merge remote-tracking branch 'origin/master' into Weights-unification-danston
2021-09-06 10:38:24 +02:00
Mael Rouxel-Labbé
8a92d51601
Merge branch 'Distance_3-Add_Tri_Tri-GF-old' into Distance_3-Add_Tri_Tri-GF
2021-09-02 17:26:44 +02:00
Sebastien Loriot
fd94f61198
Merge pull request #5785 from maxGimeno/Google-readability-casting-maxGimeno
...
Clang-tidy: google-readability-casting
2021-09-02 15:46:54 +02:00
Sebastien Loriot
a7a1d98aff
Merge pull request #5950 from maxGimeno/Demo-Edit_grid_plugin-maxGimeno
...
Polyhedron Demo: SM's grid in a single item
2021-09-02 15:43:51 +02:00
Maxime Gimeno
08508ff1fc
Merge remote-tracking branch 'cgal/master' into Demo-T3_item-mgimeno
2021-09-02 14:56:07 +02:00
Maxime Gimeno
c095ef2a00
Merge remote-tracking branch 'mine/Demo-T3_item-mgimeno' into Polyhedron_demo-Filtering_c3t3_item_display-maxGimeno
2021-09-02 11:42:28 +02:00
Maxime Gimeno
d83b79aa09
init t_item to nullptr
2021-09-02 08:51:43 +02:00
Maxime Gimeno
77c9ac05be
clean-up
2021-09-01 12:07:43 +02:00
Maxime Gimeno
342fb09f72
fix warning and link to tbb
2021-09-01 12:03:36 +02:00
Maxime Gimeno
6935503b71
Add a check-box to create all the grid in a single item
2021-09-01 10:46:20 +02:00
Sebastien Loriot
6e4f55e1e5
Merge pull request #5407 from maxGimeno/T2-Document_projection_traits_3-maxGimeno
...
Triangulation_2 : Document the `Triangulation_2_projection_traits_3` class
2021-08-31 19:01:33 +02:00
Jane Tournois
e1d4c0df80
rename generate_weights() to generate_label_weights()
2021-08-31 14:58:21 +02:00
Maxime Gimeno
af1a69e193
Merge remote-tracking branch 'cgal/master' into Google-readability-casting-maxGimeno
2021-08-31 10:39:27 +02:00
Maxime Gimeno
3404c2e35d
Fix bool init
2021-08-31 09:58:49 +02:00
Maxime Gimeno
27c832b780
Fix alpha for intersection
2021-08-30 15:42:00 +02:00
Maxime Gimeno
d4b0b49f33
Use "real" extensions and fix loading.
2021-08-30 15:41:52 +02:00
Maxime Gimeno
98bfd2e1b7
fix error in loader
2021-08-30 15:41:40 +02:00
Maxime Gimeno
f5dd1fee69
WIP copyProperties
2021-08-30 15:41:27 +02:00
Maxime Gimeno
0ee3a5dc73
c3t3_item has cnc, stats and is-surface
2021-08-30 15:39:52 +02:00
Maxime Gimeno
e743810349
WIP rewrite c3t3_item
2021-08-30 15:23:59 +02:00