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

Added a signed measure of distortion to see Compresssion/Stretch

This commit is contained in:
nico 2020-11-22 09:46:04 +10:00
parent 59548afa48
commit d2b39eb0bb
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vcg/complex/algorithms/parametrization/distortion.h
View File

@ -185,7 +185,7 @@ public:
public: public:
enum DistType{AreaDist,EdgeDist,AngleDist,CrossDist,L2Stretch,LInfStretch,ARAPDist}; enum DistType{AreaDist,EdgeDist,EdgeComprStretch,AngleDist,CrossDist,L2Stretch,LInfStretch,ARAPDist};
///return the absolute difference between angle in 3D space and texture space ///return the absolute difference between angle in 3D space and texture space
///Actually the difference in cos space ///Actually the difference in cos space
@ -242,12 +242,19 @@ public:
///the needed scaling factor EdgeScaleVal may be calculated ///the needed scaling factor EdgeScaleVal may be calculated
///by using the ScalingFactor function ///by using the ScalingFactor function
static ScalarType EdgeDistortion(const FaceType *f,int e, static ScalarType EdgeDistortion(const FaceType *f,int e,
ScalarType EdgeScaleVal) ScalarType EdgeScaleVal,
bool AbsValue=true)
{ {
ScalarType edgeUV=EdgeLenghtUV(f,e)*EdgeScaleVal; ScalarType edgeUV=EdgeLenghtUV(f,e)*EdgeScaleVal;
ScalarType edge3D=EdgeLenght3D(f,e); ScalarType edge3D=EdgeLenght3D(f,e);
assert(edge3D > 0); assert(edge3D > 0);
ScalarType diff=fabs(edge3D-edgeUV)/edge3D;
ScalarType diff=0;
if (AbsValue)
diff=fabs(edge3D-edgeUV)/edge3D;
else
diff=(edge3D-edgeUV)/edge3D;
assert(!math::IsNAN(diff)); assert(!math::IsNAN(diff));
return diff; return diff;
} }
@ -505,6 +512,11 @@ public:
EdgeDistortion(&m.face[i],1,edge_scale)+ EdgeDistortion(&m.face[i],1,edge_scale)+
EdgeDistortion(&m.face[i],2,edge_scale) )/3; EdgeDistortion(&m.face[i],2,edge_scale) )/3;
break; break;
case EdgeComprStretch:
q =( EdgeDistortion(&m.face[i],0,edge_scale,false)+
EdgeDistortion(&m.face[i],1,edge_scale,false)+
EdgeDistortion(&m.face[i],2,edge_scale,false) )/3;
break;
case L2Stretch: case L2Stretch:
q = L2StretchEnergySquared( &m.face[i],area_scale ); q = L2StretchEnergySquared( &m.face[i],area_scale );
break; break;