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

Use linear mask/subdivision

This commit is contained in:
Mael Rouxel-Labbé 2025-02-20 11:10:19 +01:00
parent c299e09501
commit a1763eee4e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lab/demo/Lab/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp
View File

@ -107,7 +107,7 @@ void CGAL_Lab_subdivision_methods_plugin::apply_upsample(FaceGraphItem* item, in
time.start(); time.start();
CGAL::Three::Three::information("Upsample subdivision..."); CGAL::Three::Three::information("Upsample subdivision...");
QApplication::setOverrideCursor(Qt::WaitCursor); 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())); CGAL::Three::Three::information(QString("ok (%1 ms)").arg(time.elapsed()));
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
item->invalidateOpenGLBuffers(); item->invalidateOpenGLBuffers();

8
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/approximated_centroidal_Voronoi_diagram_remeshing.h
View File

@ -343,7 +343,7 @@ void upsample_subdivision_property(TriangleMesh& tmesh,
std::unordered_set<vertex_descriptor> old_vertices; std::unordered_set<vertex_descriptor> old_vertices;
unsigned int step = choose_parameter(get_parameter(np, internal_np::number_of_iterations), 1); 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) for (unsigned int i = 0; i < step; ++i)
{ {
@ -536,9 +536,9 @@ acvd_impl(TriangleMesh& tmesh,
{ {
if (gradation_factor == 0) // no adaptive clustering if (gradation_factor == 0) // no adaptive clustering
{ {
Subdivision_method_3::Upsample_subdivision(tmesh, CGAL::parameters::number_of_iterations(subdivide_steps) Subdivision_method_3::linear_subdivision(tmesh, CGAL::parameters::number_of_iterations(subdivide_steps)
.vertex_point_map(vpm) .vertex_point_map(vpm)
.geom_traits(gt)); .geom_traits(gt));
} }
#ifndef CGAL_ACVD_DOES_NOT_USE_INTERPOLATED_CORRECTED_CURVATURES #ifndef CGAL_ACVD_DOES_NOT_USE_INTERPOLATED_CORRECTED_CURVATURES
else // adaptive clustering else // adaptive clustering