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

initializer list corrected

This commit is contained in:
Luigi Malomo 2021-11-29 12:15:37 +01:00
parent 5eb0e6cff6
commit da3c5c2b96
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vcg/complex/algorithms/isotropic_remeshing.h
View File

@ -685,7 +685,7 @@ private:
testSwap(pi, params.creaseAngleCosThr) && testSwap(pi, params.creaseAngleCosThr) &&
// face::CheckFlipEdge(f, i) && // face::CheckFlipEdge(f, i) &&
face::CheckFlipEdgeNormal(f, i, float(vcg::math::ToRad(5.))) && face::CheckFlipEdgeNormal(f, i, float(vcg::math::ToRad(5.))) &&
(!params.surfDistCheck || testHausdorff(*params.mProject, params.grid, { swapEdgeMidPoint }, params.maxSurfDist))) (!params.surfDistCheck || testHausdorff(*params.mProject, params.grid, {{ swapEdgeMidPoint }}, params.maxSurfDist)))
{ {
//When doing the swap we need to preserve and update the crease info accordingly //When doing the swap we need to preserve and update the crease info accordingly
FaceType* g = f.cFFp(i); FaceType* g = f.cFFp(i);
@ -872,7 +872,7 @@ private:
}; };
if (!testHausdorff(*(params.mProject), params.grid, points, params.maxSurfDist) || if (!testHausdorff(*(params.mProject), params.grid, points, params.maxSurfDist) ||
!testHausdorff(*(params.mProject), params.grid, { (v1->cP() + v2->cP() + mp) / 3. }, params.maxSurfDist, newN)) !testHausdorff(*(params.mProject), params.grid, {{ (v1->cP() + v2->cP() + mp) / 3. }}, params.maxSurfDist, newN))
return false; return false;
} }
} }

10
vcg/complex/foreach.h
View File

@ -244,7 +244,7 @@ inline void ForEachEdge(MeshType &m, Callable action)
{ {
for(auto ei=m.edge.begin();ei!=m.edge.end();++ei) { for(auto ei=m.edge.begin();ei!=m.edge.end();++ei) {
action(*ei); action(*ei);
} }
} }
else else
{ {
@ -252,7 +252,7 @@ inline void ForEachEdge(MeshType &m, Callable action)
if(!(*ei).IsD()) if(!(*ei).IsD())
{ {
action(*ei); action(*ei);
} }
} }
} }
@ -273,7 +273,7 @@ inline void ForEachTetra(const MeshType &m, Callable action)
{ {
for(auto ti = m.tetra.begin(); ti != m.tetra.end(); ++ti) { for(auto ti = m.tetra.begin(); ti != m.tetra.end(); ++ti) {
action(*ti); action(*ti);
} }
} }
else else
{ {
@ -281,7 +281,7 @@ inline void ForEachTetra(const MeshType &m, Callable action)
if(!(*ti).IsD()) if(!(*ti).IsD())
{ {
action(*ti); action(*ti);
} }
} }
} }
@ -292,7 +292,7 @@ inline void ForEachTetra(MeshType &m, Callable action)
{ {
for(auto ti = m.tetra.begin(); ti != m.tetra.end(); ++ti) { for(auto ti = m.tetra.begin(); ti != m.tetra.end(); ++ti) {
action(*ti); action(*ti);
} }
} }
else else
{ {