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

major changes in UpdateSingularByCross, used the additional parameter to set if a vertex is singular or not

This commit is contained in:
Nico Pietroni 2014-11-05 19:23:42 +00:00
parent 7f6288ed16
commit f115db004c
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
vcg/complex/algorithms/parametrization/tangent_field_operators.h
View File

@ -562,7 +562,7 @@ public:
static int MissMatchByCross(const FaceType &f0, static int MissMatchByCross(const FaceType &f0,
const FaceType &f1) const FaceType &f1)
{ {
CoordType dir0=CrossVector(f0,0); //CoordType dir0=CrossVector(f0,0);
CoordType dir1=CrossVector(f1,0); CoordType dir1=CrossVector(f1,0);
CoordType dir1Rot=Rotate(f1,f0,dir1); CoordType dir1Rot=Rotate(f1,f0,dir1);
@ -609,19 +609,40 @@ public:
} }
///select singular vertices ///select singular vertices
static void SelectSingularByCross(MeshType &mesh) static void UpdateSingularByCross(MeshType &mesh)
{ {
for (unsigned int i=0;i<mesh.vert.size();i++) bool hasSingular = vcg::tri::HasPerVertexAttribute(mesh,std::string("Singular"));
bool hasSingularIndex = vcg::tri::HasPerVertexAttribute(mesh,std::string("SingularIndex"));
typename MeshType::template PerVertexAttributeHandle<bool> Handle_Singular;
typename MeshType::template PerVertexAttributeHandle<int> Handle_SingularIndex;
if (hasSingular)
Handle_Singular=vcg::tri::Allocator<MeshType>::template GetPerVertexAttribute<bool>(mesh,std::string("Singular"));
else
Handle_Singular=vcg::tri::Allocator<MeshType>::template AddPerVertexAttribute<bool>(mesh,std::string("Singular"));
if (hasSingularIndex)
Handle_SingularIndex=vcg::tri::Allocator<MeshType>::template GetPerVertexAttribute<int>(mesh,std::string("SingularIndex"));
else
Handle_SingularIndex=vcg::tri::Allocator<MeshType>::template AddPerVertexAttribute<int>(mesh,std::string("SingularIndex"));
for (size_t i=0;i<mesh.vert.size();i++)
{ {
if (mesh.vert[i].IsD())continue; if (mesh.vert[i].IsD())continue;
if (mesh.vert[i].IsB())continue; if (mesh.vert[i].IsB())continue;
int missmatch; int missmatch;
if (IsSingularByCross(mesh.vert[i],missmatch)) if (IsSingularByCross(mesh.vert[i],missmatch))
mesh.vert[i].SetS(); {
Handle_Singular[i]=true;
Handle_SingularIndex[i]=missmatch;
}
else else
mesh.vert[i].ClearS(); {
Handle_Singular[i]=false;
Handle_SingularIndex[i]=0;
}
} }
} }