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

2364 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 084a1efe2d Merge remote-tracking branch 'cgal/master' into Distance_3-Add_Tri_Tri-GF 2021-06-23 22:30:03 +02:00
Jane Tournois 3b23b5650d generate_weights is now working 2021-06-21 09:59:25 +02:00
Laurent Rineau 20dcc7b57e Merge pull request #5762 from janetournois/Mesh_3-fix_warning_pr5587-jtournois 
Mesh_3 - fix missing initializer warning
 2021-06-16 15:04:57 +02:00
Laurent Rineau d74d4745df Merge pull request #5762 from janetournois/Mesh_3-fix_warning_pr5587-jtournois 
Mesh_3 - fix missing initializer warning
 2021-06-16 15:03:45 +02:00
Jane Tournois c07c71275d duplicate image before application of filters 2021-06-15 16:01:21 +02:00
Jane Tournois 16db150f65 fix allocation of image 
then :
- smooth each indicator function with Gaussian filter
- compute the maximum image of all indicator functions
 2021-06-15 14:37:24 +02:00
Jane Tournois 293b28d7f1 perform gaussian smoothing 2021-06-14 17:28:53 +02:00
Jane Tournois b47cf8e0d9 compute indicator images and fit them to [0; 255] 2021-06-14 17:24:50 +02:00
Jane Tournois d831724b10 convert a CGAL::Image_3 to ITK format to generate weights for weighted images 
- add ITK as a dependency for mesh_3D_weighted_image.cpp
- WIP
 2021-06-14 16:49:43 +02:00
Jane Tournois b69f643239 add missing param in initializer list 2021-06-04 15:58:26 +02:00
Laurent Rineau 59a0da4f13 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno 
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
 2021-05-19 17:23:53 +02:00
Laurent Rineau 82bec8a1d6 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno 
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
 2021-05-19 17:11:37 +02:00
Laurent Rineau 26ad68e486 Merge pull request #5649 from sloriot/CGAL-no_boost_shared_ptr 
Replace internal use of boost shared_ptr
 2021-05-18 18:14:12 +02:00
Maxime Gimeno 17ac255108 Fix calls t cpp11:atomic stuff 2021-05-18 15:43:59 +02:00
Maxime Gimeno 393ae7dae6 Clean-up boost_version reqs 2021-05-12 15:03:53 +02:00
Maxime Gimeno f6cefea66a Add required constructors to Mesh_vertex_base_3<Parallel_tag> 2021-05-11 09:21:58 +02:00
Maxime Gimeno 1b5b61ab0a Add include 2021-05-07 12:17:32 +02:00
Maxime Gimeno 9872ac9cf8 Replace tbb::atomic 2021-05-07 11:16:50 +02:00
Maxime Gimeno 3e03d50b8a replace usages of CGAL::cpp11::atomic and thread by std:: calls 2021-05-07 11:10:30 +02:00
Maxime Gimeno e9b7595fff Deprecate CGAL headers for threads, atomic and result_of, and move their content to config.h as fallback 2021-05-07 11:09:24 +02:00
Sébastien Loriot 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Sébastien Loriot 70058db9b7 add IO namespace for Mesh_3 package 2021-05-03 15:39:07 +02:00
Sébastien Loriot 1faa0e2992 replace internal use of boost::shared_ptr by std::shared_ptr 2021-04-28 10:55:26 +02:00
Sébastien Loriot 39367c2313 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-17 11:14:29 +02:00
Sébastien Loriot cbd95907cd Merge remote-tracking branch 'cgal/5.1.x-branch' into HEAD 2021-04-17 11:11:28 +02:00
Sebastien Loriot e3020f1c64
Merge pull request #5526 from janetournois/Mesh_3-add_determinism_test-jtournois 
Mesh_3 - more testing of determinism
 2021-04-17 10:52:30 +02:00
Laurent Rineau 76d2fcd1e1 Missing header 2021-04-13 11:03:00 +02:00
Mael Rouxel-Labbé fba303341f Merge remote-tracking branch 'cgal/master' into Distance_3-Add_Tri_Tri-GF 2021-04-12 15:33:14 +02:00
Mael Rouxel-Labbé 5deb509374 Move to Distance_3/X_Y.h rather than squared_distance_X_Y.h (as Intersections) 2021-04-12 14:42:44 +02:00
Laurent Rineau 71b85f4b85 Fix license 2021-04-08 18:44:19 +02:00
Laurent Rineau a5aaab66cf Add weighted images 
The API is not final.
 2021-04-08 18:29:04 +02:00
