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

added explicit cast to ScalarType , line 286

This commit is contained in:
Nico Pietroni 2013-09-21 00:53:36 +00:00
parent afef24633f
commit affa165543
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,7 +273,7 @@ static void VertexSaturate(MeshType &m, ScalarType gradientThr=1.0)
if(vc->Q() > qi) // first case: the center of the star has to be lowered (and re-inserted in the queue). if(vc->Q() > qi) // first case: the center of the star has to be lowered (and re-inserted in the queue).
{ {
//printf("Reinserting center %i \n",vc - &*m.vert.begin()); //printf("Reinserting center %i \n",vc - &*m.vert.begin());
vc->Q() = qi+distGeom-0.00001f; vc->Q() = qi+distGeom-(ScalarType)0.00001;
assert( distGeom > fabs(qi - vc->Q())); assert( distGeom > fabs(qi - vc->Q()));
st.push(vc); st.push(vc);
break; break;
@ -283,7 +283,7 @@ static void VertexSaturate(MeshType &m, ScalarType gradientThr=1.0)
// second case: you have to lower qi, the vertex under examination. // second case: you have to lower qi, the vertex under examination.
assert( distGeom < fabs(qi - vc->Q())); assert( distGeom < fabs(qi - vc->Q()));
assert(vc->Q() < qi); assert(vc->Q() < qi);
float newQi = vc->Q() + distGeom -0.00001f; float newQi = vc->Q() + distGeom -(ScalarType)0.00001;
assert(newQi <= qi); assert(newQi <= qi);
assert(vc->Q() < newQi); assert(vc->Q() < newQi);
assert( distGeom > fabs(newQi - vc->Q()) ); assert( distGeom > fabs(newQi - vc->Q()) );