Sébastien Loriot
52eeebda0e
fix windows warning
2018-07-25 14:43:14 +02:00
Laurent Rineau
3aa615dc92
Merge branch 'master' into Polyhedron_demo-less_includes-GF
2018-07-24 13:46:57 +02:00
Sébastien Loriot
d8518d5c80
remove unused file
2018-07-24 13:18:06 +02:00
Laurent Rineau
777bfab1d0
Fix use of tbb::atomic
...
I misread the TBB documentation: the constructor of `tbb::atomic` is
only available since C++11. Otherwise, it has to be
default-initialized, and then assigned.
2018-07-24 12:41:47 +02:00
Laurent Rineau
98bf6284fd
Fix the issue with the preprocessor
2018-07-24 12:40:19 +02:00
Laurent Rineau
95f93026f2
Fix Concurrent_compact_container::merge
...
The bug was detected by the testsuite.
2018-07-24 12:40:19 +02:00
Laurent Rineau
bac90efde0
Fix for CGAL_NO_ATOMIC (with old Boost and C++<=03)
2018-07-24 12:40:19 +02:00
Laurent Rineau
7713e790e9
Fix warnings
2018-07-24 12:40:19 +02:00
Laurent Rineau
ea47dcfd70
support Mesher_3<C3T3,MC,MD>::status() with TBB
2018-07-24 12:40:19 +02:00
Laurent Rineau
bcce26f2b5
Access to the "current" size of the compact container
2018-07-24 12:40:18 +02:00
Laurent Rineau
a96e69af29
Add the possibility to stop Mesh_3 with TBB
2018-07-24 12:40:18 +02:00
Laurent Rineau
3022ceb198
Fix use of tbb::atomic
...
I misread the TBB documentation: the constructor of `tbb::atomic` is
only available since C++11. Otherwise, it has to be
default-initialized, and then assigned.
2018-07-24 12:06:53 +02:00
Sébastien Loriot
da76851f75
handle special case when intersection segments shares a common endpoint
2018-07-23 17:13:58 +02:00
Laurent Rineau
4710e1f93d
Fix the conflict between <CGAL/atomic.h> and <CGAL/thread.h>
...
Before this commit, they were both defining
`CGAL::cpp11::atomic`. Now, `<CGAL/thread.h>` includes
`<CGAL/atomic.h>`, and it only defined `CGAL::cpp11::atomic`, using
the TBB implementation, if `CGAL_NO_ATOMIC` was defined by
`<CGAL/atomic.h>`.
@sgiraudot Please have a look.
2018-07-23 15:45:44 +02:00
Maxime Gimeno
f76f7ae0f8
Fix snapshot
2018-07-23 12:11:31 +02:00
Laurent Rineau
ae1e1439cf
Fix the issue with the preprocessor
2018-07-23 11:15:26 +02:00
Laurent Rineau
ed034a53be
Fix Concurrent_compact_container::merge
...
The bug was detected by the testsuite.
2018-07-23 10:23:28 +02:00
Sébastien Loriot
fdec8a2285
print real vertex counts
2018-07-23 10:11:51 +02:00
Laurent Rineau
332249432f
I forgot to change those numbers
2018-07-23 09:49:52 +02:00
Maxime Gimeno
5f7276be67
Skip the already removed items in erase(list);
2018-07-23 09:46:25 +02:00
Laurent Rineau
29f80375f4
Merge branch 'releases/CGAL-4.12-branch'
2018-07-20 17:46:58 +02:00
Laurent Rineau
908311e903
Merge branch 'releases/CGAL-4.11-branch' into releases/CGAL-4.12-branch
2018-07-20 17:34:47 +02:00
Laurent Rineau
540a181b5e
Merge pull request #3232 from lrineau/Triangulation_2-Debug_CDT2-lrineau
...
Fix CDT_2 errors, using snapping of intersection points (cont.)
2018-07-20 17:32:52 +02:00
Laurent Rineau
76282991b6
Merge pull request #3116 from kkatrio/convex_hull_function
...
Extreme points
2018-07-20 17:20:19 +02:00
Laurent Rineau
0585ffcc39
Merge pull request #3232 from lrineau/Triangulation_2-Debug_CDT2-lrineau
...
Fix CDT_2 errors, using snapping of intersection points (cont.)
2018-07-20 17:20:16 +02:00
Laurent Rineau
c6f945b630
Merge pull request #3236 from sloriot/PMP-speed_up_distance
...
Do not build the kd-tree twice
2018-07-20 17:20:13 +02:00
Laurent Rineau
1723ba245c
Merge pull request #3240 from sloriot/AABB_tree-protect_kd_tree
...
Build the kd-tree only if the AABB-tree is built
2018-07-20 17:20:08 +02:00
Laurent Rineau
ea6da4cb07
Fix for CGAL_NO_ATOMIC (with old Boost and C++<=03)
2018-07-20 16:33:02 +02:00
Laurent Rineau
ad735083ef
Fix warnings
2018-07-20 16:31:33 +02:00
Mael Rouxel-Labbé
dea2ce0647
Minor improvements to the Orbifold parameterization in the demo
2018-07-20 13:05:25 +02:00
Mael Rouxel-Labbé
61427ffb9c
Removed ARAP ui dialog
...
the ARAP plugin just does... ARAP.
2018-07-20 12:59:09 +02:00
Laurent Rineau
ad208d81b6
Merge pull request #3198 from maxGimeno/Demo-Fix_for_windows-GF
...
Polyhedron Demo: Big fix for windows
2018-07-20 11:46:08 +02:00
Mael Rouxel-Labbé
f1175d30ed
Fixed useless variable not being initialized
2018-07-20 10:48:00 +02:00
Maxime Gimeno
be071960b5
Re-display ids afeter invalidate() if they were all displayed.
2018-07-20 10:18:28 +02:00
Sébastien Loriot
21748e0df3
make vertex counts tight
2018-07-20 10:15:22 +02:00
Sébastien Loriot
df75e1f6c6
more data to test + check for triple intersection
2018-07-20 09:58:49 +02:00
Sébastien Loriot
d514411868
re-add files removed during git filter-branch
2018-07-19 21:47:31 +02:00
Sébastien Loriot
e5ec40abe9
use itself as next instead of null_halfedge
...
some models might call set_prev on null_halfedge
2018-07-19 18:23:01 +02:00
Sébastien Loriot
0561f62d43
simplify patch
2018-07-19 18:03:15 +02:00
Laurent Rineau
5310bba673
support Mesher_3<C3T3,MC,MD>::status() with TBB
2018-07-19 16:15:43 +02:00
Sébastien Loriot
f0605c818c
do not remove element you iterate on
...
+ as for std::vector, clear() does not always imply a change of capacity
2018-07-19 10:58:27 +02:00
Mael Rouxel-Labbé
efd971c4bc
Reworked with/without subdomain index handling
2018-07-19 10:42:13 +02:00
Mael Rouxel-Labbé
7ac1417623
Use a resize function to allow to use arrays
2018-07-19 10:32:33 +02:00
Mael Rouxel-Labbé
97cb7bb151
Removed orientation.h dependency
2018-07-19 10:32:03 +02:00
Sebastien Loriot
327f7d8fbd
Merge branch 'master' into convex_hull_function
2018-07-19 10:21:26 +02:00
Maxime Gimeno
adc36775f3
Hide ids in invalidate()
2018-07-19 10:04:37 +02:00
Laurent Rineau
e8850746f4
Merge pull request #3226 from maxGimeno/Convex_hull_3-Make_minimal_hull-GF
...
Convex_hull_3: Make it minimal.
2018-07-18 18:48:26 +02:00
Laurent Rineau
2836828d61
Access to the "current" size of the compact container
2018-07-18 18:47:15 +02:00
Laurent Rineau
ba21ecb66a
Add the possibility to stop Mesh_3 with TBB
2018-07-18 18:26:08 +02:00
Mael Rouxel-Labbé
758104c189
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-07-18 17:42:23 +02:00