Laurent Rineau
b134ed8246
Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
...
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:07:32 +01:00
Laurent Rineau
8dbf50a94b
Create CGAL::make_filled_array
...
That function template will replace my adhoc
`create_array_of_triangulation`.
2021-02-03 21:50:10 +01:00
Laurent Rineau
de8bf2fd87
Fix Triangulation_hierarchy_3::operator=(Triangulation_hierarchy_3&&)
2021-02-01 23:17:21 +01:00
Laurent Rineau
f218fb8d3a
Fix the segfault in the previous commit (WIP: Second try)
2021-02-01 14:46:42 +01:00
Laurent Rineau
b4256accb9
WIP: Second try
...
Something is off, because the test suite does not pass.
2021-01-28 16:04:27 +01:00
Laurent Rineau
ce75d010e9
First try: use nullptr as a criterion to detect a moved-from object
2021-01-28 14:19:22 +01:00
Maxime Gimeno
a85cf6ed52
Move the include in the ifdef
2021-01-26 09:45:18 +01:00
Maxime Gimeno
04753381e5
Rename file and add ::Qt
2021-01-12 13:22:34 +01:00
Maxime Gimeno
95192d6d4b
factorize context initialization
2021-01-12 13:08:58 +01:00
Maxime Gimeno
2a212bb2a8
Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples
2021-01-07 13:06:40 +01:00
Sébastien Loriot
1e249afdb3
remove some boost::bind
2021-01-06 12:59:11 +01:00
Andreas Fabri
24c9ef34b7
Constrcut double to avoid VC++ warning C5055
2021-01-01 10:38:31 +00:00
Giles Bathgate
b95de74a7a
Fix uninitialized member in Triangulation_3.h
2020-11-18 21:26:59 +00:00
Jane Tournois
10a28d1262
attempt to fix "variable used non initialized"
2020-11-05 11:13:26 +01:00
Jane Tournois
b87e226ebb
Simplex_3 can be dereferenced in range-for-loop (not Cell_handle)
...
this error was found thanks to a clang warning :
warning: loop variable 's' has type 'const Simplex &' (aka 'const Triangulation_simplex_3&')
but is initialized with type
'CGAL::Triangulation_segment_simplex_iterator_3' resulting in a copy [-Wrange-loop-construct]
2020-11-03 18:53:02 +01:00
Jane Tournois
667171927a
fix uninitialized parameter, and member, warnings
2020-11-03 17:57:30 +01:00
Jane Tournois
41e1e40827
fix the case ...-vertex-cell-end
2020-10-29 11:59:02 +01:00
Jane Tournois
d48aa33305
fix degenerate some degenerate cases
...
in particular iterations ending with :
- cell-vertex-facet
- vertex-edge-vertex
- cell-vertex-facet
2020-10-27 15:32:01 +01:00
Jane Tournois
2bf4da4edc
Merge branch 'master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF
...
# Conflicts:
# Installation/CHANGES.md
2020-10-19 16:27:04 +02:00
Jane Tournois
57250ce637
Merge remote-tracking branch 'cgal/master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF
...
# Conflicts:
# Installation/CHANGES.md
2020-09-28 16:01:05 +02:00
Jane Tournois
5c8df6672a
remove CGAL_CFG_MATCHING_BUG_ variants
...
the "matching bug" of msvc has been fixed since at least vs 2015
2020-09-25 14:25:14 +02:00
Laurent Rineau
022b1a71d0
Merge branch 'releases/CGAL-5.0-branch'
2020-07-21 15:27:49 +02:00
Laurent Rineau
2e8a59d570
Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch
2020-07-21 15:25:54 +02:00
Sébastien Loriot
0a530e39e7
remove extra const
2020-07-20 15:28:50 +02:00
Laurent Rineau
1e6a5ac636
Fix the use of Construct_point_3::result in Periodic_3
2020-07-16 15:11:23 +02:00
Maxime Gimeno
41175cd505
WIP
2020-07-16 14:47:41 +02:00
Jane Tournois
e7bfe4cb6f
add missing license header
2020-07-06 15:27:16 +02:00
Jane Tournois
ea3ef4f1b7
ltnext can also be OUTSIDE_AFFINE_HULL, not necessarily facet
...
in particular when query segment ends on a vertex
2020-07-06 08:19:12 +02:00
Jane Tournois
9e8d12d9cf
Merge remote-tracking branch 'cgal/master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF
...
# Conflicts:
# Installation/CHANGES.md
2020-07-06 06:57:32 +02:00
Jane Tournois
99ea974425
remove unnecessary includes
2020-07-06 06:54:05 +02:00
Jane Tournois
3ec4c5460a
fix license header
2020-07-06 06:53:49 +02:00
Jane Tournois
4eb10d8323
fix license header
2020-07-06 06:44:00 +02:00
Laurent Rineau
07eacf5231
Merge pull request #4795 from janetournois/Mesh_3-fix_optimisers_parallel-jtournois
...
Mesh_3 - fix parallel optimisers
2020-06-30 16:38:05 +02:00
Laurent Rineau
ad23db27a3
Merge pull request #4795 from janetournois/Mesh_3-fix_optimisers_parallel-jtournois
...
Mesh_3 - fix parallel optimisers
2020-06-30 16:36:58 +02:00
Jane Tournois
bce4b4e80a
Revert "add an assertion in make_canonical"
...
This reverts commit f55ffabbe0 .
In the exuder, it can happen that this function takes the triple
(Vertex_handle(), Vertex_handle(), Vertex_handle())
so the assertion does not hold
2020-06-26 14:57:02 +02:00
Laurent Rineau
bcf8409e46
Merge pull request #4611 from rathod-sahaab/replace-throws-with-noexcept
...
replaced throw() with noexcept
2020-06-23 18:50:20 +02:00
Jane Tournois
3b8c06f836
fix adjacent_vertices_threadsafe
...
internal::Has_member_visited<Vertex> is not threadsafe
2020-06-19 13:31:52 +02:00
Jane Tournois
daaf92d0ac
rename make_canonical() to make_canonical_oriented_triple()
...
to make it more explicit
2020-06-19 13:31:51 +02:00
Jane Tournois
f55ffabbe0
add an assertion in make_canonical
...
it also helps to make the code more explicit
2020-06-19 13:31:51 +02:00
Jane Tournois
ad9c357f33
add adjacent_vertices_threadsafe and use it in nearest_power_vertex()
2020-06-19 13:31:50 +02:00
Laurent Rineau
dcc4fb1cc1
Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
...
# Conflicts:
# STL_Extension/include/CGAL/Compact_container.h
2020-05-20 09:46:26 +02:00
Jane Tournois
9a722c4ef1
Merge branch 'master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF
2020-04-20 06:40:24 +02:00
Jane Tournois
0e45fdc64e
use "permanent" coplanar_orientation() and collinear()
...
instead of generating it on the fly each time
2020-04-16 14:18:01 +02:00
Sébastien Loriot
a49881536d
fix compilation errors and warnings
2020-04-10 18:30:50 +02:00
Sébastien Loriot
d845d6ce8d
Merge remote-tracking branch 'cgal/master'
2020-04-10 18:16:18 +02:00
Sébastien Loriot
2876ad9af1
remove trailing whitespaces
2020-04-10 18:15:32 +02:00
Mael Rouxel-Labbé
c16c1a7ea3
Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF
2020-04-10 16:10:11 +02:00
Jane Tournois
163f3c59fb
add range iterators
2020-04-07 07:05:19 +02:00
Jane Tournois
a69d3f1188
replace all the std::get<i>(tuple) by private accessors
...
the code gets easier to read and write
2020-04-06 13:23:39 +02:00
Jane Tournois
2eadd494a8
replace CGAL::cpp11::tuple by std::tuple
2020-04-06 07:02:21 +02:00
Jane Tournois
1ef0d4b83d
segment traverser end() does not need s and t as parameters
...
the API gets simpler and easier with these changes
+ fix last valid value of the simplex iterator in some cases
after this commit, only the test test_triangulation_on_a_grid() keeps failing
2020-04-03 18:02:37 +02:00
Jane Tournois
b9660603b9
add the new API in the code
...
and adapt examples and tests consistently
2020-04-03 06:52:25 +02:00
Maxime Gimeno
b6a5f23e4e
remove trailing whitespaces
2020-04-02 15:02:27 +02:00
rathod-sahaab
dbbee667af
replaced throw() with noexcept
2020-04-02 18:31:00 +05:30
Maxime Gimeno
e02a3fc37e
Merge remote-tracking branch 'cgal/master' into TDS-file_input-maxGimeno
2020-04-02 15:00:23 +02:00
Maxime Gimeno
383eb3d147
Merge tag 'master_before_no_tws_nor_tabs' into TDS-file_input-maxGimeno
2020-04-02 14:56:03 +02:00
Jane Tournois
3aae44f631
apply Monique's doc review
2020-04-02 07:44:53 +02:00
Jane Tournois
a1b292e805
Merge remote-tracking branch 'cgal/master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF
2020-04-01 13:52:57 +01:00
Sébastien Loriot
d1a323c730
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 19:24:14 +01:00
Sébastien Loriot
86e25f7e71
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:23:54 +01:00
Sébastien Loriot
9f2eafd06e
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 19:17:02 +01:00
Sébastien Loriot
35b83deffd
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:16:25 +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
590612a563
run the script to remove tabs and trailing whitespaces
2020-03-26 13:25:16 +01:00
Mael Rouxel-Labbé
2556196dad
Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF
2020-03-23 08:59:49 +01:00
Sébastien Loriot
149c7a4afc
Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch'
2020-03-19 16:29:33 +01:00
Sébastien Loriot
d10359d09e
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'
2020-03-19 16:27:55 +01:00
Mael Rouxel-Labbé
100304667d
Remove CGAL::internal::boost_::function_property_map
...
This file was duplicated from BOOST 1.64 because it appeared in a boost
release that was younger than the oldest boost release supported by CGAL
when the file was first required.
The minimum boost version (1.57) now required by CGAL is younger
than the version in which the file appeared in boost (1.51)
and it can thus be removed.
2020-03-12 20:58:44 +01:00
Mael Rouxel-Labbé
fe1fd95d23
Fix always returning by copy when it is possible to return by reference
2020-03-09 15:31:51 +01:00
Maxime Gimeno
52cf9815e4
Remove free function and fix TDS3 test
2020-02-28 15:33:03 +01:00
Maxime Gimeno
66cd3401f9
Add a generic function in TDS_3 that takes a boolean argument to decide how to take care of the infinite_vertex, and use it in the T3 functions.
2020-02-26 10:57:55 +01:00
Laurent Rineau
7508a6f93c
Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
2020-02-12 17:05:49 +01:00
Laurent Rineau
24082a7114
Fix compilation errors, with a few compiler
...
```
include/CGAL/Triangulation_hierarchy_3.h:163:23: error: invalid use of 'this' at top level
noexcept(noexcept(this->Tr_Base::swap(tr)))
^~~~
```
That is actually the subject of a C++ Defect:
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1207
Anyway, this was used only for the `noexcept` specification of `swap`
functions, and I no longer use `swap` for the move semantic. I can
remove those noexcept` specifications.
2020-02-12 16:30:26 +01:00
Guillaume Damiand
72cb67bfff
Allows to deal with weighted points.
2020-02-12 10:34:15 +01:00
Mael
35f895db66
Merge branch 'master' into Spatial_sort-parallel-GF
2020-02-06 12:00:33 +01:00
Laurent Rineau
4261d4635b
Less use of swap
2020-02-04 10:12:29 +01:00
Laurent Rineau
20bb2c8428
Add move-semantic to CT_plus_2 and Tr_hierarchy_2
2020-01-31 16:28:07 +01:00
Laurent Rineau
290c3a2011
I forgot Triangulation_hierarchy_3 (Fast_location)!
...
Note that a move-from object of class `Triangulation_hierarchy_3` is
not really valid. I have just verified that it can be destroyed. Even
a call to `clear()` on a moved-from hierarchy will segfault!
To be fixed later...
2020-01-31 13:22:11 +01:00
Laurent Rineau
b311ab59ed
[modernize-use-nullptr] (clang-tidy)
2020-01-31 12:11:16 +01:00
Laurent Rineau
2717864bd7
Fix warnings cppcoreguidelines-special-member-functions (clang-tidy)
...
- Remove trivial copy-constructors that prevents the compiler to
generate the other special member functions.
2020-01-31 12:08:05 +01:00
Laurent Rineau
b56cdcb743
Add move-semantic to CGAL (non-periodic) 3D triangulations
...
- For `Triangulation_3`, the rule-of-zero cannot be used, because of
the infinite vertex. A special copy-constructor and copy-assignment
operators are required. But one can `= default the move-constructor
and move-assignment operator, as well as the destructor.
- For `Delaunay_triangulation_3`, the rule-of-zero is
sufficient. Nothing to do.
- For `Regular_triangulation_3`, the `hidden_point_visitor` data
member is a function that is constructed with the `this` pointer, so
the rule-of-zero cannot be used. Probably the move-constructor
and move-assignment operator could be explicitly defaulted.
2020-01-31 12:01:43 +01:00
Maxime Gimeno
85712ba28c
WIP replacing tbb deprecated includes.
2020-01-14 15:03:20 +01:00
Maxime Gimeno
065a7ac0c6
Add a test for file_input()
2020-01-10 13:14:31 +01:00
Maxime Gimeno
9fe491adfb
Update license header
2020-01-10 11:54:48 +01:00
Maxime Gimeno
82bcfb7087
Add license and remove need for operator(const C&), which cannot be called.
2020-01-09 10:01:31 +01:00
Maxime Gimeno
2bfdc8398f
Move the file_input.h file to Triangulation_3 and write some doc. Unify with the API of copy_tds() and adapt the c3t3_io plugin.
2020-01-08 16:37:39 +01:00
Mael
8a48be1dd8
Remove unused macro
2019-12-12 13:10:25 +01:00
Laurent Rineau
c08c632fc8
Merge branch 'releases/CGAL-5.0-branch' into T3_accelerate_insert_in_hole-rebased
2019-12-10 13:02:24 +01:00
Laurent Rineau
435bb4d4c4
Cleanup the patch
2019-12-10 10:59:13 +01:00
Andreas Fabri
7c9ef9c9f2
Move code into TDS_3 and make it work for parallel mode
2019-12-10 10:20:12 +01:00
Andreas Fabri
27a93fc25a
First cleanup
2019-12-10 10:19:07 +01:00
Andreas Fabri
9303a3318a
Use small_vector for find_conflicts()
2019-12-10 10:19:07 +01:00
Laurent Rineau
a9abea6dc7
Use local small-indices, 2% win.
2019-12-10 10:18:57 +01:00
Laurent Rineau
a93dd81642
Cleanup
2019-12-10 10:17:08 +01:00
Andreas Fabri
f2eea9cf78
Call clear()
2019-12-10 10:17:08 +01:00
Andreas Fabri
a3fc6790ca
Use a boost::small_vector instead of a std::deque in a stack
2019-12-10 10:17:08 +01:00
Andreas Fabri
6462016ce3
Use an unordered map to find neighbor cells
2019-12-10 10:17:03 +01:00
Andreas Fabri
b98d2f6876
Fix examples
2019-11-04 16:45:30 +01: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
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
Jane Tournois
a5bf1e1662
make walk_to_next_3() const
...
and declare variables later when possible
2019-10-14 16:04:56 +02:00
Jane Tournois
d145abaf9a
temporarily change the example for debugging : the commented queries do pass
2019-10-08 17:39:35 +02:00
Jane Tournois
80553fbfb1
improve deal of degenerate cases for simplex traverser
2019-10-08 16:48:41 +02:00
Jane Tournois
27eedb168a
fix the case where source, target, and vert[i] are aligned
...
Revert "deal with another degenerate case"
This reverts commit f269280dd6 .
2019-10-07 17:38:27 +02:00
Jane Tournois
aaf8aa404e
fix moving to end()
2019-10-04 16:21:17 +02:00
Jane Tournois
f269280dd6
deal with another degenerate case
...
when reaching end(), and when source, target, and the vertex vi are aligned,
o0 is ZERO and o1 is ZERO too
but target target can be `inside` anyhow
2019-10-04 14:30:43 +02:00
Laurent Rineau
3c06351ec5
Fix operator-> and add const to the reference and pointer types
2019-10-03 15:02:34 +02:00
Jane Tournois
d4289524a9
fix the constructor of Triangulation_segment_cell_traverser
...
until now, when the query segment started exactly on a vertex/edge/facet,
the constructor was setting _cur to one cell incident to this vertex/edge/facet,
not necessarily the one that was intersected by the segment query
this commit fixes it by introducing the function
`jump_to_intersecting_cell()`, that changes _cur to point to the right cell
2019-10-03 12:25:36 +02:00
Jane Tournois
5813b65267
fix the end conditions of simplex iterator
...
now we get the last simplex traversed before getting end()
2019-10-03 12:25:36 +02:00
Laurent Rineau
3694d7a005
Only use polymorphism if CGAL_TST_ASSUME_CORRECT_TYPES is undefined
2019-09-12 13:10:14 +02:00
Laurent Rineau
c78d4b66a9
Add SPDX license headers
2019-09-12 10:01:20 +02:00
Laurent Rineau
2acb975ba4
Merge 'cgal/master' to fix conflicts
2019-09-11 14:35:38 +02:00
Laurent Rineau
e4e065fad5
'how to make superclass for inserter pattern.txt' turned to comment
2019-09-11 11:22:36 +02:00
Laurent Rineau
b438e73b4b
cleanup: synchronize with the older branch
2019-09-11 11:04:34 +02:00
Jane Tournois
9d23b2f20c
move functions from Triangulation_3 to the traverser header
...
now Triangulation_3.h is the same as in cgal/master branch,
and everything specific to the traverser has been moved to
the traverser header
2019-09-10 19:26:43 +02:00
Jane Tournois
3f96a41f93
fix warning : code not reached
2019-09-10 19:21:45 +02:00
Jane Tournois
4e419e9c75
little cleaning around CGAL_FAST_TRAVERSER
...
using this code speedups the traversal by 20% with Epick, 35% with Epeck
and our tests remain valid,
so we can remove the macro and activate the code
2019-09-10 19:21:45 +02:00
Jane Tournois
0d6a9e8367
add a benchmark for simplex traverser and cell traverser
2019-09-10 19:21:45 +02:00
Laurent Rineau
bbf559ee17
Merge remote-tracking branch cgal/master into Triangulation_segment_traverser_3-tvanlank
2019-09-10 19:21:38 +02:00
Laurent Rineau
88a915779f
Merge tag 'base2018' into HEAD
...
# Conflicts:
# Triangulation_3/examples/Triangulation_3/CMakeLists.txt
# Triangulation_3/include/CGAL/Triangulation_3.h
# Triangulation_3/include/CGAL/Triangulation_utils_3.h
2019-09-10 18:41:08 +02:00
Laurent Rineau
dc02598a5c
Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
...
CGAL: more viewers
2019-07-10 14:22:50 +02:00
Laurent Rineau
dbb1cb6c9b
Merge pull request #3974 from afabri/Triangulation-add_ranges-GF
...
Triangulation_{2,3): Add ranges
2019-07-01 11:16:05 +02:00
Guillaume Damiand
67307dcead
Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments.
2019-06-19 15:48:10 +02:00
Andreas Fabri
f7b7b9957f
Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF
2019-06-05 14:47:11 +02:00
Andreas Fabri
4581f1b7a8
Morte replacements
2019-06-05 08:39:55 +02:00
Andreas Fabri
5532b84b4f
nullptr_t -> std::nullptr_t
2019-06-05 07:28:56 +02:00
Andreas Fabri
e2d19b0c8d
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-04 23:45:44 +02:00
Andreas Fabri
285cdd5be5
Add more ranges and a testsuite
2019-06-04 10:40:13 +02:00
Andreas Fabri
4c9bda8169
Use C++11 for loop in examples
2019-06-03 17:23:32 +02:00
Andreas Fabri
edd84534a9
Fix code
2019-06-03 17:02:18 +02:00
Andreas Fabri
b42fd4428d
Triangulation_{2,3): Add ranges
2019-06-03 15:36:34 +02:00
Andreas Fabri
d067fb409a
uncomment
2019-05-21 17:18:11 +02:00
Andreas Fabri
f354210be3
Add using statements
2019-05-21 14:32:03 +02:00
Andreas Fabri
2d1c78fdd9
Unify T3
2019-05-20 18:23:08 +02:00
Sébastien Loriot
124012d9f9
replace cpp11::array by std::array
2019-03-29 13:28:33 +01:00
Sébastien Loriot
0ce7fc09b5
turns iterator pairs into iterable ranges
2019-03-29 13:28:22 +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
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
Andreas Fabri
88add6bc7b
Regular_triangulation_3: Add undocumented Regular_triangulation_cell_base_3::hidden_points()
2019-02-07 15:24:00 +01:00
Laurent Rineau
afc3de2894
Merge branch 'master' into Stream_support-Color-GF
2019-01-23 09:37:08 +01:00
Mael Rouxel-Labbé
c4b82ba14b
Added swap() and an assignement operator for RT3
2019-01-21 14:48:28 +01:00
Andreas Fabri
380cffffb1
Remove copy constructor instead of adding operator= as it triggers a compilation error VC12 Poisson
2019-01-15 09:32:21 +01:00
Andreas Fabri
806ba2ec98
Add operartor= for DT3
2019-01-10 18:29:52 +01:00
Sébastien Loriot
61169b394e
Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch'
2019-01-04 17:19:19 +01:00
Mael Rouxel-Labbé
b6f6aeb844
Merge remote-tracking branch 'mine/T3-Fix_weighted_ranges_insertion_removal-GF' into T3-Fix_weighted_ranges_insertion_removal-GF
2018-12-18 13:20:58 +01:00
Mael Rouxel-Labbé
82e458da80
Replaced TDS template specialization with tag-based detection
2018-11-14 07:58:08 +01:00
Mael Rouxel-Labbé
bb19c965f9
Moved helper struct outside of TBB macros to fix sequential compilation
2018-11-14 07:58:08 +01:00
Laurent Rineau
574f21cca6
Merge pull request #3383 from lrineau/Triangulation_3-fix_examples_with_TBB-GF
...
Re-add examples incorrectly disabled by PR #2835
2018-10-29 10:27:48 +01:00
Guillaume Damiand
520015f92a
Align typedef
2018-10-15 14:21:20 +02:00
Mael Rouxel-Labbé
aa1e0acbee
Replaced macro with a legal vertex handle validity checker
2018-10-10 13:08:14 +02:00
Laurent Rineau
4a70d8773e
Re-add examples incorrectly disabled by PR #2835
...
... and then fix them.
2018-10-08 12:32:12 +02:00
Mael Rouxel-Labbé
8500add791
There is no 'try'!
2018-10-03 16:31:42 +02:00
Mael Rouxel-Labbé
e1122cef5c
Fixed deadlocks in parallel removal of a range of weighted points
2018-10-03 15:58:59 +02:00
Mael Rouxel-Labbé
e2b0683030
Fixed not checking 'hint' validity in the parallel insertion of a range of WPs
2018-10-03 15:57:40 +02:00
Guillaume Damiand
ddd7f8fa3b
Add an option to disable viewer when running ctest.
2018-09-07 13:29:38 +02:00
Guillaume Damiand
2c8af2ebcc
Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program.
2018-09-06 18:43:32 +02:00
Mael Rouxel-Labbé
7490f34560
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-06-21 10:15:25 +02:00
Laurent Rineau
08043e442c
Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand
...
Add basic viewers
2018-06-14 17:36:37 +02:00
Guillaume Damiand
bc4eca82b3
Need double cast
2018-06-13 10:47:44 +02:00
Guillaume Damiand
f6fd8cae4c
Remove a warning; when using test suite, compile all the code but run nothing.
2018-06-13 09:14:18 +02:00
Guillaume Damiand
59f797f066
Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters.
2018-06-11 13:09:50 +02:00
Maxime Gimeno
fdeb5621ca
replace cast in unsigned long int to std::size_t to fix warnings.
2018-06-07 13:55:22 +02:00
Maxime Gimeno
10c277ea2d
Use special args if running testsuite to avoid execution errors.
2018-06-07 13:35:28 +02:00
Mael Rouxel-Labbé
7ea3a8044e
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-06-05 14:39:18 +02:00
Laurent Rineau
c151778454
Merge pull request #3122 from MaelRL/T23-Fix_functor_return_type-GF
...
Triangulation_23: fix wrong return type in spatial_sort functor
# Conflicts:
# Triangulation_3/test/Triangulation_3/test_regular_insert_range_with_info.cpp
2018-06-01 17:24:23 +02:00
Laurent Rineau
72d2c8e1ef
Merge pull request #3122 from MaelRL/T23-Fix_functor_return_type-GF
...
Triangulation_23: fix wrong return type in spatial_sort functor
# Conflicts:
# Triangulation_3/test/Triangulation_3/test_regular_insert_range_with_info.cpp
2018-06-01 17:21:44 +02:00
Maxime Gimeno
979bde1025
Fix Triangulation_3 viewer
2018-05-29 11:27:53 +02:00
Andreas Fabri
4b14990209
Fix warnings; Remove typename in non-template code
2018-05-29 11:11:50 +02:00
Guillaume Damiand
c62fb2b01e
Move include iostream.
2018-05-29 11:11:49 +02:00
Guillaume Damiand
b361e78a99
Add missing include
2018-05-29 11:11:49 +02:00
Guillaume Damiand
39de8ac459
Add licence includes
2018-05-29 11:11:49 +02:00
Guillaume Damiand
d8a62aa2c8
Update licence headers of new files.
2018-05-29 11:11:49 +02:00
Guillaume Damiand
dba44f48a1
Harmonize the 5 basic viewers.
2018-05-29 11:11:49 +02:00
Guillaume Damiand
53769e98a7
* Add draw examples in the 5 concerned packages (Polyhedron, Surface_mesh, T2, T3, LCC)
...
* Update FindQGLViewel to add a target.
2018-05-29 11:11:49 +02:00
Guillaume Damiand
6e83b034dc
Rename file for basic viewers.
2018-05-29 11:06:07 +02:00
Guillaume Damiand
73905ce8dd
Avoid to run the viewer for the CGAL test suite.
2018-05-29 11:06:07 +02:00
Guillaume Damiand
5d375eff74
Update all basic viewers to have the correct behavior when CGAL_USE_BASIC_VIEWER is not defined.
2018-05-29 11:06:07 +02:00
Guillaume Damiand
5e5a9611db
Protect the code of the basic viewers; rename display into draw; add a draw function that display an error message if the basic viewer is not defined.
2018-05-29 11:04:57 +02:00
Guillaume Damiand
00c2eed479
update name of first parameter for qt window
2018-05-29 11:04:57 +02:00
Guillaume Damiand
a59c5f6398
Update all basic viewers to allow to have a color functor as parameter.
2018-05-29 11:04:57 +02:00
Guillaume Damiand
80ff774d20
Add T3 viewer, and use it in regular_3.cpp example
2018-05-29 11:02:00 +02:00
Guillaume Damiand
1477c6c503
Start t3 viewer
2018-05-29 11:02:00 +02:00
Mael Rouxel-Labbé
e9d3b9767e
Fixed taking a reference to a temporary (when using EPECK)
2018-05-28 15:43:45 +02:00
Mael Rouxel-Labbé
bfdb89e595
Removed 'move_point()' from Triangulation_3
2018-05-24 14:50:40 +02:00
Mael Rouxel-Labbé
b41f1d6272
Various deprecation-related improvements
2018-05-18 16:47:54 +02:00
Mael Rouxel-Labbé
a0427ec756
Fixed abusing Triangulation_cell_base_3 for Delaunay triangulations
...
TriangulationCellBase_3 does not request a circumcenter;
DelaunayTriangulationCellBase_3 does.
Delaunay_triangulation_3 only compiled because
Triangulation_cell_base_3 (and Triangulation_ds_cell_base_3 !)
provided circumcenter() operators and DT3 inherited T3's TDS.
- The circumcenter() functions are removed where they shouldn't exist
- DT3 uses DT_cell_base_3 as cell base instead of T_cell_base_3
- Concepts/Classes that supposedly only required TriangulationCellBase_3
and then built Delaunay triangulations with that (Alpha Shapes, etc.)
are upgraded to request DelaunayTriangulationCellBase_3 (anyway, it
wouldn't compile if you actually provided a model of
TriangulationCellBase_3)
- Fixed various wrong templates in classes/concepts such as
MeshVertexBase_3 not refining RegularTriangulationVertexBase_3
and (only in the doc) defaulting to Triangulation_vertex_base_3
- Removed the deprecated class (for 4+ years) T_cell_base_with_circumcenter
2018-04-26 13:21:53 +02:00
Mael Rouxel-Labbé
7007f44f1f
Removed deprecated (since 2014) cls Triangulation_cell_base_with_circumcenter_3
2018-04-26 13:00:21 +02:00
Mael Rouxel-Labbé
17d46e9211
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-04-26 11:55:17 +02:00
Andreas Fabri
063a91a771
Use CGAL::random_shuffle
2018-04-04 14:00:23 +01:00
Laurent Rineau
cd6fe20bd4
Merge branch 'releases/CGAL-4.11-branch'
2018-03-26 11:03:37 +02:00
Laurent Rineau
3c70f8bad0
Fix dependencies by moving files
2018-03-23 14:17:24 +01:00
Andreas Fabri
bbfeedcf5a
Oliver's faster walk_to_next_3()
2018-03-16 19:24:36 +01:00
Mael Rouxel-Labbé
b080804f09
Fixed missing bound check in the sequential insertion phase
...
If the input point set is degenerate, dimension() < 3 is always 'true'
and we will eventually try to read beyond the end of the points vector.
See issue https://github.com/CGAL/cgal/issues/2922
2018-03-13 11:14:06 +01:00
Mael Rouxel-Labbé
c28e05be0c
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-02-23 12:50:06 +01: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
Laurent Rineau
01e2405fa7
Merge pull request #2774 from MaelRL/T3-Fix_is_Gabriel-GF
...
T3/P3T3: Fix Is_Gabriel(Vertex_handle) for regular triangulations
2018-02-14 15:35:05 +01:00
Mael Rouxel-Labbé
05c31eac52
Fixed is_Gabriel(Vertex_handle) for RT3
2018-01-31 15:29:18 +01:00
Andreas Fabri
43d2ecb521
Triangulation_3
2018-01-17 16:57:46 +00:00
Andreas Fabri
6cc385c6ec
Number_types
2018-01-17 15:47:18 +00:00
Laurent Rineau
42b11ddf29
Revert the merge of PR #2478
...
This reverts the merge commit 46cc91e787 onto
488c3e2879 .
2018-01-04 17:54:08 +01:00
Mael Rouxel-Labbé
852cc12dc6
Fixed wrong type
2017-12-14 10:13:11 +01:00
Andreas Fabri
7d0ce1e317
fix typedef
2017-12-12 22:16:30 +01:00
Mael Rouxel-Labbé
adfdc70374
Uniformized template parameters names in all P3T3 traits classes
...
Hopefully works around a bug in MSCV compilers too
2017-12-12 20:53:10 +01:00
Mael Rouxel-Labbé
417903d640
Reworked some 'using' keywords in P3T3 traits classes
2017-12-12 17:48:51 +01:00
Mael Rouxel-Labbé
72995837db
Improved Robust_weighted_circumcenter_filtered_traits_3
2017-12-12 17:43:14 +01:00
Mael Rouxel-Labbé
c5993c95b3
Replaced a postcondition
...
When manually building a triangulation, we might have inserted vertices but
not yet cells, and thus the dimension is 0 but point() should still work.
This is the case in tet_soup_to_c3t3 for example.
2017-12-12 00:46:01 +01:00
Mael Rouxel-Labbé
ba3a59ed5a
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2017-11-30 15:54:00 +01:00
Mael Rouxel-Labbé
812109df83
Added Mesh_3_regular_triangulation_3_wrapper
...
This wrapper around Regular_triangulation_3 adds undocumented, straightforward
functions which are required for Mesh_3 because of Periodic_3_mesh_3:
they are functions for which both (periodic and non-periodic) triangulations
have fundamentally different implementations, usually because Periodic_3_mesh_3
does not know the offset of a point and must brute-force check all
possibilities. To allow Periodic_3_mesh_3 to use Mesh_3's files,
each mesh triangulation implements its own version.
2017-11-22 14:23:59 +01:00
Mael Rouxel-Labbé
c89ae64e31
Fixed getting kernel type through traits
2017-11-21 14:55:32 +01:00
Sébastien Loriot
8cdfad0d08
add missing URL and Id tags
2017-11-15 22:58:57 +01:00
Sébastien Loriot
ff26773f7b
remove include directive for checking GPL compliance in LGPL headers
2017-11-12 10:21:35 +01:00
Sébastien Loriot
ee57fc2d6c
add SPDX identifier for files under the GPL-3+ license
2017-11-12 10:17:51 +01:00
Sébastien Loriot
0698f79aff
add SPDX identifier for files under the LGPL-3+ license
2017-11-12 10:17:50 +01:00
Mael Rouxel-Labbé
7d7fb2f81d
Generalized the signatures of some predicate wrappers
...
Since construct_point() is used, the arguments can be either Point_3 or
Weighted_point_3.
2017-11-06 14:40:29 +01:00
Mael Rouxel-Labbé
33ea377bbe
Cleaned robust weighted circumcenter filtered traits (no real changes)
2017-11-02 11:41:40 +01:00
Mael Rouxel-Labbé
5c9e18a2f6
Improved readability of Regular/Delaunay_triangulation_3
...
The quest continues
2017-11-01 15:09:18 +01:00
Mael Rouxel-Labbé
9edd4194ba
Fixed Triangulation_3.h indentation and whitespace (no real changes)
2017-10-31 18:23:31 +01:00
Mael Rouxel-Labbé
ac0a27cdfd
Made Mesh_3's optimizers work with periodic triangulations
2017-10-31 15:47:23 +01:00
Mael Rouxel-Labbé
1f4475d471
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2017-10-27 16:26:27 +02:00
Mael Rouxel-Labbé
bae6f15fa5
WIP commit
2017-10-27 15:34:33 +02:00
Mael Rouxel-Labbé
7b379d4338
Temporarily moved code from RT3 to T3
2017-10-22 23:40:45 +02:00
Jane Tournois
bd34d03c15
add cheaper orientation function to traverser
...
it uses Simple_cartesian<double> to make cheaper, though less
precise, tests
2017-09-21 11:39:40 +02:00
Mael Rouxel-Labbé
aaeaf35380
Introduced the tag "Periodic_tag" to mark distinguish periodic triangulations
2017-08-23 16:18:05 +02:00
Mael Rouxel-Labbé
516281d34b
Fixed a couple of warnings
2017-07-31 12:43:57 +02:00
Mael Rouxel-Labbé
b8de2148b2
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2017-07-28 11:41:58 +02:00
Mael Rouxel-Labbé
a9be53be85
Fixed warnings
2017-07-27 12:15:52 +02:00
Laurent Rineau
66a10f5a91
Merge pull request #2275 from afabri/Convex_hull_3-OpenMesh-GF
...
Convex_hull_3: Make it work for OpenMesh
2017-07-25 18:17:02 +02:00
Andreas Fabri
0cce789437
Add examples for using 3D convex hull functions with open mesh. And fix a bug in convex hull code
2017-07-19 12:25:31 +02:00
Mael Rouxel-Labbé
52956a40fb
Fixed accidentally including boost's function_property_map.h
2017-07-04 10:45:33 +02:00
Mael Rouxel-Labbé
5ef4ed6083
Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle
...
Based on master
2017-07-03 16:12:14 +02:00
Mael Rouxel-Labbé
7943d0877e
Fixed taking reference to temporary (ter)
2017-06-30 11:40:14 +02:00
Mael Rouxel-Labbé
02a9a91e40
Cleaned off useless 'using'
2017-06-30 11:32:07 +02:00
Mael Rouxel-Labbé
4ac89861ba
Fixed (?) taking reference to temporary
2017-06-28 10:17:14 +02:00
Mael Rouxel-Labbé
8c7bda5f2d
Changed from boost::function_property_map to CGAL::internal::boost_'s
...
This is so it's always available, even if using an old version of boost
2017-06-28 10:17:14 +02:00
Mael Rouxel-Labbé
ddfc4fc0fe
T2/T3 now use Perturbation_order in tests with symbolic perturbations
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
044deb6c7e
Replaced boost_static_assert with cgal_static_assert and used () guards
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
87e0ae40b0
Closed a parenthesis
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
1fc2282350
Fixed regular triangulation capitalization across CGAL
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
1f14a66d94
Renamed uses of invalidate_circumcenter() in accordance with the modified concept
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
f964171f14
Fixed Point / Point_3 issues in T3 and improved the documentation
...
-- Do not use concept names as template names in the doc
-- Fixed point / point_3 issues and other problems of coherence between concept
and model
-- Fixed some wrong refinement relationships
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
2d2eb22f98
Fixed boost/core/is_same.hpp > boost/type_traits/is_same.hpp
2017-06-28 10:16:23 +02:00
Jane Tournois
130e65db97
really use the GT given as a parameter
...
When the geom_traits given as parameter of `circumcenter` and/or
`weighted_circumcenter` was deriving from the cell base GT
(first template parameter), the gt was up-casted to the
cell base GT, and the function construct_circumcenter_3_object()
(or construct_weighted_circumcenter_3_object()) not
called on the right geom traits type --> possibly missing
the actual input of the function (the robust_circumcenter_traits in Mesh_3)
we add a static assert to check at compile time that point types are the same
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
a990913d99
Fixed using default templated class functions
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
d770640506
Fixed wrong template type (which induced taking references of references)
2017-06-28 10:16:23 +02:00
Jane Tournois
110316570c
really use the GT given as a parameter
...
When the geom_traits given as parameter of `circumcenter` and/or
`weighted_circumcenter` was deriving from the cell base GT
(first template parameter), the gt was up-casted to the
cell base GT, and the function construct_circumcenter_3_object()
(or construct_weighted_circumcenter_3_object()) not
called on the right geom traits type --> possibly missing
the actual input of the function (the robust_circumcenter_traits in Mesh_3)
we add a static assert to check at compile time that both geom traits
are compatible
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
b5affb383d
Changed boost/core/enable_if.hpp to boost/utility/enable_if.hpp
2017-06-28 10:16:23 +02:00