Commit Graph

322 Commits

Author SHA1 Message Date
Guillaume Damiand eb39602066 update 2022-04-07 10:24:15 +02:00
Guillaume Damiand 138be31cba Merge branch 'master' into CMap_index-gdamiand 2022-04-07 09:44:20 +02:00
Laurent Rineau 95b6bf33a7 Merge pull request #6395 from afabri/TDS-better_initialization_of_Unique_hash_map-GF
TDS: Initialize the size of Unique_hash_map
2022-03-18 15:58:28 +01:00
Andreas Fabri f3db661acb Deal a little bit with Linear_cell_complex and Combinatorial_map 2022-03-09 14:13:31 +00:00
Laurent Rineau 258d704a90 Merge pull request #6209 from sloriot/PMP-std_instead_of_boost
Use features available in std instead of boost
2022-02-24 19:57:17 +01:00
Guillaume Damiand 849b477654
Merge branch 'master' into LCC_update-gdamiand 2022-02-11 07:38:46 +01:00
Sébastien Loriot 4ffc949199 replace boost::unordered by std::unordered
but in T3, Mesh_3, TDS_3, P3[TM]3
2022-02-03 19:11:12 +01:00
Andreas Fabri 440a8dfb7b Fix file name 2022-02-03 08:41:04 +00:00
Andreas Fabri 735752bec9 Do the remaining changes after Laurent's check 2022-02-03 08:02:11 +00:00
Guillaume Damiand 54142fd2a1 Update generic copy to proper copy marks and add an option to enable/disable this copy. Add move constructors. 2022-01-27 15:16:16 +01:00
Guillaume Damiand 46f5325c1b Remove deprecated code in CMap and LCC (deprecated since CGAL 4.9) 2022-01-27 10:36:22 +01:00
Laurent Rineau 921380202b Merge pull request #6055 from gdamiand/LCC_improvements-gdamiand
Lcc improvements
2022-01-12 12:22:00 +01:00
Guillaume Damiand b0c9cf958b Really remove the warning in LCC incremental builder 2021-12-10 16:32:44 +01:00
Guillaume Damiand c56dc46679 Fix a warning (and some strange indentation) 2021-12-07 16:43:10 +01:00
Guillaume Damiand 2bbcabe71b The size of argv array is now 2, ending with nullptr. 2021-11-11 17:23:37 +01:00
Guillaume Damiand ee11c858b5 The size of argv array is changed to 1 in all basic viewers. 2021-11-10 09:59:48 +01:00
Guillaume Damiand 6f46025652 More small improvments in sew3_same_facets (undocumented function) 2021-11-05 10:26:48 +01:00
Guillaume Damiand 2f5841e179 Use std::unorderd_map everywhere in CMap, GMap and LCC. 2021-10-14 17:53:01 +02:00
Guillaume Damiand 3fb45bdd5a Improve sew_3_same_facets complexity 2021-10-14 17:52:03 +02:00
Guillaume Damiand 26322683d7 Modify save of cmap/gmap to deal with the case of attributes that do not store darts. 2021-10-14 17:06:41 +02:00
Guillaume Damiand c0392e1bba Improve LCC incremental builder. 2021-10-14 16:33:29 +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
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +02:00
Maxime Gimeno e6c767d5c9 Simplify the GNUC versions tests 2021-05-12 15:45:07 +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
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
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
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 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
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
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 3a33334ad3 More fixes 2020-06-17 10:55:47 +02:00