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
Maxime Gimeno
401e06c64c
fix warning
2020-03-25 15:24:07 +01:00
Maxime Gimeno
586987e377
fix warning.
2020-03-23 11:56:14 +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
c368b349d5
clean-up
2020-01-15 15:26:02 +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
Sébastien Loriot
530fa6be62
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'
2019-12-20 09:48:05 +01:00
Laurent Rineau
6f3db341f9
Fix issue #4357
...
Compilation error if <CGAL/Intersections_3/Triangle_3_Triangle_3.h> is included first.
2019-12-04 09:40:59 +01:00
Laurent Rineau
bbe02d9f7b
Fix the license header
2019-10-29 15:22:49 +01:00
Laurent Rineau
ee357fd5dd
Merge remote-tracking branch 'cgal/master' into Intersections_3-Add_T_3_Cub_3-maxGimeno
2019-10-29 15:19:24 +01:00
Maxime Gimeno
3000cbbf8b
Fix warning
2019-10-23 11:20:48 +02:00
Maxime Gimeno
2bfa95a2ed
more indentation fixes
2019-10-23 09:56:56 +02:00
Maxime Gimeno
9a8f26ced7
More changes after review
2019-10-22 16:28:57 +02:00
Mael Rouxel-Labbé
a5f09f89a6
Partial code cleaning (and fix some typedefs)
2019-10-22 12:36:58 +02:00
Mael Rouxel-Labbé
b4fb7cb779
Minor improvements to Cuboid/Tr computations
...
- Slight robustness improvements by storing in memory that the intersection
points are by construction on the plane.
- const& and such
Pair programming w/ mgimeno!
2019-10-22 11:23:35 +02:00
Mael Rouxel-Labbé
ee054a862c
Minor improvements to Cuboid/Tr computations
...
- Slight robustness improvements by storing in memory that the intersection
points are by construction on the plane.
- const& and such
Pair programming w/ mgimeno!
2019-10-22 11:19:45 +02:00
Maxime Gimeno
ea3dc6c936
Add Cub_3-T_3 intersection
2019-10-21 16:18:46 +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
b9d33c7ffa
Fix Conflicts
2019-06-25 13:25:57 +02:00
Maxime Gimeno
89b35a5b17
Add missing case for Pl / Cub
2019-06-25 13:15:51 +02:00
Laurent Rineau
55c9a175b5
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-06-21 10:34:18 +02:00
bryantcurto
056e846e0d
Fixed do_intersect() ambiguity.
...
Occurs when compiling with clang
2019-06-21 10:33:46 +02:00
Laurent Rineau
53ba851c89
Merge pull request #3990 from bryantcurto/patch-1
...
do_intersect() Ambiguity
2019-06-20 14:21:05 +02:00
Maxime Gimeno
d9b09ef001
Clean-up loop
2019-06-17 15:54:25 +02:00
Maxime Gimeno
e58b4475e7
clean-up
2019-06-17 15:24:43 +02:00
Maxime Gimeno
3e5d3acb2f
Replace the virtual helper class with a CRTP pattern to avoid the virtual methods.
2019-06-17 15:17:58 +02:00
Maxime Gimeno
6f2930acac
Add missing license headers
2019-06-14 13:19:06 +02:00
Maxime Gimeno
a9facfc574
Add misisng intersections for bbox_3
2019-06-13 10:31:20 +02:00
Maxime Gimeno
c391e0e876
add Cub_tr as a Lazy implementation. Remains only Bbo intersections for the 3D
2019-06-13 10:27:16 +02:00
Maxime Gimeno
5e9891ea75
Tet / tr
2019-06-13 10:27:17 +02:00
Maxime Gimeno
38bf604b4a
Add intersections for Tet/plane
2019-06-13 10:27:16 +02:00
Maxime Gimeno
abeb0cf52d
Add intersection Ray_3 / Tetrahedron_3
2019-06-13 10:27:00 +02:00
Maxime Gimeno
107e4e2abd
Add intersection Ray_3 / Tetrahedron_3
2019-06-13 10:26:28 +02:00
Maxime Gimeno
9cb1173a41
Add intersection Tetrahedron_3 / Segment_3
2019-06-13 10:26:28 +02:00
Maxime Gimeno
469ed5396b
Add Tet / line intersections
2019-06-13 10:26:28 +02:00
Maxime Gimeno
119ca0dff8
Add Intersection between Bbox_3 and Bbox_3
2019-06-13 10:26:28 +02:00
bryantcurto
39bceb093c
Fixed do_intersect() ambiguity.
...
Occurs when compiling with clang
2019-06-07 11:57:19 -04:00
Andreas Fabri
4581f1b7a8
Morte replacements
2019-06-05 08:39:55 +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
4d3671024d
Merge pull request #3855 from sgiraudot/Intersections_3-Fix_almost_collinear_segments_bug-GF
...
Intersections_3: Fix almost collinear segment bug
# Conflicts:
# Intersections_3/include/CGAL/Intersections_3/internal/intersection_3_1_impl.h
2019-05-06 15:45:41 +02:00