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

standardized function names e used area function of vcg lib

This commit is contained in:
Paolo Cignoni 2012-04-04 09:57:46 +00:00
parent 783aef369b
commit 06d481f5de
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vcg/complex/algorithms/parametrization/distorsion.h
View File

@ -37,14 +37,14 @@ namespace vcg {
static ScalarType Area3D(const FaceType *f) static ScalarType Area3D(const FaceType *f)
{ {
CoordType vp0=f->P(0); // CoordType vp0=f->P(0);
CoordType vp1=f->P(1); // CoordType vp1=f->P(1);
CoordType vp2=f->P(2); // CoordType vp2=f->P(2);
ScalarType Area3D=((vp2-vp0)^(vp1-vp0)).Norm()/2.0; // ScalarType Area3D=((vp2-vp0)^(vp1-vp0)).Norm()/2.0;
return Area3D; return DoubleArea(*f)*(0.5);
} }
static ScalarType UVArea(const FaceType *f) static ScalarType AreaUV(const FaceType *f)
{ {
vcg::Point2<ScalarType> uv0=f->V(0)->T().P(); vcg::Point2<ScalarType> uv0=f->V(0)->T().P();
vcg::Point2<ScalarType> uv1=f->V(1)->T().P(); vcg::Point2<ScalarType> uv1=f->V(1)->T().P();
@ -132,7 +132,7 @@ namespace vcg {
{ {
SumArea3D+=Area3D(&m.face[i]); SumArea3D+=Area3D(&m.face[i]);
SumArea2D+=AreaUV(&m.face[i]); SumArea2D+=AreaUV(&m.face[i]);
for (j=0;j<3;j++) for (int j=0;j<3;j++)
{ {
SumEdge3D+=EdgeLenght3D(&m.face[i],j); SumEdge3D+=EdgeLenght3D(&m.face[i],j);
SumEdge2D+=EdgeLenghtUV(&m.face[i],j); SumEdge2D+=EdgeLenghtUV(&m.face[i],j);
@ -157,19 +157,19 @@ namespace vcg {
///return the variance of area, normalized ///return the variance of area, normalized
///in absolute value, the scalar AreaScaleVal may be calculated ///in absolute value, the scalar AreaScaleVal may be calculated
///by using the ScalingFactor function ///by using the ScalingFactor function
static ScalarType AreaDistorsion(FaceType *f, // static ScalarType AreaDistorsion(FaceType *f,
ScalarType AreaScaleVal) // ScalarType AreaScaleVal)
{ // {
ScalarType areaUV=AreaUV(f)*AreaScaleVal; // ScalarType areaUV=AreaUV(f)*AreaScaleVal;
ScalarType area3D=EdgeLenght3D(f,e); // ScalarType area3D=EdgeLenght3D(f,e);
ScalarType diff=fabs(edge3D-edgeUV)/edge3D; // ScalarType diff=fabs(edge3D-edgeUV)/edge3D;
return diff; // return diff;
} // }
///return the number of folded faces ///return the number of folded faces
static bool Folded(const FaceType *f) static bool Folded(const FaceType *f)
{ {
ScalarType areaUV=UVArea(f); ScalarType areaUV=AreaUV(f);
/*if (areaUV<0) /*if (areaUV<0)
printf("area %5.5f \n",areaUV);*/ printf("area %5.5f \n",areaUV);*/
return (areaUV<0); return (areaUV<0);