Jane Tournois 0f4559a5e2 add missing default value 
attempt to fix "maybe uninitialized" warning
 2021-04-06 17:39:54 +02:00
Jane Tournois 7574751d4f not all points on the edges of the cube are corners 
differentiate between corner vertices and edge vertices
corner vertices are forced to be "terminal" in the call
to split_graph_into_polylines() hence leading to
as many polylines as segments on image bbox edges
 2021-04-06 14:59:49 +01:00
Laurent Rineau 1b54449dc5 Merge pull request #4878 from danston/Kernels-decltypes-danston 
Improve decltype/result_of/invoke_result
 2021-04-06 15:13:21 +02:00
Jane Tournois 1b323b8599 when aabb_tree is empty, there are no patches 
hence no incident patches
we only refer to an aabb tree of curves
 2021-04-02 14:44:26 +02:00
Laurent Rineau 0cb823656a Merge pull request #5463 from janetournois/Mesh_3-example_initialization_cc_in_gray_images-jtournois 
Mesh 3 - connected components initialization for 3D gray images
 2021-03-24 15:05:29 +01:00
Mael Rouxel-Labbé 27069d423c Update header includes 2021-03-12 12:52:05 +01:00
Dmitry Anisimov 00c185b028
Merge branch 'master' into Kernels-decltypes-danston 2021-03-12 12:06:20 +01:00
Laurent Rineau b1d78a909f Merge pull request #5433 from sloriot/CGAL-last_bind 
Remove last bind
 2021-03-03 17:32:59 +01:00
Laurent Rineau 38b45f79b1 Merge pull request #5468 from sloriot/CGAL-tiny_fixes 
Mesh_3: various small bug-fixes
 2021-03-03 17:29:37 +01:00
Laurent Rineau 6f8f36462f Merge pull request #5433 from sloriot/CGAL-last_bind 
Remove last bind
 2021-03-03 17:10:13 +01:00
Laurent Rineau d4c331cd37 Merge pull request #5468 from sloriot/CGAL-tiny_fixes 
Mesh_3: various small bug-fixes
 2021-03-03 16:39:52 +01:00
Laurent Rineau fa7393cb15 Merge pull request #5389 from sloriot/Mesh_3-fix_patch_id_map 
Clean and fix default facet patch id map
 2021-02-18 15:19:15 +01:00
