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

2076 Commits

Author SHA1 Message Date
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 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 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 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 e4aaf2447c Fix the use of offset in Labeled_mesh_domain_3 2019-06-18 15:50:15 +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
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +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 450efd3912 Fix PR #3788 with C++03 2019-05-07 13:59:17 +02:00
Laurent Rineau 130c766d1e Merge branch 'releases/CGAL-4.14-branch' into Mesh_3-stop_during_protection-lrineau 2019-05-06 16:21:52 +02:00
Laurent Rineau 1b1f0a6ac3 Test the feature in the 3D demo, and fix the code 2019-05-03 16:24:50 +02:00
Laurent Rineau 8648a72655 Add new Boost Parameter `nonlinear_growth_of_balls` 2019-05-03 15:49:49 +02:00
Laurent Rineau a1e3e05558 Add maximal_number_of_vertices and stop_ptr to the protection code 2019-05-03 11:46:13 +02:00
Jane Tournois 576a3799eb improve doc of constructor for polyhedral complex 
pairs cannot be reversed or the domain is not consistent
 2019-04-23 15:29:41 +01:00
Sebastien Loriot 81b78d6a8b
Merge pull request #3810 from maxGimeno/temp_branch 
Mesh_3: Simplify AABB_primitive of Polyhedral_mesh_domain_3
 2019-04-12 15:32:49 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links 
Correction of redirected links and links that moved to another place.
 2019-04-11 21:37:05 +02:00
Maxime Gimeno 6795d4fb48 Fix error with new primitive in demo 2019-04-10 10:45:35 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14 
Update for cpp14
 2019-04-08 15:59:28 +02:00
Laurent Rineau 65ebf7d386 Merge branch 'Mesh_3-fix_output_to_vtu-GF' into VTU_output-Add-attribute-GF 2019-04-03 19:57:36 +02:00
Laurent Rineau 043239d738 Avoid copies of vectors of attributes 2019-04-03 19:57:06 +02:00
Laurent Rineau 2e43cc0f71 Remove a warning about an unused variable 2019-04-03 19:11:15 +02:00
Laurent Rineau dcc6d7a58a Fix CGAL::output_to_vtu(..., ASCII) and add tests 2019-04-03 19:03:48 +02:00
Sébastien Loriot 5a30e88a92 replace cpp11::function by std::function 2019-03-29 13:28:33 +01:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot 1d908c1c0b remove code for CGAL_INTERSECTION_VERSION 1 2019-03-29 13:28:32 +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
Sébastien Loriot 700342bfa7 remove cpp11 workaround in mesh_3 related packages 2019-03-29 10:41:50 +01:00
Maxime Gimeno ec00f50eec Use the same primitive type for polyhedron_3 and other types 2019-03-28 11:37:16 +01:00