Sébastien Loriot
6d6b8426ad
(do_not_)accelerate_distance_queries() are non-const methods
2020-04-22 11:09:15 +02:00
Sébastien Loriot
e4010a7875
rename variable with ambiguous name
2020-04-22 11:03:04 +02:00
Maxime Gimeno
5b2d46cfa0
Fixes for min/max
2020-04-21 12:04:45 +02:00
Maxime Gimeno
50766d9d03
Fixes for min/max
2020-04-21 11:52:56 +02:00
Maxime Gimeno
e9d41d7b7d
Fixes for min/max
2020-04-21 11:38:37 +02:00
Sébastien Loriot
41ae2c31bb
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 19:28:26 +01:00
Sébastien Loriot
c67d093ebf
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:28:07 +01:00
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
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
Ahmed Essam
a3f0452771
Update CHANGES.md
2020-03-07 04:36:59 +02:00
Ahmed Essam
2b9c2c1634
Test AABBTree move semantics
2020-03-07 04:28:13 +02:00
Ahmed Essam
587c77774c
No need to check existance of package if REQUIRED is used
2020-03-06 16:34:40 +02:00
Ahmed Essam
49465bbcb6
Use stack variable instead of pointer
2020-03-06 16:28:21 +02:00
Ahmed Essam
95c1af0224
Add tree creation benchmark
2020-03-06 16:13:22 +02:00
Ahmed Essam
5f8e3bc3cf
Use lval ref instead of perfect forwarding in set_children
...
Co-Authored-By: Sebastien Loriot <sloriot.ml@gmail.com>
2020-03-03 15:00:42 +02:00
Ahmed Essam
5e9801839d
Add move constructor to AABB tree and use smart pointers
2020-03-01 02:44:34 +02:00
Andreas Fabri
48fedbae06
Typos: splitted -> split
2019-12-11 16:57:34 +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
Laurent Rineau
15d9e1f0ff
Restore the alphabetical order of `dependencies` files
2019-10-31 14:41:37 +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
Martin Skrodzki
16e0a475f4
Fix traversal order, add comment on benchmark results.
2019-10-14 00:28:08 +02:00
Sébastien Loriot
9221290bef
add missing const
2019-10-11 08:07:02 +02:00
Sébastien Loriot
6e73f92fd2
fix nb of primitives
2019-09-27 07:15:17 +02:00
Sébastien Loriot
a4aa6a7b77
rework expression
2019-09-26 15:54:43 +02:00
Andreas Fabri
6027b2d5f7
Add Traits::intersection_with_priority()
2019-09-26 15:15:50 +02:00
Maxime Gimeno
dd566a2c96
Fixes
2019-09-24 13:49:10 +02:00
Maxime Gimeno
a52592909f
Remove all calls to accelerate_distance_queries(), now redundant.
2019-09-24 11:44:20 +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
Sébastien Loriot
2e747dd300
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD
2019-07-18 17:01:42 +02:00
Sebastien Loriot
667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
...
match @{ and @}
2019-07-18 16:26:43 +02:00
Maxime Gimeno
261c596cfc
Merge branch 'CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF
2019-07-10 14:04:34 +02:00
Maxime Gimeno
1184530530
More warnings fixed
2019-07-10 14:02:06 +02:00
Sébastien Loriot
983645a51a
match @{ and @}
2019-07-05 21:49:46 +02:00
Maxime Gimeno
2a3cce88e8
Fix AABB_tree with 1 primitive
2019-07-04 10:31:48 +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
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
Laurent Rineau
be0d07d150
Merge pull request #3979 from afabri/CGAL-null_ptr-GF
...
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Laurent Rineau
96912aaa20
Merge branch 'releases/CGAL-4.14-branch'
2019-06-17 13:53:42 +02:00
Laurent Rineau
19e1dd8c3f
Merge pull request #3937 from sloriot/Slicer-fix_default_vpm
...
Fix default vertex point map
2019-06-17 13:51:38 +02:00
Maxime GIMENO
e636faedcd
Update AABB_tree/test/AABB_tree/aabb_test_all_intersected_primitives_tree.cpp
...
Yes ! I added it last second, after the test and before the push >_<
Co-Authored-By: Laurent Rineau <Laurent.Rineau@cgal.org>
2019-06-14 11:31:31 +02:00
Maxime Gimeno
476f742745
Change test so that the order of the intersected primitives does not matter. Also fix for warning.
2019-06-14 10:51:18 +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
f855546ad1
add missing template parameter
2019-05-15 13:00:01 +02:00
Sébastien Loriot
ce126b87c6
remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead
2019-03-29 13:28:32 +01:00
Sébastien Loriot
1d908c1c0b
remove code for CGAL_INTERSECTION_VERSION 1
2019-03-29 13:28:32 +01:00
Sébastien Loriot
d60f5645aa
replace BOOST_FOREACH by c++ ranged-based for loop
...
some of the command used for the replacement:
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +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
Laurent Rineau
d89b70dd9a
Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch
2019-03-19 18:25:32 +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
2671d056cf
Merge pull request #3685 from afabri/CGAL-cleanup-GF
...
CGAL: Clean up examples and tests
2019-02-28 20:48:48 +01:00
Laurent Rineau
8693f95dac
Merge pull request #3619 from albert-github/feature/bug_headers
...
Update of headers
2019-02-22 16:39:09 +01:00
Laurent Rineau
ea279fb38c
Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch
2019-02-18 16:54:29 +01:00
Laurent Rineau
11bf3926e6
Merge branch 'releases/CGAL-4.12-branch'
2019-02-16 14:00:03 +01:00
Andreas Fabri
e62ab30e6c
Fixes of fixes
2019-02-15 09:03:58 +01:00
Sébastien Loriot
59bc453b42
first batch of replacement for level 1 in classified ref man
...
command used:
grep -l "##" */doc/*/PackageDescription.txt | xargs sed -i -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Andreas Fabri
d0ba5e40a9
AABB_tree, BGL
2019-02-14 09:44:18 +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
2455affba0
Move the addition of -Wno-deprecated-copy to CGAL_Qt5 setup
...
That way:
- that will work, even if CGAL CXX_FLAGS are copied (when hte CMake
options `CGAL_DEV_MODE` or `RUNNING_CGAL_AUTO_TEST` are `ON`),
- that will affect all CGAL Qt5 demos at once.
2019-02-06 11:47:44 +01:00
Maxime Gimeno
ff4f13e82c
Fix CMake tests for GCC version
2019-02-04 09:08:48 +01:00
Andreas Fabri
5163d04c8a
Fix AABB_tree
2019-01-31 15:09:07 +01:00
Andreas Fabri
a3d18ca933
Fix AABB_tree demo
2019-01-31 14:41:20 +01:00
Laurent Rineau
afc3de2894
Merge branch 'master' into Stream_support-Color-GF
2019-01-23 09:37:08 +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
81d4227e57
Fix AABB tree
2019-01-10 18:40:10 +01:00
Laurent Rineau
a553357562
Merge pull request #3490 from afabri/CGAL-VC2017_deprecated_warnings-GF
...
CGAL Suppress VC2017 deprecation warnings concerning boost
2018-12-19 16:12:20 +01:00
Andreas Fabri
10e11e6eb2
Do not call deprecated code. Add a test file for the deprecated code
2018-12-13 09:43:14 +01:00
Andreas Fabri
474ec90f4a
Do not include <boost/iterator.hpp>
2018-12-05 19:08:17 +01:00
Andreas Fabri
6cc109f7c4
AABB Tree testsuite
2018-11-28 09:07:36 +01:00
Sebastien Loriot
d890a27800
Merge pull request #3451 from sloriot/AABB_tree-doc_warning
...
Fix doc warning
2018-11-14 18:52:42 +01:00
Sébastien Loriot
6400cc5d5a
fix doc warning
2018-11-12 11:28:23 +01:00
Guillaume Damiand
7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand
2018-11-05 07:32:58 +01:00
Sébastien Loriot
9c9d4ea6c6
fix doc warnings
2018-11-02 14:40:53 +01:00
Maxime Gimeno
aee51d4b42
Add Dependency to Distance_3
2018-11-02 11:36:43 +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
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
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
1a9b9677a3
more tests
2018-10-10 14:55:45 +02:00
Maxime Gimeno
06c400ad86
Use a primitive without shared data in the test
2018-10-10 14:42:02 +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
Maxime Gimeno
10f1f06507
Move plugin in Polyhedron
2018-10-09 10:29:20 +02:00
Sébastien Loriot
2a450cae9f
remove no longer valid test
2018-10-09 10:29:20 +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
Sébastien Loriot
c3943386bc
rename main class
2018-10-09 10:28:45 +02:00
Sébastien Loriot
51cb7410e2
add document and clean-up API
2018-10-09 10:28:45 +02:00
Sébastien Loriot
27da7aea88
do not copy meshes
2018-10-09 10:28:45 +02:00
Sébastien Loriot
74c8eaec29
use named parameters
...
I removed the constructor from a range of meshes as it is complicated to
specify a range of vertex point map.
2018-10-09 10:28:44 +02:00
Sébastien Loriot
d206112f01
add vertex point map as parameter
2018-10-09 10:28:44 +02:00
Maxime Gimeno
2f77454882
Fix clean-up()
2018-10-09 10:28:44 +02:00
Maxime Gimeno
1cba77086d
Fix Orange item.
2018-10-09 10:28:44 +02:00
Sébastien Loriot
beaded520d
add missing protectors and clean-up
2018-10-09 10:28:43 +02:00
Maxime Gimeno
7a3c441489
Fix plugin and WIP make precompute boxes
2018-10-09 10:28:43 +02:00
Maxime Gimeno
2013885eb4
WIP fix plugin
2018-10-09 10:28:43 +02:00
Maxime Gimeno
6a137a127e
Add test for triangle mesh in plugin.
2018-10-09 10:28:43 +02:00
Maxime Gimeno
dd78147d3a
Add if test for optimisation if SUPPORTS_ROTATION is Tag_true;
2018-10-09 10:28:43 +02:00
Sébastien Loriot
f77725882b
use Interval_nt_advanced with protectors
2018-10-09 10:28:43 +02:00
Sébastien Loriot
c73b015403
use the default tree to be fair
2018-10-09 10:28:43 +02:00
Maxime Gimeno
3e2d61e29d
Move traits in PMP/internal
2018-10-09 10:28:43 +02:00
Maxime Gimeno
7da9adfa90
Addadd_mesh() to the class.
2018-10-09 10:28:43 +02:00
Maxime Gimeno
8f9b5ba86b
Add Transparency Mode and make it more robust
2018-10-09 10:28:43 +02:00
Maxime Gimeno
d2e58526a7
Use Rigid_mesh_intersection and make it work for n items.
2018-10-09 10:28:43 +02:00
Sébastien Loriot
c32820fe8b
reuse conversions
2018-10-09 10:28:43 +02:00
Sébastien Loriot
caa5135c18
simplify traits and always use transformed primitives
2018-10-09 10:28:42 +02:00
Sébastien Loriot
8486cff633
add an extra flag to force the evaluation of the transformation
2018-10-09 10:28:42 +02:00
Maxime Gimeno
0cedb5f0b6
Selected_item has color, other one is wireframe.
2018-10-09 10:28:42 +02:00
Maxime Gimeno
2823f46f98
De-activate inclusion test and make both items movable.
2018-10-09 10:28:42 +02:00
Sébastien Loriot
680191dccd
remove trailing whitespaces
2018-10-09 10:28:42 +02:00
Sébastien Loriot
3d50da882e
cosmetic changes
2018-10-09 10:28:42 +02:00
Sébastien Loriot
8bac45bebc
inverse red and green
2018-10-09 10:28:42 +02:00
Sébastien Loriot
e6c7c34783
fix bbox computation and factorize
2018-10-09 10:28:42 +02:00
Maxime Gimeno
278600266d
Add external plugin to AABB_tree for do_intersect demo.
2018-10-09 10:28:42 +02:00
Maxime Gimeno
622509816b
Fix rotation of boxes
2018-10-09 10:24:32 +02:00
Maxime Gimeno
f236176d55
Add missing file
2018-10-09 10:24:32 +02:00
Maxime Gimeno
319893bdb1
Add Filtered_predicates and manage all Aff_transf
2018-10-09 10:24:32 +02:00
Maxime Gimeno
2c23959347
rename and transform primitives. Don't transform mesh in test.
2018-10-09 10:24:32 +02:00
Maxime Gimeno
8e64d49513
WIP: Remove the traits_base
2018-10-09 10:24:32 +02:00
Maxime Gimeno
48c0cc02a2
Add Filtered_predicates support
2018-10-09 10:24:32 +02:00
Maxime Gimeno
36fd62f8c6
Add benchmark for tree intersection
2018-10-09 10:24:32 +02:00
Sébastien Loriot
f5ef4b0034
add a naive way to intersect two AABB-trees
2018-10-09 10:24:32 +02:00
Maxime Gimeno
d2f4e19e36
Add transformations to the new traits and add a test for it.
2018-10-09 10:24:32 +02:00
Maxime Gimeno
a764322b7d
Create a dummy traits and fix AABB_traits and AABBTraits implem/doc problems.
2018-10-09 10:24:31 +02:00
Maxime Gimeno
79e54aedd8
indentation
2018-10-08 14:26:44 +02:00
Maxime Gimeno
7990fd4f27
Add an overload to build() for shared data
2018-10-08 14:14:49 +02:00