const correctness + std namespace fix
This commit is contained in:
parent
1b20698dfb
commit
ff62e5273a
|
@ -609,7 +609,7 @@ public:
|
|||
//safety checks
|
||||
if (weightSum[i]>0)
|
||||
newP=avgPos[i]/weightSum[i];
|
||||
if (isnan(newP.X())||isnan(newP.Y())||isnan(newP.Z()))
|
||||
if (std::isnan(newP.X())|| std::isnan(newP.Y())|| std::isnan(newP.Z()))
|
||||
newP=poly_m.vert[i].P();
|
||||
if ((newP-poly_m.vert[i].P()).Norm()>poly_m.bbox.Diag())
|
||||
newP=poly_m.vert[i].P();
|
||||
|
|
|
@ -82,9 +82,9 @@ public:
|
|||
assert (tp != 0);
|
||||
assert (nz >= 0 && nz < 4);
|
||||
|
||||
v[0] = tp->cV(Tetra::VofF(nz, 0));
|
||||
v[1] = tp->cV(Tetra::VofF(nz, 1));
|
||||
v[2] = tp->cV(Tetra::VofF(nz, 2));
|
||||
v[0] = tp->V(Tetra::VofF(nz, 0));
|
||||
v[1] = tp->V(Tetra::VofF(nz, 1));
|
||||
v[2] = tp->V(Tetra::VofF(nz, 2));
|
||||
|
||||
assert(v[0] != v[1] && v[1] != v[2]); //no degenerate faces
|
||||
|
||||
|
|
Loading…
Reference in New Issue