Commit 46e9e97a authored by Jan Möbius's avatar Jan Möbius

Revert "Silence some VS2017 warnings due to double float conversion"

This reverts commit 3dbdbdde
parent 3dbdbdde
Pipeline #8479 passed with stage
in 54 minutes and 12 seconds
...@@ -161,7 +161,7 @@ PolyMeshT<Kernel>::calc_face_normal_impl(FaceHandle, PointIsNot3DTag) const ...@@ -161,7 +161,7 @@ PolyMeshT<Kernel>::calc_face_normal_impl(FaceHandle, PointIsNot3DTag) const
assert(false); assert(false);
Normal normal; Normal normal;
vectorize(normal,static_cast<typename Normal::value_type>(0.0)); vectorize(normal,0);
return normal; return normal;
} }
...@@ -229,7 +229,7 @@ PolyMeshT<Kernel>::calc_face_normal_impl(const Point&, const Point&, const Point ...@@ -229,7 +229,7 @@ PolyMeshT<Kernel>::calc_face_normal_impl(const Point&, const Point&, const Point
assert(false); assert(false);
Normal normal; Normal normal;
vectorize(normal,static_cast<typename Normal::value_type>(0.0)); vectorize(normal,0);
return normal; return normal;
} }
...@@ -241,7 +241,7 @@ PolyMeshT<Kernel>:: ...@@ -241,7 +241,7 @@ PolyMeshT<Kernel>::
calc_face_centroid(FaceHandle _fh) const calc_face_centroid(FaceHandle _fh) const
{ {
Point _pt; Point _pt;
vectorize(_pt, static_cast<typename Normal::value_type>(0.0)); vectorize(_pt, 0);
Scalar valence = 0.0; Scalar valence = 0.0;
for (ConstFaceVertexIter cfv_it = this->cfv_iter(_fh); cfv_it.is_valid(); ++cfv_it, valence += 1.0) for (ConstFaceVertexIter cfv_it = this->cfv_iter(_fh); cfv_it.is_valid(); ++cfv_it, valence += 1.0)
{ {
...@@ -404,7 +404,7 @@ template <class Kernel> ...@@ -404,7 +404,7 @@ template <class Kernel>
void PolyMeshT<Kernel>:: void PolyMeshT<Kernel>::
calc_vertex_normal_fast(VertexHandle _vh, Normal& _n) const calc_vertex_normal_fast(VertexHandle _vh, Normal& _n) const
{ {
vectorize(_n, static_cast<typename Normal::value_type>(0.0) ); vectorize(_n, 0.0);
for (ConstVertexFaceIter vf_it = this->cvf_iter(_vh); vf_it.is_valid(); ++vf_it) for (ConstVertexFaceIter vf_it = this->cvf_iter(_vh); vf_it.is_valid(); ++vf_it)
_n += this->normal(*vf_it); _n += this->normal(*vf_it);
} }
...@@ -414,7 +414,7 @@ template <class Kernel> ...@@ -414,7 +414,7 @@ template <class Kernel>
void PolyMeshT<Kernel>:: void PolyMeshT<Kernel>::
calc_vertex_normal_correct(VertexHandle _vh, Normal& _n) const calc_vertex_normal_correct(VertexHandle _vh, Normal& _n) const
{ {
vectorize(_n, static_cast<typename Normal::value_type>(0.0) ); vectorize(_n, 0.0);
ConstVertexIHalfedgeIter cvih_it = this->cvih_iter(_vh); ConstVertexIHalfedgeIter cvih_it = this->cvih_iter(_vh);
if (! cvih_it.is_valid() ) if (! cvih_it.is_valid() )
{//don't crash on isolated vertices {//don't crash on isolated vertices
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment