Commit Graph

406 Commits

Author SHA1 Message Date
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Sébastien Loriot e179770aab add skeleton for collision detection in PMP 2018-10-09 10:28:43 +02:00
Laurent Rineau 7cf19af58f `master` now targets CGAL-4.14 2018-10-01 15:11:49 +02:00
Laurent Rineau 48bb90a36e Polish CGAL-4.13 2018-10-01 10:55:07 +02:00
Laurent Rineau ac173dfe44 Prepare CGAL-4.13 2018-09-12 11:07:03 +02:00
Laurent Rineau 17fc9631cf Prepare CGAL-4.13-beta2, if needed 2018-08-01 16:22:31 +02:00
Maxime Gimeno 8d0a67095f Merge branch 'master' into IntrinsicFaceGraph-V2 2018-08-01 15:40:36 +02:00
Laurent Rineau f1e926e689 Update <CGAL/version.h> (for full header-only) 2018-07-31 16:26:54 +02:00
Laurent Rineau 10a84aa34e Merge branch 'master' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-27 10:33:24 +02:00
Laurent Rineau c68cf8fc4c Merge pull request #3129 from sgiraudot/Point_set_processing-Callbacks-GF
Point Set Processing: Callbacks
2018-06-27 10:21:40 +02:00
Simon Giraudot 24ac59a01c Avoid using std::unordered_set for MSVC2013 as performances can be very bad
See: https://medium.com/plaxis/embarrassingly-poor-performance-of-regular-point-sets-with-std-unordered-set-418cb413974b
2018-06-21 16:11:03 +02:00
Maxime Gimeno 4e8264b109 Merge CGAL/master to get rid of the dependency to QGLViewer 2018-06-11 12:10:57 +02:00
Mael Rouxel-Labbé ddeb4c0cd7 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-07 15:14:19 +02:00
Laurent Rineau 7f45dbebe6 Merge pull request #3058 from maxGimeno/Property_map-Point_kernel_converter_map-GF
Property_map: Kernel_converter_map
2018-06-06 14:41:46 +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
Simon Giraudot 6480cf2205 Define a CGAL::cpp11::thread wrapper for TBB or STD 2018-05-29 11:42:04 +02:00
Laurent Rineau cb14375778
Merge branch 'master' into Property_map-Point_kernel_converter_map-GF 2018-05-29 10:58:28 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Laurent Rineau 588cc67897 Merge pull request #3096 from MaelRL/CGAL-Fix_deprecated_code_usage-GF
Fix some deprecation-related issues
2018-05-28 13:58:41 +02:00
Andreas Fabri dd8bf1f4df Add a constructor and two functions to get started 2018-05-24 14:35:35 +01:00
Mael Rouxel-Labbé b41f1d6272 Various deprecation-related improvements 2018-05-18 16:47:54 +02:00
Maxime Gimeno 8df643f390 update licenses 2018-05-17 10:20:56 +02:00
Laurent Rineau 05d7baceb1
Merge branch 'master' into Mesh_3-improve_polylines_to_protect-GF 2018-05-16 11:36:24 +02:00
Sébastien Loriot 4d00a8e070 Merge branch 'cgal/releases/CGAL-4.12-branch' 2018-05-15 22:32:45 +02:00
Laurent Rineau 6c477af5f9
Merge branch 'master' into Property_map-Point_kernel_converter_map-GF 2018-05-15 16:08:01 +02:00
Andreas Fabri b33ab791e1 Disable a warning. Fix an allocator call 2018-05-15 15:37:51 +02:00
Laurent Rineau 01ab4856b0 Set BOOST_PARAMETER_MAX_ARITY very early 2018-05-15 14:56:21 +02:00
Sébastien Loriot 8bc315c974 make it work with any Kernel object 2018-05-03 15:05:47 +02:00
Maxime Gimeno a7721389b2 Forward declare the Cartesian_converter to avoid messing with the dependencies tree. 2018-04-27 09:59:25 +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
Laurent Rineau 7ff5a2adfa Next version on master will be 4.13-beta1 2018-04-25 18:08:11 +02:00
Laurent Rineau 4f14095cb8 next version on this branch is 4.12.1 2018-04-25 18:06:14 +02:00
Laurent Rineau b9778ba91b I forgot to prepare CGAL-4.12 2018-04-25 15:39:14 +02:00
Laurent Rineau 03e68d8740 Merge pull request #2985 from afabri/CGAL-std_latest-GF
Support C++17 (Replace std::random_shuffle() with CGAL::random_shuffle(), and other adjustments)
2018-04-24 17:32:55 +02:00
Laurent Rineau 5fea3c3eb1 Add CGAL_CXX14
and remove uses of `__cplusplus` that are not in `<CGAL/config.h>`.
2018-04-17 17:15:04 +02:00
Andreas Fabri 303b0ab46e Fix detection of CGAL_CXX11 for VC++ and fixes of usage of std::allocator_traits 2018-04-16 11:00:03 +01:00
Laurent Rineau ca3ebb7f99 Next release in this branch will be CGAL-4.12-beta2, or 4.12 final 2018-04-09 10:07:38 +02:00
Andreas Fabri 9c69ac41eb Add Polyhedron_3_fwd.h 2018-03-28 17:33:28 +01:00
Laurent Rineau e8adff9cd4 Merge pull request #2926 from sloriot/CGAL-https_links
Use https for all links to www.cgal.org and doc.cgal.org
2018-03-26 10:56:00 +02:00
Laurent Rineau 3c70f8bad0 Fix dependencies by moving files 2018-03-23 14:17:24 +01:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Mael Rouxel-Labbé d9168d011c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 18:24:39 +01:00
Laurent Rineau 758688beba Merge pull request #2837 from afabri/CGAL-no_return-GF
Define CGAL_NORETURN also for VC++
2018-02-23 17:34:41 +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
Andreas Fabri bcbbf35dad Define CGAL_NORETURN also for VC++ and move the macro before the functions 2018-02-14 14:51:40 +00:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Andreas Fabri f4ec38e27c STL_extensions 2018-01-18 14:15:21 +00:00
Andreas Fabri 257b180351 Triangulation 2018-01-18 13:56:10 +00:00
Andreas Fabri fa92aa49f7 Nef 2018-01-18 10:43:57 +00:00
Andreas Fabri 799260f604 Poisson surface reconstruction 2018-01-18 10:05:01 +00:00