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
b80daff6fb
Fixes
2021-02-19 11:31:52 +01:00
Maxime Gimeno
5948bc846e
Try to remove Filtered_kernel from the dependencies of BGL
2021-01-11 14:11:30 +01:00
Maxime Gimeno
3d1c41fd14
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2021-01-07 15:05:28 +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
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
Mael Rouxel-Labbé
8682f9bafb
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2020-08-24 11:45:17 +02:00
Maxime Gimeno
9c15f2c9dc
Use FeatureSummary in the demo, and remove CGAL_FOUND
2020-08-04 12:46:17 +02:00
Mael Rouxel-Labbé
461156c566
Fix [[deprecated]] placement in combinatorial maps
2020-07-17 18:06:47 +02:00
Laurent Rineau
e6536aaf63
Remove cpp11::(tuple|get)
...
And use `#ifdef CGAL_NO_DEPRECATED_CODE` around the backward
compatibility code in `<CGAL/config.h>`.
2020-06-09 20:15:16 +02:00
Laurent Rineau
dcc4fb1cc1
Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
...
# Conflicts:
# STL_Extension/include/CGAL/Compact_container.h
2020-05-20 09:46:26 +02:00
Guillaume Damiand
9838b9debc
Use two different names for copy, const and non const version, to avoid ambiguity on windows (internal undocumented methods)
2020-04-27 18:55:26 +02:00
Guillaume Damiand
a09b8b10fc
Warnings
2020-04-27 18:55:26 +02:00
Guillaume Damiand
ec15dbfa9e
Bugfix
2020-04-27 18:55:26 +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
303d579941
Bug fix
2020-04-27 18:52:23 +02:00
Guillaume Damiand
16be3009ca
Add a missing call to base constructor
2020-04-27 18:52:23 +02:00
Guillaume Damiand
6a2052b68e
Copy do not copy marks anymore.
2020-04-27 18:52:23 +02:00
Guillaume Damiand
2018367261
Improve face width computation; move face graph wrapper into surface mesh topology package.
2020-04-27 18:52:23 +02:00
Guillaume Damiand
f3098fc3f7
More trailling whitespaces...
2020-04-27 18:52:23 +02:00
Guillaume Damiand
8cddcdd045
Update copy methods of CMap and GMap to deal with model of map having perforated faces.
...
Following this modification, copy does not update anymore the reserved marks.
2020-04-27 18:52:22 +02:00
Guillaume Damiand
5c0d9aaa22
Change parameter orders for copy methods in CMap, GMap
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
Guillaume Damiand
50aa13998f
Face graph wrapper now uses a lazy initialization of its marks.
2020-04-27 18:37:58 +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
Sébastien Loriot
e4d63837fd
Merge remote-tracking branch 'gsoc2019-nccycles-thien' into Surface_mesh_topology-gdamiand
...
This is a merge done after the rebase of Surface_mesh_topology-gdamiand
Original commit id:
commit 5459085b7da44946a834ce155fcc4e9c83ad14b2 (HEAD)
Merge: 8138ac72694 349759a0547
Author: Thien Hoang <thienvhoang99@gmail.com>
Date: Sat Jul 13 02:46:50 2019 +0700
2020-04-27 18:07:48 +02:00
Sébastien Loriot
d1a323c730
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 19:24:14 +01:00
Sébastien Loriot
86e25f7e71
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:23:54 +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
Laurent Rineau
378554e5a7
Change the API of `for_compact_container`/`Compact_container_traits`
...
Now, we have a proper pair of getter/setter, and the `void` pointer is
get by a `reinterpret_cast`, instead of a union.
Cc: @mglisse
2020-03-09 17:19:58 +01:00
Laurent Rineau
67b1b0e04f
Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand
...
Surface mesh topology (new package)
2020-01-15 17:24:06 +01:00
Guillaume Damiand
6125c866e9
Copy of CMap and GMap returns now handle instead of const_handle.
2020-01-07 18:04:33 +01:00
Andreas Fabri
48fedbae06
Typos: splitted -> split
2019-12-11 16:57:34 +01:00
Guillaume Damiand
751b74acb8
Remove unused variable warning
2019-12-07 08:33:54 +01:00
Guillaume Damiand
9d2107b3a8
Update tests
2019-12-03 15:17:43 +01:00
Guillaume Damiand
ca753748a3
is_border -> is_perforated
2019-12-03 15:17:29 +01:00
Guillaume Damiand
8be7c183b4
Remove warnings (thanks @sloriot)
2019-11-29 15:51:34 +01:00
Guillaume Damiand
e3f2ee87b6
Update dependencies (why ??)
2019-11-26 21:25:35 +01:00
Guillaume Damiand
44df084049
Update licence
2019-11-26 20:08:01 +01:00
Guillaume Damiand
4e1363463c
Update licences
2019-11-26 14:10:03 +01:00
Guillaume Damiand
9a50c0f830
Merge branch 'master' into Surface_mesh_topology-gdamiand
2019-11-26 13:22:03 +01:00
Guillaume Damiand
7d6b31e670
Add test for surface mesh topology
2019-11-24 20:49:15 +01:00