mirror of https://github.com/CGAL/cgal
renaming create_poisson_mesh_domain -> create_Poisson_mesh_domain
This commit is contained in:
parent
80c951e88f
commit
95c4204e37
|
|
@ -32,7 +32,7 @@ namespace CGAL {
|
|||
//
|
||||
// This class has a constructor taking a labeling function. It has also a static template member
|
||||
// function that acts as named constructor:
|
||||
// <ul><li>`create_poisson_mesh_domain()`, to create a domain from a `Poisson_reconstruction_function`</ ul>
|
||||
// <ul><li>`create_Poisson_mesh_domain()`, to create a domain from a `Poisson_reconstruction_function`</ ul>
|
||||
//
|
||||
//\tparam BGT is a geometric traits class that provides
|
||||
// the basic operations to implement intersection tests and intersection computations through a bisection
|
||||
|
|
@ -202,7 +202,7 @@ public:
|
|||
//
|
||||
///
|
||||
template<typename Bounding_object, typename CGAL_NP_TEMPLATE_PARAMETERS>
|
||||
static Poisson_mesh_domain_3 create_poisson_mesh_domain(const Function& function,
|
||||
static Poisson_mesh_domain_3 create_Poisson_mesh_domain(const Function& function,
|
||||
const Bounding_object& bounding_object,
|
||||
const CGAL_NP_CLASS& np = parameters::default_values()
|
||||
#ifndef DOXYGEN_RUNNING
|
||||
|
|
@ -230,14 +230,14 @@ internal_np::surface_patch_index), Null_functor());
|
|||
/// @}
|
||||
#ifndef DOXYGEN_RUNNING
|
||||
template<typename CGAL_NP_TEMPLATE_PARAMETERS>
|
||||
static Poisson_mesh_domain_3 create_poisson_mesh_domain(const CGAL_NP_CLASS& np = parameters::default_values())
|
||||
static Poisson_mesh_domain_3 create_Poisson_mesh_domain(const CGAL_NP_CLASS& np = parameters::default_values())
|
||||
{
|
||||
static_assert(!parameters::is_default_parameter<CGAL_NP_CLASS, internal_np::function_param_t>::value,
|
||||
"Value for required parameter not found"); static_assert(!parameters::is_default_parameter<CGAL_NP_CLASS,
|
||||
internal_np::bounding_object_param_t>::value, "Value for required parameter not found");
|
||||
|
||||
using parameters::get_parameter;
|
||||
return create_poisson_mesh_domain(parameters::get_parameter(np, internal_np::function_param),
|
||||
return create_Poisson_mesh_domain(parameters::get_parameter(np, internal_np::function_param),
|
||||
parameters::get_parameter(np, internal_np::bounding_object_param),
|
||||
np);
|
||||
}
|
||||
|
|
@ -246,11 +246,11 @@ internal_np::bounding_object_param_t>::value, "Value for required parameter not
|
|||
template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
|
||||
typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
|
||||
typename ... NP>
|
||||
static Poisson_mesh_domain_3 create_poisson_mesh_domain(const CGAL_NP_CLASS_1& np1,
|
||||
static Poisson_mesh_domain_3 create_Poisson_mesh_domain(const CGAL_NP_CLASS_1& np1,
|
||||
const CGAL_NP_CLASS_2& np2,
|
||||
const NP& ... nps)
|
||||
{
|
||||
return create_poisson_mesh_domain(internal_np::combine_named_parameters(np1, np2, nps...));
|
||||
return create_Poisson_mesh_domain(internal_np::combine_named_parameters(np1, np2, nps...));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ void poisson_reconstruction(const PointSet& points, const char* output)
|
|||
params::facet_size = sm_radius * average_spacing,
|
||||
params::facet_distance = sm_distance * average_spacing);
|
||||
|
||||
Mesh_domain domain = Mesh_domain::create_poisson_mesh_domain(function, bsphere,
|
||||
Mesh_domain domain = Mesh_domain::create_Poisson_mesh_domain(function, bsphere,
|
||||
params::relative_error_bound(sm_dichotomy_error / sm_sphere_radius));
|
||||
|
||||
// Generates surface mesh with manifold option
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@ int main(int argc, char * argv[])
|
|||
<< " manifold_with_boundary()\n";
|
||||
|
||||
// Defines mesh domain
|
||||
Mesh_domain domain = Mesh_domain::create_poisson_mesh_domain(function, bsphere,
|
||||
Mesh_domain domain = Mesh_domain::create_Poisson_mesh_domain(function, bsphere,
|
||||
CGAL::parameters::relative_error_bound(sm_dichotomy_error / sm_sphere_radius));
|
||||
|
||||
// Generates mesh with manifold option
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ int main(void)
|
|||
CGAL::parameters::facet_distance = sm_distance*average_spacing);
|
||||
|
||||
// Defines mesh domain
|
||||
Mesh_domain domain = Mesh_domain::create_poisson_mesh_domain(function, bsphere,
|
||||
Mesh_domain domain = Mesh_domain::create_Poisson_mesh_domain(function, bsphere,
|
||||
CGAL::parameters::relative_error_bound(sm_dichotomy_error / sm_sphere_radius));
|
||||
|
||||
// Generates mesh with manifold option
|
||||
|
|
|
|||
|
|
@ -393,7 +393,7 @@ int main(int argc, char * argv[])
|
|||
// Defines generation criteria
|
||||
|
||||
// Defines mesh domain
|
||||
Mesh_domain domain = Mesh_domain::create_poisson_mesh_domain(
|
||||
Mesh_domain domain = Mesh_domain::create_Poisson_mesh_domain(
|
||||
function, bsphere, CGAL::parameters::relative_error_bound(sm_dichotomy_error / sm_sphere_radius));
|
||||
|
||||
// Generates mesh with manifold option
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ int main(int argc, char * argv[])
|
|||
Poisson_mesh_criteria criteria(params::facet_angle = sm_angle, params::facet_size = sm_radius * average_spacing,
|
||||
params::facet_distance = sm_distance * average_spacing);
|
||||
|
||||
/*std::cerr << " make_mesh_3 with sphere center=(" << inner_point << "),\n"
|
||||
std::cerr << " make_mesh_3 with sphere center=(" << inner_point << "),\n"
|
||||
<< " sphere radius=" << sm_sphere_radius << ",\n"
|
||||
<< " angle=" << sm_angle << " degrees,\n"
|
||||
<< " triangle size=" << sm_radius
|
||||
|
|
@ -317,13 +317,13 @@ int main(int argc, char * argv[])
|
|||
<< " manifold_with_boundary()\n";
|
||||
|
||||
// Generates surface mesh with manifold option
|
||||
Poisson_mesh_domain domain = Poisson_mesh_domain::create_poisson_mesh_domain(
|
||||
Poisson_mesh_domain domain = Poisson_mesh_domain::create_Poisson_mesh_domain(
|
||||
function, bsphere, params::relative_error_bound(sm_dichotomy_error / sm_sphere_radius));
|
||||
Poisson_C3t3 c3t3 =
|
||||
CGAL::make_mesh_3<Poisson_C3t3>(domain, criteria, params::no_exude().no_perturb().manifold_with_boundary());
|
||||
|
||||
// Prints status
|
||||
/ *long* / memory = CGAL::Memory_sizer().virtual_size();
|
||||
/* long */ memory = CGAL::Memory_sizer().virtual_size();
|
||||
const Poisson_Tr& tr = c3t3.triangulation();
|
||||
std::cerr << "Surface meshing: " << task_timer.time() << " seconds, " << tr.number_of_vertices()
|
||||
<< " output vertices, " << (memory >> 20) << " Mb allocated" << std::endl;
|
||||
|
|
@ -336,7 +336,7 @@ int main(int argc, char * argv[])
|
|||
|
||||
// Converts to polyhedron
|
||||
Polyhedron output_mesh;
|
||||
CGAL::facets_in_complex_3_to_triangle_mesh(c3t3, output_mesh);*/
|
||||
CGAL::facets_in_complex_3_to_triangle_mesh(c3t3, output_mesh);
|
||||
|
||||
// Prints total reconstruction duration
|
||||
std::cerr << "Total reconstruction using Poisson_mesh_domain_3 (implicit function + meshing): "
|
||||
|
|
|
|||
Loading…
Reference in New Issue