Commit Graph

472 Commits

Author SHA1 Message Date
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
Laurent Rineau 0fa0c4fbb9 Merge pull request #4244 from maxGimeno/AABB_tree-Make_accelerate_distance_queries_default-maxGimeno
AABB_tree: make accelerate distance queries default
2019-12-05 11:05:35 +01:00
Laurent Rineau 3b5d13f023 Merge pull request #4250 from maxGimeno/PMP-Side_of_tm-use_bbox-maxGimeno
PMP: Make Side_of_triangle_mesh faster for disjoint meshes
2019-12-05 11:05:29 +01:00
Maxime Gimeno fb273ea62a Fix indentation 2019-12-03 09:33:09 +01:00
Maxime Gimeno 53458f1f42 Indentation 2019-12-02 16:13:20 +01:00
Maxime Gimeno 7b05052a27 Test if the tree is empty before building the kd-tree (to fix all the execution failures in the tests) 2019-11-18 10:27:04 +01:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +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
Sébastien Loriot 9221290bef add missing const 2019-10-11 08:07:02 +02:00
Maxime Gimeno dd566a2c96 Fixes 2019-09-24 13:49:10 +02:00
Maxime Gimeno 15d42d6cd2 Make the accelerate_distance_query() lazy and add a function to disable it. 2019-09-24 11:38:19 +02:00
Maxime Gimeno 2a3cce88e8 Fix AABB_tree with 1 primitive 2019-07-04 10:31:48 +02:00
Laurent Rineau 23f946a58a Merge pull request #3954 from maxGimeno/AABB_tree-All_intersected_primitives_for_tree-GF
AABB_tree: add do_intersect() for trees
2019-06-17 14:16:09 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Maxime Gimeno c873d7bf36 Documents do_intersect() for AABB_trees and add a test file 2019-05-23 16:14:56 +02:00
Sébastien Loriot 1d908c1c0b remove code for CGAL_INTERSECTION_VERSION 1 2019-03-29 13:28:32 +01:00
Sébastien Loriot affaa19327 remove workaround for non support of variadic template 2019-03-29 10:41:49 +01:00
Laurent Rineau 4d66f012c7 Merge pull request #3766 from sloriot/AABB_tree-more_robust_first_intersection
More robust first_intersection
2019-03-19 18:30:50 +01:00
Sébastien Loriot 3c0cc16c68 take the max coordinate instead of the non-zero one 2019-03-12 17:59:28 +01:00
Laurent Rineau 11bf3926e6 Merge branch 'releases/CGAL-4.12-branch' 2019-02-16 14:00:03 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Sébastien Loriot 0f9f217f50 add an important note for first_intersection 2019-02-12 16:10:41 +01:00
Laurent Rineau 0241fdc3eb Compatibility with both Point_3 and Weighted_point_3 2019-02-11 13:46:06 +01:00
Laurent Rineau d216131c79 New undocumented AABB primitive: cells of a 3D triangulation
The `Scene_c3t3_item` from our 3D demos now uses an AABB tree of
cells, instead of an AABB tree of triangles. That divides the number
of primitives by 4, and save times:

Before:
```
C3t3 facets AABB tree built in 22.010006904602051 wall-clock seconds
Scene_c3t3_item_priv::computeIntersections in 0.50893402099609375 wall-clock seconds
```

After:
```
C3t3 cells AABB tree built in 13.072829008102417 wall-clock seconds
Scene_c3t3_item_priv::computeIntersections in 0.41458892822265625 wall-clock seconds
```

The gain seems mostly in the construction of the tree (40% saved), and
the gain on the queries seems lower (about 20%).
2019-02-11 13:22:11 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Andreas Fabri 81d4227e57 Fix AABB tree 2019-01-10 18:40:10 +01:00
Andreas Fabri 6cc109f7c4 AABB Tree testsuite 2018-11-28 09:07:36 +01:00
Sébastien Loriot 6400cc5d5a fix doc warning 2018-11-12 11:28:23 +01:00
Sébastien Loriot 9c9d4ea6c6 fix doc warnings 2018-11-02 14:40:53 +01:00
Sébastien Loriot 056c778305 Merge pull request #3370 from maxGimeno/AABB_tree-Change_facegraph_triangle_primitive_id-GF
Aabb_tree: change the id of AABB_face_graph_triangle_primitive and AABB_halfedge_graph_segment_primitive
2018-11-02 10:34:26 +01:00
Sebastien Loriot 5be2958fae
Merge pull request #3386 from maxGimeno/AABB_tree-Override_build_function_with_shared_data-GF
AABB_tree: Add an overload to build() for shared data
2018-11-02 10:31:22 +01:00
Sébastien Loriot 34527a3dc3 remove extra template keyword 2018-10-31 06:20:37 +01:00
Sébastien Loriot cdbe19b480 Merge pull request #3369 from maxGimeno/AABB_tree-AABB_transformed_traits-GF
[Small Feature] Add collision detection in PMP
2018-10-30 15:49:38 +01:00
Laurent Rineau 62c33b9df4 Merge pull request #3390 from maxGimeno/AABB_tree-Add_datum_function-GF
AABB_tree: add datum()
2018-10-29 10:27:57 +01:00
Maxime Gimeno c05f2f98f8 Use the helper type but hide it in the doc 2018-10-12 10:21:13 +02:00
Maxime Gimeno 500c2a7200 Only document Datum_reference as return type 2018-10-11 10:13:26 +02:00
Maxime Gimeno 8f6d68152b add doc 2018-10-10 12:16:22 +02:00
Maxime Gimeno eacf880034 Add a const function datum() to AABB_tree and test. 2018-10-10 11:55:23 +02:00
Maxime Gimeno 1b5cfa66e6 Edit after review 2018-10-09 15:06:14 +02:00
Sébastien Loriot eb8e5e5b35 change the Id in the base class + update pmaps to handle also pairs 2018-10-09 14:15:26 +02:00
Maxime Gimeno 4615c636d5 Inherit from the helper class to avoid storing the graph if tag is true. 2018-10-09 14:14:51 +02:00
Maxime Gimeno da01fb43ee fix doc and don't duplicate the id. Use a pointer to the graph. 2018-10-09 14:14:51 +02:00
Maxime Gimeno 1d7e07b954 Fix doc 2018-10-09 14:14:51 +02:00
Maxime Gimeno 1960e01aeb fixes and do the same for the edges 2018-10-09 14:14:51 +02:00
Maxime Gimeno 232373c9ca Change the Id of the AABB_face_graph_triangle_primitive so it contains the mesh if necessary. 2018-10-09 14:14:51 +02:00
Sébastien Loriot baf27bbd6e use const map (non-const map should be convertible to const map in practice) 2018-10-09 10:28:45 +02:00
Maxime Gimeno 3e2d61e29d Move traits in PMP/internal 2018-10-09 10:28:43 +02:00