Mael Rouxel-Labbé
a6c528cd8f
Derecursify Apollonius_graph_2::expand_conflict_region()
2019-06-18 13:18:25 +02:00
Mael Rouxel-Labbé
4e15225e98
Derecursify 'expand_conflict_region'
2019-06-18 11:04:09 +02:00
Laurent Rineau
39dede5320
Merge pull request #3951 from lrineau/Mesh_3-fix_issue_2870-GF
...
Mesh_3: fix issue #2870 (do not deactivate all topological criteria)
2019-06-17 14:14:53 +02:00
Laurent Rineau
37839b3e88
Merge pull request #3961 from sgiraudot/Classification-Fix_clusters-GF
...
[Classification] Make cluster lightweight to copy + fix bbox computation
2019-06-17 14:14:50 +02:00
Laurent Rineau
0626dc7892
Merge pull request #3934 from sloriot/SDG2-fix_edge_in_conflict
...
Fix the in-conflict of Voronoi edge
2019-06-17 13:48:15 +02:00
Laurent Rineau
fd33d13958
Merge pull request #3937 from sloriot/Slicer-fix_default_vpm
...
Fix default vertex point map
2019-06-17 13:48:12 +02:00
Laurent Rineau
73e37f7bd2
Merge pull request #3964 from sloriot/PMP-coref_invalid_index
...
Fix invalid index
2019-06-17 13:48:10 +02:00
Laurent Rineau
e0b8e8c650
Merge pull request #3986 from janetournois/Mesh_3-fix_optimizers_protection-jtournois
...
Mesh_3 : fix global optimizers protection
2019-06-17 13:48:07 +02:00
Laurent Rineau
cf1d7a5896
Merge pull request #3996 from sloriot/BGL-split_fix_fct_pos
...
Put declaration before the call to the function
2019-06-17 13:48:02 +02:00
Laurent Rineau
41c3024e55
Merge pull request #3998 from sloriot/BO2-fix_outer_ccb_supply
...
Fix outer ccb supply chain
2019-06-17 13:47:59 +02:00
Laurent Rineau
91157b2167
Fix <CGAL/internal/Mesh_3/check_weights.h>
...
`Has_feature<Mesh_domain>` is not `Tag_true` or `Tag_false`, but
it *derives* from one of them!
Anyway, it is easier to use the nested value `::value`.
2019-06-13 18:08:38 +02:00
Sébastien Loriot
dcb9630633
add test file highlighting the bug fixed by the previous commit
2019-06-13 09:43:10 +02:00
Sébastien Loriot
4117fcd727
allocate new outer ccb if the initial set is empty
2019-06-13 09:31:02 +02:00
Sébastien Loriot
d6fe7d485a
add declaration before usage
2019-06-13 07:44:58 +02:00
Simon Giraudot
b981f25e84
Fix classification plugin
2019-06-12 09:46:47 +02:00
Jane Tournois
a70bf9458a
fix optimizers protection
...
If some vertices have a non-zero weights and they do not belong to input
features, then global optimizers should not be used.
The case without feature protection was not treated until now.
2019-06-06 17:34:53 +02:00
Laurent Rineau
da1bfb1596
Merge pull request #3917 from afabri/Surface_mesh-read_off-GF
...
Surface_mesh: Fix read_off(istream,Surface_mesh)
2019-06-05 10:41:09 +02:00
Laurent Rineau
3cfc790a68
Merge pull request #3968 from lrineau/Polyhedron-demo__remove_need_for_Boost_libraries-GF
...
Remove the need for Boost libraries at the top level CMakeLists.txt
2019-06-05 10:41:04 +02:00
Laurent Rineau
44cfe8d2eb
Do not use `REQUIRED OPTIONAL_COMPONENTS` with FindBoost
...
The CMake module `FindBoost.cmake` only supports `OPTIONAL_COMPONENTS` since CMake-3.11. Previously they were treated like required components.
2019-06-03 10:44:01 +02:00
Laurent Rineau
cd22917e3d
Remove the need for Boost libraries at the top level CMakeLists.txt
...
The 3D demo does not directly requires Boost libraries. Then are
pulled as a `PUBLIC` dependency of `CGAL::CGAL`. Only two plugins
really need Boost libraries:
- Classification needs Boost iostreams and serialization,
- Mesh_3 `io_image_plugin` needs Boost filesystem for multi-files 3D
images.
2019-05-29 11:18:13 +02:00
Sébastien Loriot
d6ea5870e5
fix copy/paste issue
2019-05-29 11:03:55 +09:00
Simon Giraudot
16a2644e31
Make cluster lightweight to copy + fix bbox computation
2019-05-27 15:41:03 +02:00
Laurent Rineau
f51b7e7934
Merge pull request #3876 from sloriot/Nef_3-fix_triangle_order
...
Fix index order of triangles
2019-05-23 08:31:50 +02:00
Laurent Rineau
e5b653953f
Merge pull request #3941 from lrineau/Convex_hull_3-fix_Convex_hull_traits_3_default_of_third_arg-GF
...
Fix the default of 3rd template parameter of Convex_hull_traits_3
2019-05-23 08:31:47 +02:00
Laurent Rineau
c1a13a0a1e
Merge pull request #3949 from lrineau/Installation-fix_ctest_for_Andreas-GF
...
Fix CTest CGAL tests when binary dir is a sub-directory
2019-05-23 08:31:44 +02:00
Laurent Rineau
92a311c04a
Merge pull request #3921 from lrineau/Mesh_3_fix_Boost_1.71-GF
...
Adapt Mesh_criteria_3 to Boost 1.71 (current 'master')
2019-05-21 16:33:28 +02:00
Laurent Rineau
784ce22e64
Merge pull request #3922 from lrineau/Installation-CGAL_is_an_imported_target-GF
...
Header-only: consider CGAL as an imported target (if CMake>=3.11)
2019-05-21 16:33:25 +02:00
Laurent Rineau
946e0bebae
Merge pull request #3930 from sloriot/SDG_T2-fix_insertion_of_range_of_cst
...
T2: Fix insertion of range of constraints
2019-05-21 16:33:22 +02:00
Laurent Rineau
f7a4836039
Do not deactivate all topological criteria
2019-05-21 13:43:11 +02:00
Laurent Rineau
357fe1e486
Fix CTest CGAL tests when binary dir is a sub-directory
...
When the current binary dir is a sub-directory of the current sources
dir, then the recursive copy of the sources dir to `__exec_test_dir/`
cannot be done. In that case, do not setup the fixture
directory. Tests can still be run in the source directory (and pollute
it).
2019-05-20 12:18:18 +02:00
Laurent Rineau
03202d874f
Fix the default of 3rd template parameter of Convex_hull_traits_3
...
The documentation of `convex_hull_3` says that, if the kernel is "like
`Epick`", then the default traits class of `convex_hull_3` is
`Convex_hull_traits_3`.
But that is wrong, because `Convex_hull_traits_3` is documented with
only two template parameters, and if the kernel is "like `Epick`", the
third argument is `CGAL::Tag_true`, whereas the default of that
parameter is `CGAL::Tag_false`. If users want to write explicitly the
traits in the call to `convex_hull_3`, they cannot know that there is
a third parameters, and that it must be `Tag_true`.
This commit fixes the default of that third argument.
2019-05-17 16:44:14 +02:00
Sébastien Loriot
dd84321f56
be more backward compatible + add typedef for AABB-tree definition
2019-05-17 15:01:46 +02:00
Laurent Rineau
6edd9b7c10
Merge pull request #3936 from lrineau/Travis-better_check_of_push_vs_pull_requests-GF
...
Use $TRAVIS_PULL_REQUEST_BRANCH instead
2019-05-16 15:49:15 +02:00
Sébastien Loriot
e2a3f66201
add missing include directive
2019-05-15 15:32:55 +02:00
Sébastien Loriot
a588d1a3a4
add more test cases
2019-05-15 15:07:23 +02:00
Sébastien Loriot
f65cc41e82
add missing default template parameter
2019-05-15 13:00:45 +02:00
Sébastien Loriot
f855546ad1
add missing template parameter
2019-05-15 13:00:01 +02:00
Laurent Rineau
7fe156dae7
Use $TRAVIS_PULL_REQUEST_BRANCH instead
...
`TRAVIS_PULL_REQUEST` is actually never empty:
> `TRAVIS_PULL_REQUEST`: The pull request number if the current job is a pull request, “false” if it’s not a pull request.
(from the [documentation](https://docs.travis-ci.com/user/environment-variables/#default-environment-variables ))
Use `TRAVIS_PULL_REQUEST_BRANCH` instead:
> `TRAVIS_PULL_REQUEST_BRANCH`:
> - if the current job is a pull request, the name of the branch from which the PR originated.
> - if the current job is a push build, this variable is empty ("").
2019-05-15 11:46:52 +02:00
Sébastien Loriot
cd4554b26f
fix the in-conflict of Voronoi edge in the case the new point is on the Voronoi circle of endpoints
...
in this special case, the circles are identical because the defining sites are the same
2019-05-15 08:28:31 +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
Laurent Rineau
5457a6a30b
Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF
...
PMP: Fix duplicate_non_manifold_vertices() with pinched vertices
2019-05-14 16:18:40 +02:00
Laurent Rineau
8e872081fc
Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
...
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean
# Conflicts:
# .travis/build_package.sh
# Installation/cmake/modules/CGALConfig_binary.cmake.in
# Installation/cmake/modules/CGALConfig_install.cmake.in
# Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
# Installation/lib/cmake/CGAL/CGALConfig.cmake
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
# Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
# Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Laurent Rineau
d5b2621076
Merge pull request #3858 from MaelRL/BGL-Fix_is_valid_polygon_mesh-GF
...
BGL: Fix is_valid_polygon_mesh not breaking away from potential infinite loops
2019-05-14 16:15:29 +02:00
Laurent Rineau
696558cb83
Merge pull request #3910 from maxGimeno/Polgon_mesh_slicer-Fix_orientation-GF
...
PMP::Orient polylines of Polgon Mesh Slicer ccw.
2019-05-14 16:15:26 +02:00
Laurent Rineau
0cdc5b8527
Fix for Boost-1.71 (master branch)
...
Pass the criteria object by value, instead of const references: same
semantic, but better than the universal reference used by Boost
Parameter 1.71.
2019-05-14 12:36:02 +02:00
Laurent Rineau
6fe9711d78
Remove the check of Boost_VERSION
2019-05-14 11:43:09 +02:00
Sébastien Loriot
e6d0080cc7
fix the init of the vertex index vector
2019-05-14 09:15:44 +02:00
Sébastien Loriot
db0fe89b0c
fix the init of the vertex index vector
2019-05-14 09:06:12 +02:00
Maxime Gimeno
910d6d076b
use CGAL_USE()
2019-05-13 16:40:07 +02:00
Laurent Rineau
c2e8365303
Actually, it can only work with CMake>=3.11
2019-05-10 17:47:58 +02:00