manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added managment of fixed vertices in the restricted voronoi relaxing

This commit is contained in:
Paolo Cignoni 2014-08-28 09:28:39 +00:00
parent 636cf7bf8a
commit 0337582896
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vcg/complex/algorithms/voronoi_processing.h
View File

@ -1186,12 +1186,13 @@ static int RestrictedVoronoiRelaxing(MeshType &m, std::vector<VertexType *> &see
{ {
PerVertexPointerHandle sources = tri::Allocator<MeshType>:: template GetPerVertexAttribute<VertexPointer> (m,"sources"); PerVertexPointerHandle sources = tri::Allocator<MeshType>:: template GetPerVertexAttribute<VertexPointer> (m,"sources");
PerVertexBoolHandle fixed = tri::Allocator<MeshType>:: template GetPerVertexAttribute<bool> (m,"fixed"); PerVertexBoolHandle fixed = tri::Allocator<MeshType>:: template GetPerVertexAttribute<bool> (m,"fixed");
std::vector<bool> fixedVec;
std::vector<CoordType> seedPosVec; std::vector<CoordType> seedPosVec;
for(size_t i=0;i<seedVec.size();++i) for(size_t i=0;i<seedVec.size();++i){
seedPosVec.push_back(seedVec[i]->P()); seedPosVec.push_back(seedVec[i]->P());
fixedVec.push_back(fixed[seedVec[i]]);
}
bool changed=false;
assert(m.vn > seedPosVec.size()*20); assert(m.vn > seedPosVec.size()*20);
int i; int i;
@ -1214,16 +1215,27 @@ static int RestrictedVoronoiRelaxing(MeshType &m, std::vector<VertexType *> &see
} }
vector<CoordType> newseedVec; vector<CoordType> newseedVec;
vector<bool> newfixedVec;
for(int i=0;i<seedPosVec.size();++i) for(int i=0;i<seedPosVec.size();++i)
{
if(fixedVec[i])
{
newseedVec.push_back(seedPosVec[i]);
newfixedVec.push_back(true);
}
else
{ {
if(sumVec[i].first != 0) if(sumVec[i].first != 0)
{
newseedVec.push_back(sumVec[i].second /ScalarType(sumVec[i].first)); newseedVec.push_back(sumVec[i].second /ScalarType(sumVec[i].first));
newfixedVec.push_back(false);
}
}
} }
std::swap(seedPosVec,newseedVec); std::swap(seedPosVec,newseedVec);
std::swap(fixedVec,newfixedVec);
tri::UpdateColor<MeshType>::PerVertexQualityRamp(m); tri::UpdateColor<MeshType>::PerVertexQualityRamp(m);
qDebug("performed %i relax step on %i",i,relaxStep);
} }
SeedToVertexConversion(m,seedPosVec,seedVec); SeedToVertexConversion(m,seedPosVec,seedVec);