Commit Graph

1181 Commits

Author SHA1 Message Date
Mostafa-ashraf19 c8c068ecff Moved draw_buffer function. 2022-07-25 19:45:45 +02:00
Guillaume Damiand 9d0fb1e289 Correction of draw_linear_cell_complex_function 2022-07-22 18:27:58 +02:00
Mostafa-ashraf19 a68ad47df0 Local_Kernel error during compiling 2022-07-22 15:17:44 +02:00
Guillaume Damiand 38a14de2cb Remove warning unused variable 2022-07-21 17:16:41 +02:00
Guillaume Damiand 233f757148 Remove macro used for the reviewing step. 2022-07-21 10:40:45 +02:00
Mostafa-ashraf19 c85f775651 TODO 2022-07-20 18:05:42 +02:00
Mostafa-ashraf19 0f7d0c5c92 Fixed Dart_const_handle error 2022-07-20 18:03:52 +02:00
Mostafa-ashraf19 405b64edb7 Initial commit of filling buffers and drawing it for each data structure. 2022-07-20 12:46:29 +02:00
Guillaume Damiand 447728692d use rebind_alloc instead of rebind for std::allocator 2022-07-20 11:31:04 +02:00
Mostafa-ashraf19 c3541b2c6f Use the new version. 2022-07-20 10:06:10 +02:00
Mostafa-ashraf19 c1a64ea90d Deleted, Redundant. 2022-07-20 02:08:40 +02:00
Guillaume Damiand 1e2c505cbe Add missing type in LCC-GMap 2022-07-19 10:21:41 +02:00
Guillaume Damiand f2630fa4b9
Merge branch 'master' into CMap_index-gdamiand 2022-07-19 09:44:16 +02:00
Mostafa-ashraf19 81e42ffd73 Initial commit handling basic viewers.
The new version of dealing with CGAL basic viewers and data structures uses functions inserted of classes.
2022-07-19 09:40:23 +02:00
Guillaume Damiand cbc038fff8 Rename upper_bound_XXX_ids by upper_bound_on_XXX_ids 2022-06-27 12:37:49 +02:00
Guillaume Damiand aa91b53297 Add methods in CMap/GMap/LCC to get upper bounds, when indices are used 2022-06-21 14:16:12 +02:00
Guillaume Damiand 6c484b7a8f Replace a rand by default_random 2022-06-21 10:52:41 +02:00
Sébastien Loriot c1eacac982 fix link 2022-06-21 10:42:30 +02:00
Guillaume Damiand 5d7d16cb9e
Update Linear_cell_complex/doc/Linear_cell_complex/CGAL/Linear_cell_complex_for_combinatorial_map.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-06-21 10:22:19 +02:00
Guillaume Damiand 1e0adffc21 Add is_used method 2022-06-10 18:57:53 +02:00
albert-github ee415d50de Corrections for more strict doxygen symbol resolver
The doxygen  symbol resolver for the doxygen master version (1.9.5 (35711f2d14acc81cff83f81f04c566ad8c8c6fe8)) has been improved (made stricter) but this means also means that some links have to be corrected.
The patch has been tested against the mentioned doxygen master and against doxygen 1.8.13 and the results look in both cases correct (without the patch the master version has some warnings and some incorrect links)..

