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é
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
Sébastien Loriot
4e519a3c7a
move documented IO functions in IO namespace
2021-05-05 13:15:37 +02:00
Sébastien Loriot
fb6f703b55
IO namespace for files in IO directories
2021-05-04 14:36:06 +02:00
Andreas Fabri
2c1832bc25
Surface Mesh Topology: Try to fix warning
2021-04-21 09:27:10 +01:00
Sebastien Loriot
b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
...
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Maxime Gimeno
c49152359c
update max version of cmake and announce the new minimal in CHANGE.md
2021-04-15 15:08:54 +02:00
Maxime Gimeno
17602e589e
Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF
2021-04-07 09:17:51 +02:00
Laurent Rineau
d25c29145d
Merge pull request #5499 from Dig-Doug/linear-complex-add-builder
...
Linear cell complex: Add points and edges constructor
2021-04-06 15:13:13 +02:00
Doug Roeper
b039206679
Separates the `import_from_plane_graph` logic into 2 separate functions so the user can build the graph directly from a list of points and edges instead of a `std::istream`.
2021-03-25 07:31:46 -04:00
Doug Roeper
504e4cf08b
Linear_cell_complex_incremental_builder include
...
Adds a missing include. This file uses `Generalized_map_tag` on line 50, which is defined in `Linear_cell_complex_base.h`.
2021-03-20 19:34:55 -04:00
Mael Rouxel-Labbé
5efa544734
Merge remote-tracking branch 'cgal/master' into SDG-Fix_doc-GF
2021-02-22 17:19:40 +01:00
Maxime Gimeno
cc99fd94ad
Demo Pass
2021-02-19 16:02:12 +01:00
Maxime Gimeno
2500331070
Merge remote-tracking branch 'cgal/master' into Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno
2021-02-09 12:33:52 +01:00
Maxime Gimeno
c9a020bb1a
Remove remaining includes
2021-02-09 12:28:58 +01:00
Maxime Gimeno
9cd0d450f9
Remove QDomElements and need for QtXml
2021-02-09 11:31:34 +01:00
Laurent Rineau
c5ba414c72
Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
...
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:12:42 +01:00
Laurent Rineau
468ce8f700
Merge pull request #5347 from gdamiand/LCC_demo-bugfix-gdamiand
...
Bug fix in LCC demo
2021-02-05 16:10:34 +01:00
Laurent Rineau
b134ed8246
Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
...
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:07:32 +01:00
Laurent Rineau
53dab6fcb3
Merge pull request #5347 from gdamiand/LCC_demo-bugfix-gdamiand
...
Bug fix in LCC demo
2021-02-05 16:07:30 +01:00
Maxime Gimeno
a85cf6ed52
Move the include in the ifdef
2021-01-26 09:45:18 +01:00
Mael Rouxel-Labbé
1f45360d7a
Merge remote-tracking branch 'cgal/master' into SDG-Fix_doc-GF
2021-01-26 09:05:24 +01:00
Guillaume Damiand
c1158a32c8
Orient mark is now local to compute element in draw LCC.
2021-01-12 18:58:04 +01:00
Guillaume Damiand
f506515008
Bug fix in lcc basic viewer when lcc is null
2021-01-12 18:24:43 +01:00
Maxime Gimeno
04753381e5
Rename file and add ::Qt
2021-01-12 13:22:34 +01:00
Maxime Gimeno
95192d6d4b
factorize context initialization
2021-01-12 13:08:58 +01:00
Maxime Gimeno
17e83d573d
Fix demos
2021-01-08 11:40:09 +01:00
Maxime Gimeno
3d1c41fd14
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2021-01-07 15:05:28 +01:00
Maxime Gimeno
2a212bb2a8
Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples
2021-01-07 13:06:40 +01:00
Laurent Rineau
bbf4a54a9f
Merge pull request #5104 from gdamiand/CMap-other_containers-gdamiand
...
Allow to use compact container or concurrent compact container for CMap, GMap and LCC
2021-01-06 16:11:54 +01:00
Maxime Gimeno
0bbb6c6f4e
Fix some warnings
2020-12-09 14:34:14 +01:00
Mael Rouxel-Labbé
6b87fe393d
Fix various grammar issues
2020-12-05 11:11:33 +01:00
Maxime Gimeno
277b8cc74b
Fix OFF_reading
2020-11-25 13:40:19 +01:00
Maxime Gimeno
3b70343590
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2020-11-16 16:19:43 +01:00
Guillaume Damiand
70bf9038ed
Whitespaces
2020-10-22 15:42:15 +02:00
Guillaume Damiand
d6306bebcb
Add a tag in storages (CMap, GMap, LCC) allowing to chose between compact container and concurrent compact container as underlying container.
2020-10-22 10:30:38 +02:00
Maxime Gimeno
9c15f2c9dc
Use FeatureSummary in the demo, and remove CGAL_FOUND
2020-08-04 12:46:17 +02:00
Maxime Gimeno
3a33334ad3
More fixes
2020-06-17 10:55:47 +02:00
Maxime Gimeno
9199534373
WIP fixes.
2020-06-08 15:05:48 +02:00
Maxime Gimeno
6a466dd6b5
fix OFF I/O
2020-06-05 15:40:13 +02:00
Mael Rouxel-Labbé
df39cceb58
Misc fixes
2020-05-29 18:12:18 +02:00
Mael Rouxel-Labbé
580a1efd5c
Remove trailing whitespace / tabs
2020-05-22 15:31:50 +02:00
Maxime Gimeno
049439fa6b
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2020-04-30 16:47:58 +02:00
Sebastien Loriot
2d3e126450
Merge pull request #4602 from gdamiand/gsoc2019-nccycles-thien
...
Surface mesh topology shortest cycle
2020-04-29 09:10:37 +02:00
Maxime Gimeno
55361fe782
fix color and texture reading in OFF
2020-04-28 16:53:22 +02:00
Guillaume Damiand
3fb644e566
Improve basic viewer to draw consistent orientated faces for generalized maps.
2020-04-27 18:55:26 +02:00
Guillaume Damiand
02bc93a84d
Do not re-use standard keys in basic viewer.
2020-04-27 18:55:25 +02:00
Guillaume Damiand
daab96982e
Bugfix
2020-04-27 18:55:25 +02:00
Guillaume Damiand
f3098fc3f7
More trailling whitespaces...
2020-04-27 18:52:23 +02:00
Guillaume Damiand
35bff47118
Remove deprecated in forward declaration.
2020-04-27 18:52:22 +02:00