songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
87,300 Commits 3 Branches 156 Tags 958 MiB
Commit Graph

3239 Commits

Author SHA1 Message Date
Sébastien Loriot aa339ce63d Merge 'cgal/releases/CGAL-4.14-branch' 2019-08-29 07:37:03 +02:00
Laurent Rineau 4ab183acd9 Fix the miscompilation when TBB is not used 
fixup! Fix the miscompilation when TBB is not used
 2019-08-19 16:18:50 +02:00
Laurent Rineau 89b4c986d3 Allow Mesh_3 to cope with a 2D initial triangulation 2019-08-16 14:47:42 +02:00
Sébastien Loriot 02b7301db9 Merge 'releases/CGAL-4.14-branch' 2019-08-08 10:23:49 +02:00
Sébastien Loriot c5cdafbaba Merge 'cgal/releases/CGAL-4.13-branch' 2019-08-08 10:22:32 +02:00
Laurent Rineau 40c25757d4 Improve CGAL_MESH_3_DEBUG_POLYLINES_TO_PROTECT 2019-08-01 17:25:10 +02:00
Laurent Rineau 52de8ed5ec Fix a bug introduced in #2739 2019-08-01 17:24:47 +02:00
Laurent Rineau a0ea4f0c5f Merge branch 'releases/CGAL-4.14-branch' 2019-07-31 17:01:03 +02:00
Jane Tournois 49d526c1cf add missing () around min and max for windows 2019-07-29 14:30:03 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau c5566d3d77 Merge pull request #4023 from lrineau/Mesh_3-remove_old_code-GF 
Mesh_3: remove the attempt for `os << std::pair`
 2019-07-03 11:18:30 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau cc8bd016fa Merge pull request #4027 from lrineau/CGAL-compact_with_VTK_9-GF 
Compatibility with VTK 9
 2019-07-03 11:10:31 +02:00
Laurent Rineau 71ff0ffda6 Merge pull request #4038 from lrineau/Mesh_3-fix_for_older_compilers-GF 
Mesh_3: older versions of gcc does not like that pair of const
 2019-07-03 11:10:29 +02:00
Laurent Rineau e79bfd5d03 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-03 11:10:03 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF 
CMake>=3.13: opt for for new policies up to 3.15
 2019-07-01 11:16:30 +02:00
Laurent Rineau 1d5b626436 Fix the CMake warning 2019-07-01 09:32:12 +02:00
Laurent Rineau 7db6b5e513 Older versions of gcc does not like that pair of const 
https://cgal.geometryfactory.com/CGAL/testsuite/results-4.14.1-I-173.shtml#Mesh_3_Examples
 2019-06-26 16:19:09 +02:00
Laurent Rineau 4435f93aaa Compatibility with VTK 9 (VTK master) 
Fix issue #3789
 2019-06-26 13:17:14 +02:00
Laurent Rineau ed9dffe80d remove the attempt for `os << std::pair` 2019-06-21 09:39:42 +02:00
Laurent Rineau 8535a3c03c Merge branch 'releases/CGAL-4.14-branch' 
# Conflicts:
#	Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
#	Convex_hull_3/include/CGAL/convex_hull_3.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
#	Stream_support/include/CGAL/IO/Color.h
 2019-06-20 14:20:37 +02:00
Laurent Rineau 69a4241d5e Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF 
Polyhedron demo:  mesh several surfaces at a time
 2019-06-20 14:20:08 +02:00
Laurent Rineau b0c182ce63 Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF 
Polyhedron demo:  mesh several surfaces at a time
 2019-06-20 14:09:17 +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 e4aaf2447c Fix the use of offset in Labeled_mesh_domain_3 2019-06-18 15:50:15 +02:00
Laurent Rineau 2f09bbdfff Merge pull request #3951 from lrineau/Mesh_3-fix_issue_2870-GF 
Mesh_3: fix issue #2870 (do not deactivate all topological criteria)
 2019-06-17 14:16:12 +02:00
Laurent Rineau 62b6476f76 Merge pull request #3951 from lrineau/Mesh_3-fix_issue_2870-GF 
Mesh_3: fix issue #2870 (do not deactivate all topological criteria)
 2019-06-17 14:15:25 +02:00
Laurent Rineau 39dede5320 Merge pull request #3951 from lrineau/Mesh_3-fix_issue_2870-GF 
Mesh_3: fix issue #2870 (do not deactivate all topological criteria)
 2019-06-17 14:14:53 +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 9f99ee087e Merge pull request #3986 from janetournois/Mesh_3-fix_optimizers_protection-jtournois 
Mesh_3 : fix global optimizers protection
 2019-06-17 13:51:33 +02:00
Laurent Rineau 91157b2167 Fix <CGAL/internal/Mesh_3/check_weights.h> 
`Has_feature<Mesh_domain>` is not `Tag_true` or `Tag_false`, but
it *derives* from one of them!

Anyway, it is easier to use the nested value `::value`.
 2019-06-13 18:08:38 +02:00
Laurent Rineau dfb37e2378 Fix when called with Surface_mesh instead of Polyhedron_3 2019-06-07 12:06:44 +02:00
Jane Tournois a70bf9458a fix optimizers protection 
If some vertices have a non-zero weights and they do not belong to input
features, then global optimizers should not be used.

The case without feature protection was not treated until now.
 2019-06-06 17:34:53 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Laurent Rineau 1659505f96 Merge pull request #3953 from lrineau/Mesh_3-lambdas_can_be_sizing_fields-GF 
Mesh_3: Allow lambdas (or other callables) as MeshDomainField_3
 2019-06-05 11:20:20 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Laurent Rineau 22d6d9ebd8 Allow lambdas (or other callables) as MeshDomainField_3 
That patch uses C++11 `<type_traits>`, and
`boost::callable_traits::is_invocable` that is available only since
1.66. If Boost<1.66, then the previous behavior (testing
`Sizing_field::FT`) is kept.

Fix issue https://github.com/CGAL/cgal/issues/3005
 2019-05-24 10:45:12 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF 
Fix some typos in code/comments/documentation
 2019-05-23 08:50:14 +02:00
Laurent Rineau 3a9b2fe67f Merge branch 'releases/CGAL-4.14-branch' 2019-05-21 16:36:28 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Laurent Rineau f7a4836039 Do not deactivate all topological criteria 2019-05-21 13:43:11 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch 
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
 2019-05-14 17:50:45 +02:00
Laurent Rineau fee84ae228 Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau 
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
 2019-05-14 16:44:02 +02:00
Laurent Rineau d04a5a24c1 Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau 
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean
 2019-05-14 16:26:16 +02:00
Laurent Rineau 0cdc5b8527 Fix for Boost-1.71 (master branch) 
Pass the criteria object by value, instead of const references: same
semantic, but better than the universal reference used by Boost
Parameter 1.71.
 2019-05-14 12:36:02 +02:00
Laurent Rineau 6fe9711d78 Remove the check of Boost_VERSION 2019-05-14 11:43:09 +02:00
Laurent Rineau 450efd3912 Fix PR #3788 with C++03 2019-05-07 13:59:17 +02:00