Mael Rouxel-Labbé
8a92d51601
Merge branch 'Distance_3-Add_Tri_Tri-GF-old' into Distance_3-Add_Tri_Tri-GF
2021-09-02 17:26:44 +02:00
Sebastien Loriot
e5279db7fb
Merge pull request #5777 from MaelRL/AABB-Dont_call_global_do_intersect-GF
...
Misc fixes for Intersections_3 + related
2021-09-02 15:44:53 +02:00
Sébastien Loriot
98e471849b
moving files from internal to PKG/internal
2021-08-26 11:33:39 +02:00
Mael Rouxel-Labbé
084a1efe2d
Merge remote-tracking branch 'cgal/master' into Distance_3-Add_Tri_Tri-GF
2021-06-23 22:30:03 +02:00
Mael Rouxel-Labbé
9ed943e92f
Fix parameter names for consistency
2021-06-23 17:38:22 +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
Mael Rouxel-Labbé
fba303341f
Merge remote-tracking branch 'cgal/master' into Distance_3-Add_Tri_Tri-GF
2021-04-12 15:33:14 +02:00
Mael Rouxel-Labbé
7e62c02176
Re-organize into Distance_2/X_Y.h to align with Distance_3
2021-04-12 15:31:55 +02:00
Dmitry Anisimov
81d9556707
Merge remote-tracking branch 'upstream/master' into Kernels-decltypes-danston
2021-02-10 10:06:45 +01:00
Maxime Gimeno
bebd60c12b
Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno
2020-10-20 09:53:54 +02:00
Sébastien Loriot
090b82e762
Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch'
2020-10-02 15:08:56 +02:00
Maxime Gimeno
e169490c78
Replace fix for Point_2(Origin)
2020-09-30 10:03:30 +02:00
Maxime Gimeno
2549b58973
fix warnings on switch
2020-09-30 09:58:12 +02:00
Maxime Gimeno
c33bd6ac36
Fix ORIGIN
2020-09-29 17:08:29 +02:00
Maxime GIMENO
bdd69b5982
Replace K::Point_2(0,0) with ORIGIN
...
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2020-09-29 12:42:02 +02:00
Maxime Gimeno
c6077ca87a
Remove _known fiom intersection line_2/line_2
2020-09-29 12:06:15 +02:00
Maxime Gimeno
9c15f2c9dc
Use FeatureSummary in the demo, and remove CGAL_FOUND
2020-08-04 12:46:17 +02:00
Dmitry Anisimov
209513dc56
fixed docs + a few code improvements
2020-07-31 15:58:38 +02:00
Dmitry Anisimov
ad813b4cb0
further removed result_of and result
2020-07-30 16:19:02 +02:00
Sébastien Loriot
8b4118912d
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 18:58:21 +01:00
Sébastien Loriot
fedc29e23c
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 18:57:54 +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
Maxime Gimeno
d395e096f2
fix warnings
2020-03-20 10:55:29 +01:00
Maxime Gimeno
fe0d4d0a6e
more clean-up
2020-03-19 16:41:59 +01:00
Maxime Gimeno
ce4cbe6d06
Fix licenses
2020-03-19 11:41:57 +01:00
Maxime Gimeno
8a6bdd90b3
Fix after review
2020-03-19 11:31:35 +01:00
Maxime Gimeno
0f3305f983
Enhancements after review
2020-01-16 17:20:13 +01:00
Maxime Gimeno
90d2e03fdc
Merge remote-tracking branch 'cgal/master' into Intersections_23-Add_missing_intersections-GF
2020-01-15 13:32:11 +01:00
Mael Rouxel-Labbé
a5f09f89a6
Partial code cleaning (and fix some typedefs)
2019-10-22 12:36:58 +02:00
Maxime Gimeno
e9a0b2d695
Fixes after review
2019-10-21 15:51:36 +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
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
Maxime Gimeno
3c875e8a18
WIP review
2019-10-04 15:30:52 +02:00
Maxime Gimeno
9ede1f3ee7
Specialize the cw test to be more robust if the kernel is not exact
2019-10-03 10:53:28 +02:00
Maxime Gimeno
ad3c3d16b7
Use left_turn() instead of custom inefficient function.
2019-10-02 15:24:18 +02:00
Maxime Gimeno
7de9465bbb
Optimize for triangle intersections
2019-10-02 15:11:08 +02:00
Maxime Gimeno
245b2211e6
Add a cw test before returning the triangle or polygon result of a triangle/XXX intersection.
2019-07-30 11:50:25 +02:00
Maxime Gimeno
290b6db143
Merge remote-tracking branch 'cgal/master' into Intersections_23-Add_missing_intersections-GF
2019-07-30 09:51:28 +02:00
Maxime Gimeno
4f796c9ab5
Add missing do_intersect() and associated tests
2019-07-09 11:47:01 +02:00
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
Maxime Gimeno
b9d33c7ffa
Fix Conflicts
2019-06-25 13:25:57 +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
Maxime Gimeno
443f3f636f
Add missing intersection_2 and update doc.
2019-06-13 15:49:21 +02:00
Maxime Gimeno
119ca0dff8
Add Intersection between Bbox_3 and Bbox_3
2019-06-13 10:26:28 +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
Andreas Fabri
d26517bd8f
more default:
2018-03-08 14:11:02 +00:00
Laurent Rineau
78e7060525
Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
...
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Maxime Gimeno
688b5dd06e
Move dependencies creation to package_info and add dependencies to git
2018-02-02 12:08:05 +01:00
Maxime Gimeno
8bde832931
Fix METIS headers in BGL
2018-02-02 12:08:05 +01:00
Maxime Gimeno
a676d5a60e
Try to fix errors in classification checks
2018-02-02 12:08:05 +01:00