songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mesh domain is now const 

and cleaning (add_input_features has become useless)
This commit is contained in:
Jane Tournois 2023-01-23 21:49:17 +01:00
parent ef9f917395
commit dd4722caa7
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
View File

@ -128,7 +128,7 @@ namespace internal {
struct Detect_features_in_domain { struct Detect_features_in_domain {
std::vector<std::vector<typename MeshDomain::Point_3>> std::vector<std::vector<typename MeshDomain::Point_3>>
operator()(const CGAL::Image_3& image, operator()(const CGAL::Image_3& image,
MeshDomain& domain, const MeshDomain& domain,
DetectFunctor functor) const { DetectFunctor functor) const {
return functor(image, domain); return functor(image, domain);
} }
@ -138,7 +138,7 @@ namespace internal {
struct Detect_features_in_domain<MeshDomain, Null_functor> { struct Detect_features_in_domain<MeshDomain, Null_functor> {
std::vector<std::vector<typename MeshDomain::Point_3>> std::vector<std::vector<typename MeshDomain::Point_3>>
operator()(const CGAL::Image_3&, operator()(const CGAL::Image_3&,
MeshDomain&, const MeshDomain&,
Null_functor) const { Null_functor) const {
return std::vector<std::vector<typename MeshDomain::Point_3>>(); return std::vector<std::vector<typename MeshDomain::Point_3>>();
} }
@ -147,37 +147,13 @@ namespace internal {
template<typename MeshDomain, typename DetectFunctor> template<typename MeshDomain, typename DetectFunctor>
std::vector<std::vector<typename MeshDomain::Point_3>> std::vector<std::vector<typename MeshDomain::Point_3>>
detect_features(const CGAL::Image_3& image, detect_features(const CGAL::Image_3& image,
MeshDomain& domain, const MeshDomain& domain,
DetectFunctor functor) DetectFunctor functor)
{ {
return Detect_features_in_domain<MeshDomain, DetectFunctor>() return Detect_features_in_domain<MeshDomain, DetectFunctor>()
(image, domain, functor); (image, domain, functor);
} }
// Add_input_features
template<typename MeshDomain, typename DetectFunctor>
struct Add_input_features_in_domain {
std::vector<std::vector<typename MeshDomain::Point_3>>
operator()(MeshDomain& domain, DetectFunctor functor) const {
return functor(domain);
}
};
// specialization for `Null_functor`: create the default functor
template<typename MeshDomain>
struct Add_input_features_in_domain<MeshDomain, Null_functor> {
std::vector<std::vector<typename MeshDomain::Point_3>>
operator()(MeshDomain&, Null_functor) const {
return std::vector<std::vector<typename MeshDomain::Point_3>>();
}
};
template<typename MeshDomain, typename DetectFunctor>
std::vector<std::vector<typename MeshDomain::Point_3>>
add_input_features(MeshDomain& domain, DetectFunctor functor)
{
return Add_input_features_in_domain<MeshDomain, DetectFunctor>()(domain, functor);
}
template<bool WithFeatures> template<bool WithFeatures>
struct Add_features_in_domain { struct Add_features_in_domain {
template<typename MeshDomain, typename InputFeatureRange, typename DetectFunctor> template<typename MeshDomain, typename InputFeatureRange, typename DetectFunctor>