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

some bug resolved on separatrix tracing

This commit is contained in:
Nico Pietroni 2015-06-02 11:54:39 +00:00
parent b952d96711
commit 4283c2f651
1 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,15 +444,15 @@ private:
CoordType bary0,bary1; CoordType bary0,bary1;
bool Inside0=vcg::InterpolationParameters(T0Rot,Interpolated,bary0); bool Inside0=vcg::InterpolationParameters(T0Rot,Interpolated,bary0);
bool Inside1=vcg::InterpolationParameters(T1Rot,Interpolated,bary1); bool Inside1=vcg::InterpolationParameters(T1Rot,Interpolated,bary1);
//assert(Inside0 || Inside1); assert(Inside0 || Inside1);
if (!(Inside0 || Inside1)) // if (!(Inside0 || Inside1))
{ // {
std::cout << "Not Inside " << Interpolated.X() << "," << Interpolated.Y() << "," << Interpolated.Z() << std::endl; // std::cout << "Not Inside " << Interpolated.X() << "," << Interpolated.Y() << "," << Interpolated.Z() << std::endl;
std::cout << "bary0 " << bary0.X() << "," << bary0.Y() << "," << bary0.Z() << std::endl; // std::cout << "bary0 " << bary0.X() << "," << bary0.Y() << "," << bary0.Z() << std::endl;
std::cout << "bary1 " << bary1.X() << "," << bary1.Y() << "," << bary1.Z() << std::endl; // std::cout << "bary1 " << bary1.X() << "," << bary1.Y() << "," << bary1.Z() << std::endl;
std::cout << "Diff0 " << fabs(bary0.Norm() - 1) << std::endl; // std::cout << "Diff0 " << fabs(bary0.Norm() - 1) << std::endl;
std::cout << "Diff1 " << fabs(bary1.Norm() - 1) << std::endl; // std::cout << "Diff1 " << fabs(bary1.Norm() - 1) << std::endl;
} // }
if (Inside0) if (Inside0)
{ {
@ -504,6 +504,8 @@ private:
std::vector<FaceType*> SwapF(faces.begin(),faces.end()); std::vector<FaceType*> SwapF(faces.begin(),faces.end());
directions.clear(); directions.clear();
faces.clear();
for (size_t i=0;i<SwapV.size();i++) for (size_t i=0;i<SwapV.size();i++)
{ {
if (i==IndexDel)continue; if (i==IndexDel)continue;
@ -612,18 +614,18 @@ public:
CoordType InterpDir; CoordType InterpDir;
size_t tri_Index; size_t tri_Index=-1;
if ((versef0D1 * versef1D1) < ScalarType(0)) if ((versef0D1 * versef1D1) < ScalarType(0))
{ {
InterpolateDir(Dir1F0,Dir1F1,Bary0,Bary1,t0,t1,InterpDir,tri_Index); InterpolateDir(Dir1F0,Dir1F1,Bary0,Bary1,t0,t1,InterpDir,tri_Index);
} }
else else
if ((versef0D2 * versef1D2 )< ScalarType(0))
{ {
directions.push_back(InterpolateDir(Dir2F0,Dir2F1,Bary0,Bary1,t0,t1)); if ((versef0D2 * versef1D2 )< ScalarType(0))
InterpolateDir(Dir2F0,Dir2F1,Bary0,Bary1,t0,t1,InterpDir,tri_Index);
} }
//no separatrix found continue
if (tri_Index==-1)continue;
//retrieve original face //retrieve original face
assert((tri_Index==0)||(tri_Index==1)); assert((tri_Index==0)||(tri_Index==1));
@ -661,6 +663,30 @@ public:
return ret; return ret;
} }
static int FollowDirectionI(const FaceType &f0,
const FaceType &f1,
const CoordType &dir0)
{
///first it rotate dir to match with f1
CoordType dirTarget=FollowDirection(f0,f1,dir0);
CoordType dir[4];
CrossVector(f1,dir);
ScalarType best=-1;
int ret=-1;
for (int i=0;i<4;i++)
{
ScalarType dot=dir[i]*dirTarget;
if (dot>best)
{
best=dot;
ret=i;
}
}
assert(ret!=-1);
return ret;
}
static int FollowDirection(const FaceType &f0, static int FollowDirection(const FaceType &f0,
const FaceType &f1, const FaceType &f1,
int dir0) int dir0)