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

added border singularity check

This commit is contained in:
nico 2020-11-24 17:16:17 +10:00
parent 6d2f4225dd
commit 0ebdeb2bc9
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -821,7 +821,12 @@ public:
{ {
///first it rotate dir to match with f1 ///first it rotate dir to match with f1
CoordType dirS=CrossVector(f0,dir0); CoordType dirS=CrossVector(f0,dir0);
CoordType dirR=vcg::tri::CrossField<MeshType>::Rotate(f0,f1,dirS); ScalarType DotN=(f0.cN()*f1.cN());
CoordType dirR;
if (DotN<(-0.99999))
dirR=-dirS;
else
dirR=vcg::tri::CrossField<MeshType>::Rotate(f0,f1,dirS);
///then get the closest upf to K*PI/2 rotations ///then get the closest upf to K*PI/2 rotations
//CoordType dir1=f1.cPD1(); //CoordType dir1=f1.cPD1();
//int ret=I_K_PI(dir1,dirR,f1.cN()); //int ret=I_K_PI(dir1,dirR,f1.cN());
@ -838,7 +843,6 @@ public:
ret=i; ret=i;
} }
} }
assert(ret!=-1); assert(ret!=-1);
return ret; return ret;
@ -1347,13 +1351,14 @@ public:
} }
///return true if a given vertex is singular, ///return true if a given vertex is singular,
///return also the missmatch ///return also the missmatch
static bool IsSingularByCross(const VertexType &v,int &missmatch) static bool IsSingularByCross(const VertexType &v,int &missmatch,bool BorderSing=false)
{ {
typedef typename VertexType::FaceType FaceType; typedef typename VertexType::FaceType FaceType;
///check that is on border.. ///check that is on border..
if (v.IsB())return false; if (v.IsB()&& (!BorderSing))return false;
std::vector<face::Pos<FaceType> > posVec; std::vector<face::Pos<FaceType> > posVec;
//SortedFaces(v,faces); //SortedFaces(v,faces);
@ -1374,7 +1379,7 @@ public:
} }
///select singular vertices ///select singular vertices
static void UpdateSingularByCross(MeshType &mesh) static void UpdateSingularByCross(MeshType &mesh,bool addBorderSing=false)
{ {
bool hasSingular = vcg::tri::HasPerVertexAttribute(mesh,std::string("Singular")); bool hasSingular = vcg::tri::HasPerVertexAttribute(mesh,std::string("Singular"));
bool hasSingularIndex = vcg::tri::HasPerVertexAttribute(mesh,std::string("SingularIndex")); bool hasSingularIndex = vcg::tri::HasPerVertexAttribute(mesh,std::string("SingularIndex"));
@ -1395,16 +1400,8 @@ public:
for (size_t i=0;i<mesh.vert.size();i++) 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())
{
Handle_Singular[i]=false;
Handle_SingularIndex[i]=0;
continue;
}
int missmatch; int missmatch;
if (IsSingularByCross(mesh.vert[i],missmatch)) if (IsSingularByCross(mesh.vert[i],missmatch,addBorderSing))
{ {
Handle_Singular[i]=true; Handle_Singular[i]=true;
Handle_SingularIndex[i]=missmatch; Handle_SingularIndex[i]=missmatch;