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

correct template scalar type use in FaceSaturate function

This commit is contained in:
Nico Pietroni 2015-04-12 06:13:35 +00:00
parent bb8d80c311
commit 843c852523
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcg/complex/algorithms/update/quality.h
View File

@ -257,6 +257,8 @@ static void VertexFromRMSCurvature(MeshType &m)
static void FaceSaturate(MeshType &m, ScalarType gradientThr=1.0) static void FaceSaturate(MeshType &m, ScalarType gradientThr=1.0)
{ {
typedef typename MeshType::CoordType CoordType; typedef typename MeshType::CoordType CoordType;
typedef typename MeshType::ScalarType ScalarType;
UpdateFlags<MeshType>::FaceClearV(m); UpdateFlags<MeshType>::FaceClearV(m);
std::stack<FacePointer> st; std::stack<FacePointer> st;
@ -280,9 +282,9 @@ static void FaceSaturate(MeshType &m, ScalarType gradientThr=1.0)
for(ffi=star.begin();ffi!=star.end();++ffi ) for(ffi=star.begin();ffi!=star.end();++ffi )
{ {
assert(fc!=(*ffi)); assert(fc!=(*ffi));
float &qi = (*ffi)->Q(); ScalarType &qi = (*ffi)->Q();
CoordType bary1=((*ffi)->P(0)+(*ffi)->P(1)+(*ffi)->P(2))/3; CoordType bary1=((*ffi)->P(0)+(*ffi)->P(1)+(*ffi)->P(2))/3;
float distGeom = Distance(bary0,bary1) / gradientThr; ScalarType distGeom = Distance(bary0,bary1) / gradientThr;
// Main test if the quality varies more than the geometric displacement we have to lower something. // Main test if the quality varies more than the geometric displacement we have to lower something.
if( distGeom < fabs(qi - fc->Q())) if( distGeom < fabs(qi - fc->Q()))
{ {