The patch has been created by @doxygen and upon request created into a pull request by me.
2022-06-07 10:56:37 +02:00
Guillaume Damiand a60dd02665 null_descriptor should be public 2022-06-02 20:12:01 +02:00
Guillaume Damiand cfd9ac640a Add tests 2022-06-02 16:41:00 +02:00
Guillaume Damiand e0d1ce6ee8 comment 2022-06-02 16:29:41 +02:00
Guillaume Damiand 3a25a02723 CC with index; almost done 2022-06-02 13:56:09 +02:00
Guillaume Damiand c6b6c80145 Bug fix in cc with index 2022-05-25 16:37:51 +02:00
Guillaume Damiand 94cd1b4df8 continue to debug cc with index 2022-05-25 11:07:44 +02:00
Guillaume Damiand 514545029d Simplify storages for CMap/GMap/LCC 2022-05-23 14:33:15 +02:00
Guillaume Damiand c25da7a9ba CC with index cont 2022-05-23 13:28:00 +02:00
Guillaume Damiand 8bf242ad34 Update cc with index (almost done...) 2022-05-20 15:06:24 +02:00
Sebastien Loriot 269a391fa0
Merge pull request #6558 from lrineau/Installation-remove_wd4503-GF
CMake script updates: version of CMake and /wd4503 is only for MSVC 2015
2022-05-13 15:53:36 +02:00
Guillaume Damiand 4ce2233f44 CC with index cleanup (one class with 3 variants) 2022-05-13 13:56:33 +02:00
Guillaume Damiand 45f437c47c Remove trailing 2022-05-09 12:39:11 +02:00
Guillaume Damiand 44c308ce09 LCC ok (doc and examples) 2022-05-06 11:16:33 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Guillaume Damiand 036bdf7c71 dh -> d into examples 2022-05-05 19:18:38 +02:00
Guillaume Damiand f5e3ea281f dh -> d 2022-05-05 19:07:24 +02:00
Guillaume Damiand 999a813b35 Rename XXX_handle into XXX_descriptor for CMap, GMap, LCC 2022-05-05 13:34:19 +02:00
Andreas Fabri 238a2e1b62 Remove unused #include 2022-05-03 17:01:00 +01:00
Andreas Fabri fd20beeef7 Use vertices_around_target() 2022-05-03 15:09:05 +01:00
Andreas Fabri abb54bf0b8 BGL: Add adjacency_iterator for several classes 2022-05-03 14:02:21 +01:00
Guillaume Damiand 81c2c1196a Allow to test cc with index 2 and 3 2022-05-03 08:37:40 +02:00
Guillaume Damiand c7a8299712 start a new container for index 2022-05-02 10:08:31 +02:00
Guillaume Damiand ad3c488d53 spaces 2022-04-15 13:01:25 +02:00
Guillaume Damiand 5d4a30a9c6 trailing 2022-04-15 12:57:12 +02:00
Guillaume Damiand 7370aa54ef LCC demo with index ok 2022-04-15 12:43:41 +02:00
Guillaume Damiand 282d5e8c7b replace nullptr 2022-04-15 12:43:30 +02:00
Guillaume Damiand 54b42b0d36 Bug fix in dual 2022-04-15 11:05:21 +02:00
Guillaume Damiand 2c4c73c6b9 Bug fix in dual for lcc 2022-04-15 08:49:49 +02:00
Guillaume Damiand 836ac4ac72 update index 2022-04-15 07:44:49 +02:00
Guillaume Damiand 60dfb09449 Continue lcc with index 2022-04-14 17:15:42 +02:00
Guillaume Damiand 0baba876ee Continue LCC with index 2022-04-14 16:23:06 +02:00
Guillaume Damiand c8883602b0 LCC index 2022-04-14 15:26:49 +02:00
Guillaume Damiand ed3080e2e3 Restart lcc 2022-04-14 13:58:27 +02:00
Guillaume Damiand 382db4acbd Ok for Index version for cmap 2022-04-13 16:59:51 +02:00
Guillaume Damiand 3d874e8e1e Storage with index for gmap. 2022-04-12 15:22:01 +02:00
Guillaume Damiand 2e076fa6f3 Corrections in LCC for cmap 2022-04-11 15:08:35 +02:00
Guillaume Damiand abd93465a4 Start LCC with index. 2022-04-11 14:59:02 +02:00
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
Laurent Rineau d78a7b9255 Merge pull request #6302 from afabri/P2T2-assert-GF
CGAL: In testcode do not use CGAL_assertion but assert
2022-02-08 23:44:24 +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
Laurent Rineau f9c05a0ba1 Merge pull request #6253 from afabri/P2T2-assert-GF
CGAL:   In testcode do not use CGAL_assertion  but assert
2022-02-02 16:38:22 +01: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
Andreas Fabri a75a88945d LCC CM GM 2022-01-24 16:43:39 +00:00
Andreas Fabri 3d17d3d3f3 Deal with LCC 2022-01-19 07:20:15 +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 921380202b Merge pull request #6055 from gdamiand/LCC_improvements-gdamiand
Lcc improvements
2022-01-12 12:22:00 +01:00
Sébastien Loriot 6d3176e061 move Named_parameters class in STL_extension
helpers stay in BGL because it depends on BGL tags
2022-01-07 15:12:22 +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
Laurent Rineau 4d38f2b7b3 Merge pull request #6114 from sloriot/CGAL-cmake_clean_up
Clean cmake scripts of examples and tests
2021-11-18 12:27:19 +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
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +01:00
Sébastien Loriot 262a04cef2 remove useless POLICY setting 2021-11-09 10:19:14 +01:00
Guillaume Damiand 6f46025652 More small improvments in sew3_same_facets (undocumented function) 2021-11-05 10:26:48 +01:00
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
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 1e7a47c0ee Add one test for LCC incremental builder 2021-10-14 16:33:47 +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 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 e5ab9202f5 Merge pull request #4229 from gdamiand/CGAL_data-gdamiand
Regroup data: scripts and function updates
2021-09-23 16:14:11 +02:00
Sébastien Loriot 4454c5b3ed Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-08-30 12:25:51 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Maxime Gimeno f7df517f57 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-08-09 09:14:23 +02:00
Sébastien Loriot f153a1ed3e Merge remote-tracking branch 'cgal/master' into HEAD 2021-07-22 13:15:22 +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 2d5f91f763 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-05-27 09:06:59 +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
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
Guillaume Damiand 751fb3851d
Merge branch 'master' into CGAL_data-gdamiand 2021-03-19 13:47:37 +01:00
Maxime Gimeno 735567531b RENAME 2021-03-19 12:00:08 +01: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
Sébastien Loriot 4c932630c6 fix wrong path 2021-02-09 09:20:04 +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
Sébastien Loriot 93017e8d71 remove get_ prefix 2021-02-04 08:56:26 +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 1d88621e87 One example of use of get_data_file_path 2021-01-19 15:24:17 +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
Guillaume Damiand 0308d1a1bb Add forward declaration files for CMap, GMap, LCC, Polygonal_schema. Improve copy methods for CMap and GMap to deal with const and non const cases. 2020-04-27 18:52:22 +02:00
Sébastien Loriot bfecbf55a1 Update from master (done during rebasing)
Original commit:
    commit 573f9f3224939fb2cd74d9a82bd5b1c0e471edc7
    Merge: c824946ef60 16fc8d1fe2
    Author: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
    Date:   Fri Mar 27 10:38:38 2020 +0100

        Merge remote-tracking branch 'cgal/master' into gsoc2019-nccycles-thien
