Commit Graph

185 Commits

Author SHA1 Message Date
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Laurent Rineau b18a17eba7 Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h
2019-07-01 11:13:42 +02:00
Mael Rouxel-Labbé c78f1ef812 Remove superfluous 'typename's 2019-06-26 15:57:32 +02:00
Laurent Rineau 8535a3c03c Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
#	Convex_hull_3/include/CGAL/convex_hull_3.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
#	Stream_support/include/CGAL/IO/Color.h
2019-06-20 14:20:37 +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
Mael Rouxel-Labbé ec48c4c3ad Enforce correct bit precision
Necessary for some old machines whose processor violates the standard
2019-06-03 10:30:04 +02:00
Mael Rouxel-Labbé 128eb72121 Remove obsolete todo in std::cout in 2D intersection tests 2019-06-03 07:57:16 +02:00
Mael Rouxel-Labbé 1202692394 Add a test 2019-05-24 08:14:56 +02:00
Mael Rouxel-Labbé 47b14e656d Fix order of checks to avoid calling back() on an empty vector 2019-05-24 08:14:12 +02:00
Mael Rouxel-Labbé 38afb85b61 Fix broken Bbox_2_ray/line by basing them on Iso_rectangle_2
Removes the intersection(bbox_2, ray/line), but:
- it was broken
- it was undocumented

If it's needed, just use an Iso_rectangle instead.
2019-05-20 10:54:17 +02:00
Mael Rouxel-Labbé ad1fbbd242 Fix Circle_2 -- Bbox_2/Iso_rectangle_2 intersection
Bbox_2 is inherently inexact as it is double-based. Thus, Bbox_2 should
use its conversion to Iso_rectangle_2 (a kernel type) and not the other way
around, otherwise we are doing FT --> double --> FT and losing precision.
2019-05-20 10:06:14 +02:00
Mael Rouxel-Labbé b322f685d4 Populate Intersections_2 tests 2019-05-17 14:48:04 +02:00
Mael Rouxel-Labbé e23d76cfab Cosmetic changes 2019-05-17 14:47:31 +02:00
Mael Rouxel-Labbé 325be3560b Fix Bbox_2 Circle_2 intersection (bbox within circle is not an intersection) 2019-05-17 12:18:22 +02:00
Mael Rouxel-Labbé 36c6c4ca4e Move Circle_2 Iso_rectangle_2 overload to the appropriate function 2019-05-17 12:18:12 +02:00
Mael Rouxel-Labbé ab0ca8a735 Use the intersection traits macro to simplify code (cosmetic change) 2019-05-17 12:15:48 +02:00
Mael Rouxel-Labbé 58c894ed5e Add missing free function for Bbox_2 Point_2 intersection 2019-05-17 12:15:22 +02:00
Mael Rouxel-Labbé 80d1f3f18a Clean a bit Bbox_2_Ray/Line_2 do intersect files (but the code is still wrong) 2019-05-17 12:14:43 +02:00
Mael Rouxel-Labbé e4f7c720c7 Merge branch 'Intersection_2-Fix_Ray_triangle_degenrate_inter-GF' into Intersections_2-Populate_tests-GF 2019-05-16 15:09:23 +02:00
Mael Rouxel-Labbé 845002d7bf Populate existing Intersections_2 tests with missing cases 2019-05-16 14:07:33 +02:00
Mael Rouxel-Labbé bf8097dd6f Fix Triangle_2 Iso_rectangle_2 intersection
std::unique does not handle the case where points are identical at the beginning
and the end of the vector
2019-05-16 14:06:46 +02:00
Mael Rouxel-Labbé 90ba79493f Fix Ray_2 Triangle_2 intersection when the intersection is a point 2019-05-16 14:03:30 +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
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot 1d908c1c0b remove code for CGAL_INTERSECTION_VERSION 1 2019-03-29 13:28:32 +01:00
Sébastien Loriot 82c13e6e74 remove cpp11 workaround in kernel related packages 2019-03-29 10:41:50 +01:00
Laurent Rineau fc04ed7609 Fix intersection(Point_2,Point_2)
It seems it was never tested, and never worked.

PR #2792 introduced a compilation error in cgal-swig-bindings, by the
addition of `do_intersect(Point_2,Circle_2)` and
`intersection(Point_2,Circle_2)`:

> /usr/include/CGAL/Kernel/function_objects.h:2954:63: error: call of overloaded ‘do_intersect(const CGAL::Point_2<CGAL::Simple_cartesian<CGAL::Interval_nt<false> > >&, const CGAL::Point_2<CGAL::Simple_cartesian<CGAL::Interval_nt<false> > >&, CGAL::Simple_cartesian<CGAL::Interval_nt<false> >)’ is ambiguous
>     { return Intersections::internal::do_intersect(t1, t2, K()); }
>                                                               ^

https://travis-ci.org/CGAL/cgal-swig-bindings/jobs/509442278#L4727
2019-03-22 11:28:26 +01:00
Laurent Rineau 2671d056cf Merge pull request #3685 from afabri/CGAL-cleanup-GF
CGAL:  Clean up examples and tests
2019-02-28 20:48:48 +01:00
Andreas Fabri e62ab30e6c Fixes of fixes 2019-02-15 09:03:58 +01:00
Andreas Fabri 25819705f5 Polyhedron, Intersections, PSP 2019-02-14 11:06:13 +01:00
Maxime Gimeno bfa12738a6 Une CGAL_assume(false) for the default 2019-02-13 15:18:32 +01:00
Maxime Gimeno 959d65a5ee Also fix a warning in kernel 2019-02-13 13:45:16 +01:00
Laurent Rineau 6ffd76a87e Merge pull request #2792 from afabri/Intersections_3-Add_missing_do_intersect-GF
Intersections_3:  Add missing do_intersect() overloads
2019-01-18 16:37:54 +01:00
Andreas Fabri aac8ac4e6b Some changes after Sebastien's review 2018-11-29 15:58:34 +01:00
Sébastien Loriot 057f4eafe7 fix warning + cosmetic changes 2018-11-02 14:17:16 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Andreas Fabri 93d19591da To intersect a Circle_2 means to intersect the boundary 2018-05-30 15:24:50 +01:00
Andreas Fabri c908ed5fa2 No typename; no need for CGAL:: 2018-05-18 15:46:34 +01:00
Andreas Fabri 31b5d5d3aa Reorder inclusions 2018-05-17 15:27:58 +01:00
Andreas Fabri 05437e0c54 Add several 2D tests and functions 2018-05-17 15:23:04 +01:00
Andreas Fabri 1d12605ef4 Merge headers 2018-05-17 14:53:07 +01:00
Andreas Fabri 162241066b Remove CGAL_NO_INTERSECTION_FUNCTION and functions doing nothing 2018-05-17 11:52:58 +01:00
Andreas Fabri 2a78b7861b fix src 2018-05-04 09:00:11 +02:00
Andreas Fabri 43f8490920 Reorganize Intersections_2 header files 2018-05-04 09:00:10 +02:00
Andreas Fabri c9af36ca6a fix namespace 2018-05-04 09:00:09 +02:00
Andreas Fabri 4111e3e20c Reorganize header files 2018-05-04 09:00:07 +02:00
Andreas Fabri bf55dcd69c Cleanup in Intersections_2 2018-05-04 08:57:57 +02:00
Andreas Fabri 0d3ac75518 Introduce namespace Intersections 2018-05-04 08:57:56 +02:00