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

added function AdjustDirectionsOnTangentspace ando some minor changes

This commit is contained in:
Nico Pietroni 2015-06-14 23:16:02 +00:00
parent 56856e2e22
commit 470e156a19
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,7 +516,7 @@ private:
public: public:
static bool FindSeparatrices(const typename vcg::face::Pos<FaceType> &vPos, static size_t FindSeparatrices(const typename vcg::face::Pos<FaceType> &vPos,
std::vector<CoordType> &directions, std::vector<CoordType> &directions,
std::vector<FaceType*> &faces, std::vector<FaceType*> &faces,
std::vector<TriangleType> &WrongTris, std::vector<TriangleType> &WrongTris,
@ -638,17 +638,17 @@ public:
directions.push_back(InterpDir); directions.push_back(InterpDir);
faces.push_back(currF); faces.push_back(currF);
} }
if (expVal==-1)return true; if (expVal==-1)return directions.size();
if (directions.size()<=expVal)return true; if (directions.size()<=expVal)return directions.size();
size_t sampledDir=directions.size();
int to_erase=directions.size()-expVal; int to_erase=directions.size()-expVal;
do do
{ {
ReduceOneDirectionField(directions,faces); ReduceOneDirectionField(directions,faces);
to_erase--; to_erase--;
}while (to_erase!=0); }while (to_erase!=0);
return false; return sampledDir;
} }
static CoordType FollowDirection(const FaceType &f0, static CoordType FollowDirection(const FaceType &f0,
@ -1218,7 +1218,7 @@ 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())continue; //if (mesh.vert[i].IsB())continue;
int missmatch; int missmatch;
if (IsSingularByCross(mesh.vert[i],missmatch)) if (IsSingularByCross(mesh.vert[i],missmatch))
@ -1274,6 +1274,24 @@ public:
f1->PD2().Normalize(); f1->PD2().Normalize();
} }
static void AdjustDirectionsOnTangentspace(MeshType &mesh)
{
for (size_t i=0;i<mesh.face.size();i++)
{
FaceType *f=&mesh.face[i];
if (f->IsD())continue;
CoordType Ntest=mesh.face[i].PD1()^mesh.face[i].PD2();
Ntest.Normalize();
CoordType Ntarget=mesh.face[i].N();
if ((Ntest*Ntarget)>0.999)continue;
//find the rotation matrix that maps between normals
vcg::Matrix33<ScalarType> rotation=vcg::RotationMatrix(Ntest,Ntarget);
mesh.face[i].PD1()=rotation*mesh.face[i].PD1();
mesh.face[i].PD2()=rotation*mesh.face[i].PD2();
}
}
static void OrientDirectionFaceCoherently(MeshType &mesh) static void OrientDirectionFaceCoherently(MeshType &mesh)
{ {
for (size_t i=0;i<mesh.face.size();i++) for (size_t i=0;i<mesh.face.size();i++)