2020-04-27 18:42:57 +02:00
Sébastien Loriot 24f684092d Update from master (while rebasing)
Original merge commit:
    commit 2e4a18e3e6f73c41d4935aed22330adf83f99f28 (HEAD)
    Merge: b91b6cab3a1 29f973a616
    Author: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
    Date:   Thu Mar 12 18:05:22 2020 +0100

        Merge master; NYF
2020-04-27 18:34:34 +02:00
Thien Hoang 4535c33a19 Fix draw_linear_cell_complex.h 2020-04-27 18:20:16 +02:00
Thien Hoang aa1907bf93 Roll back draw_linear_cell_complex.h 2020-04-27 18:20:16 +02:00
Thien Hoang 07dde8e9aa Re-add LCC drawing functions 2020-04-27 18:20:15 +02:00
Sébastien Loriot 5cb853af74 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-27 09:49:48 +02:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Sébastien Loriot a8f9858099 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-16 16:29:55 +02:00
Sébastien Loriot b4c0e6ef29 remove unused parameter 2020-03-27 19:12:07 +01:00
Maxime Gimeno 4e6fb685c6 Merge remote-tracking branch 'mine/CGAL_IO-maxGimeno' into HEAD 2020-03-27 11:11:10 +01:00
Sébastien Loriot 620dfa40fc extra run of the script to remove tabs and trailing whitespaces 2020-03-27 08:37:32 +01:00
Sébastien Loriot ba42fcb6ca Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:36:40 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Sébastien Loriot af913f781a fix dynamic properties for LCC 2020-03-13 12:28:02 +01:00
Guillaume Damiand 9e250c0093 Typo in comments. 2020-02-12 10:33:57 +01:00
Mael Rouxel-Labbé 828e47f61e Fix some header includes 2020-01-17 17:55:53 +01:00
Guillaume Damiand a666cb0857 Resolve conflict 2020-01-16 08:33:24 +01:00
Guillaume Damiand 0b7ec2e216 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-20 10:02:23 +01:00
Sébastien Loriot e80f869147 Merge remote-tracking branch 'cgal/master' 2019-12-20 09:35:45 +01:00
Guillaume Damiand 47abaf1fdb Add operator= to avoid a deprecated warning 2019-12-07 08:43:32 +01:00
Guillaume Damiand 535fff1199 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-05 18:21:41 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Guillaume Damiand 055d6fd1f9 Do not inverse normal by default in LCC viewer 2019-11-29 08:45:52 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Mael Rouxel-Labbé ff09c5d0c8 Merge branch 'SMS-Add_GH_simplification-GF-old' into SMS-Add_GH_simplification-GF 2019-10-25 16:35:53 +02:00
Sébastien Loriot b13e116919 Manual removal of license notice + fix SPDX flags 2019-10-19 17:00:08 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot d0f23b56f6 update deprecated SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0$" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0$/SPDX-License-Identifier: GPL-3.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0$/SPDX-License-Identifier: LGPL-3.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0$/SPDX-License-Identifier: LGPL-2.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.1$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.1$/SPDX-License-Identifier: LGPL-2.1-only/"
2019-10-18 22:08:05 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Mael Rouxel-Labbé 0f7de56d76 Move a number of Named Parameter type extractor from CGAL::PMP:: to PMP::
These are used in a number of pacakges other than PMP and the code
is also already in /BGL. None are documented.
2019-10-17 12:41:30 +02:00
Guillaume Damiand 0707d80d63 Update basic viewer to avoid conflict with another external function. 2019-10-15 11:16:02 +02:00
Mael Rouxel-Labbé e4c0bcffa0 Update usage of intersection tags 2019-09-19 18:32:34 +02:00
Guillaume Damiand e44fef7d0b Update polygonal schema to allow to perforate faces; impact on face graph wrapper. 2019-09-17 16:04:38 +02:00
Sebastien Loriot fd328f6c91
Merge pull request #3772 from maxGimeno/BasicViewer-Update_shaders-GF
Basic viewer: use compatibility shaders in basic_viewer
2019-08-12 09:01:05 +02:00
Maxime Gimeno 660ebe9e81 Add missing highp and remove unwanted highp 2019-08-05 14:16:02 +02:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Sebastien Loriot 2a426bb1e1
Merge pull request #4063 from sloriot/CGAL-NO_CXX11
Remove CGAL_CXX11 macro usage
2019-07-19 16:16:22 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF
PMP: Add locate.h and rewrite Triangulation_2 graph traits
2019-07-18 16:40:49 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
match @{ and @}
2019-07-18 16:26:43 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Sébastien Loriot cebf0657d8 Use a full CGAL version of named function parameters
no longer rely on boost
2019-07-14 22:45:47 +02:00
Guillaume Damiand 7cd85f845b Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-07-10 15:32:21 +02:00
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
CGAL: more viewers
2019-07-10 14:22:50 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Guillaume Damiand b21d06bfe1 Merge branch 'Surface_mesh_topology-gdamiand' of github.com:gdamiand/cgal into Surface_mesh_topology-gdamiand 2019-07-09 12:09:02 +02:00
Guillaume Damiand dcc78e85d2 Replace #include by forward declarations. 2019-07-09 12:08:49 +02:00
Maxime Gimeno ada68f260f Change dependencies 2019-07-09 11:54:24 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Guillaume Damiand f42be51a8e Restore dependencies 2019-07-05 14:32:04 +02:00
Guillaume Damiand bd8a4d8326 Commit all dependencies, result of make packages_dependencies 2019-07-03 09:09:36 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Guillaume Damiand 8a3cb666fd Correct links to CGAL::draw functions. 2019-06-19 13:10:08 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Andreas Fabri 42e07ce912 @lrineau believe me that with VC++ it compiled locally even before this commit 2019-06-06 17:12:31 +02:00
Andreas Fabri d1e33fef68 last fix 2019-06-06 07:41:54 +02:00
Andreas Fabri 78055c1394 Fix LCC and Generalized_map 2019-06-05 23:36:42 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Mael Rouxel-Labbé 0b506f5cce Fix package dependencies 2019-05-10 12:41:25 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot 6e8e4a4b10 remove variadic template workaround for cmap, gmap, and lcell 2019-03-29 10:41:50 +01:00
Guillaume Damiand 379c90420b Merge branch 'CMap-path_isotopy-gdamiand-old' into CMap-path_isotopy-gdamiand 2019-03-27 12:40:33 +01:00
Guillaume Damiand bbea8c7889 Add a method to import any HDS model into a CMap and a LCC 2019-03-15 16:53:47 +01:00
Laurent Rineau 8693f95dac Merge pull request #3619 from albert-github/feature/bug_headers
Update of headers
2019-02-22 16:39:09 +01:00
Laurent Rineau b56f51982b Merge pull request #3591 from albert-github/feature/bug_advanced_concept
Make advanced concept documentation analogous to advanced class.
2019-02-16 14:00:21 +01:00
Sébastien Loriot 246d89b91f add missing upper case letters 2019-02-14 11:01:28 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Sébastien Loriot 90ad079eb4 use macro for subsections
command used:
grep -l  "###" */doc/*/PackageDescription.txt |  xargs sed -i  -E 's/\#\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\#\s*$/\\cgalCRPSubsection{\1}/
2019-02-14 10:32:00 +01:00
Sébastien Loriot 117b7cdf04 remove advanced in the brief of a concept 2019-02-13 19:06:26 +01:00
Andreas Fabri 0496d840ff Fix arrangement and lcc 2019-01-18 10:05:48 +01:00
Guillaume Damiand 14e32aba01 Merge branch 'CMap-path_isotopy-gdamiand-old' into CMap-path_isotopy-gdamiand 2018-12-14 10:01:38 +01:00
Laurent Rineau 1813a1ca45 Merge pull request #3488 from gdamiand/LCC_demo-gdamiand
LCC demo
2018-12-10 14:38:20 +01:00
Guillaume Damiand 0cc980f059 Update copy constructors and copy methods for CMap, GMap, and LCC to take a CMap/GMap/LCC as parameter and not any type. 2018-12-06 18:01:03 +01:00
Guillaume Damiand 12ae925f31 Some more unused variables. 2018-12-03 20:11:19 +01:00
Guillaume Damiand c2665415cd Remove warning in lcc viewers. 2018-11-30 08:03:31 +01:00
Guillaume Damiand b5e0be6374 update cmake 2018-11-28 21:57:04 +01:00
Guillaume Damiand fdd08e9287 Create new package Surface_mesh_topology; move related files in this package. 2018-11-28 15:56:10 +01:00
FrancisGipsa 1854be6d07 add option 2018-11-28 13:46:20 +01:00
Guillaume Damiand c3f55640ca Bug fix. 2018-11-28 12:47:43 +01:00
Guillaume Damiand edfdc8d346 Readd the random face color option for lcc viewer. 2018-11-27 17:02:38 +01:00
Guillaume Damiand 111eb4ee21 Demo of LCC is now ok 2018-11-27 16:07:52 +01:00