mirror of https://github.com/CGAL/cgal
Use linear mask/subdivision
This commit is contained in:
parent
c299e09501
commit
a1763eee4e
|
|
@ -107,7 +107,7 @@ void CGAL_Lab_subdivision_methods_plugin::apply_upsample(FaceGraphItem* item, in
|
|||
time.start();
|
||||
CGAL::Three::Three::information("Upsample subdivision...");
|
||||
QApplication::setOverrideCursor(Qt::WaitCursor);
|
||||
CGAL::Subdivision_method_3::Upsample_subdivision(*graph, params::number_of_iterations(nb_steps));
|
||||
CGAL::Subdivision_method_3::linear_subdivision(*graph, params::number_of_iterations(nb_steps));
|
||||
CGAL::Three::Three::information(QString("ok (%1 ms)").arg(time.elapsed()));
|
||||
QApplication::restoreOverrideCursor();
|
||||
item->invalidateOpenGLBuffers();
|
||||
|
|
|
|||
|
|
@ -343,7 +343,7 @@ void upsample_subdivision_property(TriangleMesh& tmesh,
|
|||
std::unordered_set<vertex_descriptor> old_vertices;
|
||||
|
||||
unsigned int step = choose_parameter(get_parameter(np, internal_np::number_of_iterations), 1);
|
||||
Upsample_mask_3<TriangleMesh,VPM> mask(&tmesh, vpm);
|
||||
Linear_mask_3<TriangleMesh,VPM> mask(&tmesh, vpm);
|
||||
|
||||
for (unsigned int i = 0; i < step; ++i)
|
||||
{
|
||||
|
|
@ -536,9 +536,9 @@ acvd_impl(TriangleMesh& tmesh,
|
|||
{
|
||||
if (gradation_factor == 0) // no adaptive clustering
|
||||
{
|
||||
Subdivision_method_3::Upsample_subdivision(tmesh, CGAL::parameters::number_of_iterations(subdivide_steps)
|
||||
.vertex_point_map(vpm)
|
||||
.geom_traits(gt));
|
||||
Subdivision_method_3::linear_subdivision(tmesh, CGAL::parameters::number_of_iterations(subdivide_steps)
|
||||
.vertex_point_map(vpm)
|
||||
.geom_traits(gt));
|
||||
}
|
||||
#ifndef CGAL_ACVD_DOES_NOT_USE_INTERPOLATED_CORRECTED_CURVATURES
|
||||
else // adaptive clustering
|
||||
|
|
|
|||
Loading…
Reference in New Issue