Sébastien Loriot 98e48385e8 a RIGHT angle is also a corner 2021-02-17 15:49:48 +01:00
Sébastien Loriot 3b9dafb23b fix after BOOST_FOREACH -> for replacement 2021-02-17 15:49:30 +01:00
Jane Tournois 7c9e45206d add image_values_to_subdomain_indices parameter 2021-02-12 17:20:46 +01:00
Jane Tournois 8e492aa4f6 add initialization by detection of connected components in gray level image 2021-02-12 16:53:45 +01:00
Sébastien Loriot 4bb0406240 do not include boost/bind.hpp (shouldn't be used anymore) + fix remaining bind 
(nasty using namespace boost!)
 2021-02-12 15:35:19 +01:00
Jane Tournois c13a7a855c take into account the translation tx, ty, tz in Get_point from an image 2021-02-12 15:25:24 +01:00
Laurent Rineau d7bc38f683 Take the translation TX/TY/TZ into account 2021-02-12 14:16:54 +01:00
Laurent Rineau e94c41714a Fix a compilation error 
The definition of `initialize_triangulation_from_gray_image`
required `initialize_triangulation_from_labeled_image` to be defined,
or at least declared.
 2021-02-12 14:15:56 +01:00
Jane Tournois 5e86781ad8 add code to detect connected components in gray-level images 2021-02-12 10:29:14 +01:00
Sébastien Loriot 5835698fe2 no ref on temporary 2021-02-10 15:42:29 +01:00
Dmitry Anisimov 81d9556707 Merge remote-tracking branch 'upstream/master' into Kernels-decltypes-danston 2021-02-10 10:06:45 +01:00
Laurent Rineau a735e849c0 Merge pull request #5152 from sloriot/CGAL-remove_bind 
Replace usages of boost::bind
 2021-02-05 16:14:04 +01:00
Laurent Rineau 4c947f0ee0 Merge pull request #5340 from danston/CGAL-clang_warnings_fix-danston 
Clang warnings fixed
 2021-02-05 16:10:37 +01:00
Laurent Rineau 1453294c74 Merge pull request #5376 from lrineau/Mesh_3-fix_mesh_implicit_domains.cpp-GF 
Fix examples/Mesh_3/mesh_implicit_domains.cpp
 2021-02-05 16:10:24 +01:00
Laurent Rineau 7e2ee4946d Merge pull request #5152 from sloriot/CGAL-remove_bind 
Replace usages of boost::bind
 2021-02-05 16:07:34 +01:00
Laurent Rineau 3d71b8e5f0 Merge pull request #5376 from lrineau/Mesh_3-fix_mesh_implicit_domains.cpp-GF 
Fix examples/Mesh_3/mesh_implicit_domains.cpp
 2021-02-05 16:07:22 +01:00
Sébastien Loriot f69be333f0 Merge remote-tracking branch 'cgal/5.2.x-branch' into CGAL-remove_bind 2021-01-29 18:44:50 +01:00
Sébastien Loriot bf128b3fda rename typedef to make clear it is a property map 2021-01-25 16:19:23 +01:00
Sébastien Loriot fd371ef96b refactor the facet patch id maps + update the default 2021-01-25 16:09:17 +01:00
Laurent Rineau 6fe18d8068 Enhance the debugging tools in Mesh_3 2021-01-20 15:38:05 +01:00
Sébastien Loriot ad911271a9 Merge commit '6594e7549bd70923990d86c31e2aa267a79bb629' into HEAD 2021-01-15 10:12:17 +01:00
Sébastien Loriot bdd4efe3b3 Merge commit 'efc0c525e8b' into HEAD 2021-01-15 10:06:56 +01:00
Sébastien Loriot efc0c525e8 include non-deprecated header 2021-01-15 10:02:00 +01:00
Dmitry Anisimov 269a47d773
Merge branch 'master' into CGAL-clang_warnings_fix-danston 2021-01-14 16:51:13 +01:00
Dmitry Anisimov 086299c56e tetrahedral remeshing range loop analysis copy to ref and auto warnings fixed 2021-01-08 10:39:24 +01:00
Maxime Gimeno 3d1c41fd14 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2021-01-07 15:05:28 +01:00
Sébastien Loriot 2eb9908699 replace bind in Mesh_3 packages 2021-01-06 12:59:12 +01:00
Sébastien Loriot 361ef0cbbf simplify 2020-12-22 17:13:11 +01:00
Sébastien Loriot d1e1846f5e iterators are multipass 2020-12-22 16:55:25 +01:00
Laurent Rineau 34cde36fd9 Merge pull request #5209 from janetournois/Mesh_3-debug_global_optimizers-jtournois 
Mesh_3 global optimizers - improve projection to surface
 2020-12-09 16:14:35 +01:00
Laurent Rineau 9dcc0ef7e8 Merge pull request #5222 from maxGimeno/Tet_remesh-Fix_tbb-maxGimeno 
Mesh_3: Fix std::atomic wrong function

# Conflicts:
#	Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt
 2020-12-09 16:14:19 +01:00
Laurent Rineau 3fc0ba4435 Merge branch '5.1.x-branch' into 5.2.x-branch 
# Conflicts:
#	Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt
 2020-12-09 15:35:47 +01:00
Laurent Rineau 37f85e7702 Merge pull request #5209 from janetournois/Mesh_3-debug_global_optimizers-jtournois 
Mesh_3 global optimizers - improve projection to surface
 2020-12-09 14:58:56 +01:00
Dmitry Anisimov 3127190bcf marc's review 2020-12-08 12:48:04 +01:00
Jane Tournois 2d73ef361e remove wrong assertions 
when v has dimension 3, its incident cells can be either all inside
or all outside the complex
 2020-12-04 17:18:04 +01:00
Jane Tournois 232cf10af8 remove unused code 2020-12-04 10:40:42 +01:00
Mael Rouxel-Labbé 35fa50213a Avoid copies in Mesh_triangulation_3's trivial functions 
These exist because of P3M3
 2020-12-03 12:25:37 +01:00
Maxime Gimeno 5ee03985bf Fix atomic wrong function 2020-11-30 11:37:16 +01:00
Jane Tournois 0ed6aca5a4 replace get_closest_point() by get_closest_triangle() 
to use this function with Periodic_3_mesh_3
 2020-11-27 13:04:06 +01:00
Jane Tournois 9666b3cb73 replace PCA of points by PCA of triangles 
to make projection more precise and avoid moving a point inside a
protecting ball
 2020-11-26 16:25:55 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Laurent Rineau 646db6ef74 Try to fix a warning on MSVC 
```
...\include\CGAL/Polyhedral_mesh_domain_with_features_3.h(264): warning C4267: 'argument': conversion from 'size_t' to '_Ty', possible loss of data
        with
        [
            _Ty=int
        ]
...\cmake\platforms\x64_Cygwin-Windows10_MSVC2017-Release-64bits\test\Mesh_3\test_meshing_polylines_only.cpp(80): note: see reference to function template instantiation 'void CGAL::Polyhedral_mesh_domain_with_features_3<K,CGAL::Polyhedron_3<Gt,CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id>,CGAL::HalfedgeDS_default,std::allocator<_Ty>>,CGAL::Default,Patch_id,CGAL::Tag_true>::add_features<std::_Vector_iterator<std::_Vector_val<std::_Simple_types<std::vector<CGAL::Point_3<Kernel_>,std::allocator<CGAL::Point_3<Kernel_>>>>>>>(InputIterator,InputIterator)' being compiled
        with
        [
            Gt=K,
            Patch_id=int,
            _Ty=int,
            Kernel_=CGAL::Epick,
            InputIterator=std::_Vector_iterator<std::_Vector_val<std::_Simple_types<Polyline>>>
        ]
```
 2020-10-27 09:43:46 +01:00
Laurent Rineau 19fa64fdca Mesh_3: Fix Polyhedral_mesh_domain_with_features_3::add_features 
This patch, allows to mesh a polyhedron in a 3D demo, while
specifying a polylines item for the sharp features.
 2020-10-23 13:52:54 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Sebastien Loriot c54622e9b4
Merge pull request #4976 from janetournois/Tet_remeshing-speedup-GF 
Tetrahedral Remeshing - speedup
 2020-10-02 15:29:24 +02:00
Sebastien Loriot 9e4970faef
Merge pull request #4781 from lrineau/Mesh_3-ITT_support-GF 
Add ITT support in Mesh_3
 2020-10-02 15:20:04 +02:00
Sebastien Loriot 20ac7ff2da
Merge pull request #4792 from lrineau/Mesh_3-reduce_size_of_debuginfo-GF 
Reduce size of symbols (and debug infos)
 2020-10-02 15:17:44 +02:00
Sebastien Loriot b92ad36e82
Merge pull request #4892 from lrineau/Mesh_3-new_TBB_task_group_API-GF 
Mesh_3: now uses tbb:task_group instead of tbb::task (deprecated)
 2020-10-02 15:16:08 +02:00
Jane Tournois 8063d3cf6f replace deprecated std::not1 by std::not_fn 
std::not1 is deprecated in C++17 and removed from C++20

commit 5b474e0075 is similar
 2020-09-25 15:00:49 +02:00
Mael Rouxel-Labbé 4694a48913 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-09-22 11:35:25 +02:00
Maxime Gimeno efc903d8dc Fix error 2020-09-10 10:22:09 +02:00
Maxime Gimeno aeda2ef58c Replace boolean name and prevent maxx_domain=0 2020-09-07 12:35:54 +02:00
Maxime Gimeno 98c80402bc Don't use cell info() 2020-09-04 12:27:32 +02:00
Maxime Gimeno 56af55ecd4 Fix bug in mesh_3 tests 2020-08-27 13:46:04 +02:00
Maxime Gimeno 39c0f96492 Fix domain 0 behaviour 2020-08-27 13:18:46 +02:00
Maxime Gimeno 9d1e849517 Allow the .mesh to be read even with null domains 2020-08-27 10:26:58 +02:00