From 4e4d5edeb7a728b8d02859cdc2a77c8e559c8bf6 Mon Sep 17 00:00:00 2001 From: nicopietroni Date: Fri, 7 Mar 2014 16:32:06 +0000 Subject: [PATCH] some minor modification to give the possibility to specify the interpolation function for refinemenent --- vcg/complex/algorithms/voronoi_processing.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/vcg/complex/algorithms/voronoi_processing.h b/vcg/complex/algorithms/voronoi_processing.h index 8a9f432f..0df1b6f6 100644 --- a/vcg/complex/algorithms/voronoi_processing.h +++ b/vcg/complex/algorithms/voronoi_processing.h @@ -1362,7 +1362,9 @@ static void ConvertDelaunayTriangulationToMesh(MeshType &m, tri::Allocator::CompactVertexVector(outMesh); } -static void PreprocessForVoronoi(MeshType &m, float radius) +template +static void PreprocessForVoronoi(MeshType &m, float radius, + MidPointType mid) { const int maxSubDiv = 10; tri::RequireFFAdjacency(m); @@ -1372,13 +1374,19 @@ static void PreprocessForVoronoi(MeshType &m, float radius) for(int i=0;i >(m,tri::MidPoint(&m),min(edgeLen*2.0f,radius/5.0f)); + bool ret = tri::Refine(m,mid,min(edgeLen*2.0f,radius/5.0f)); if(!ret) break; } tri::Allocator::CompactEveryVector(m); tri::UpdateTopology::VertexFace(m); } +static void PreprocessForVoronoi(MeshType &m, float radius) +{ + tri::MidPoint mid(m); + PreprocessForVoronoi >(m, radius,mid); +} + static void RelaxRefineTriangulationSpring(MeshType &m, MeshType &delaMesh, int refineStep=3, int relaxStep=10 ) { tri::RequireCompactness(m);