diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh index 9dda329b..fb627d1f 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh @@ -145,7 +145,7 @@ MeshViewerWidgetT::open_mesh(const char* _filename, IO::Options _opt) // set center and radius - set_scene_pos( (bbMin+bbMax)*0.5, (bbMin-bbMax).norm()*0.5 ); + set_scene_pos( (bbMin+bbMax)*0.5f, (bbMin-bbMax).norm()*0.5f ); // for normal display normal_scale_ = (bbMax-bbMin).min()*0.05f; diff --git a/src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh b/src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh index 17f4927a..11d885c2 100644 --- a/src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh +++ b/src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh @@ -155,13 +155,13 @@ PolyMeshT::calc_face_normal_impl(FaceHandle, PointIsNot3DTag) const { // Dummy fallback implementation // Returns just an initialized all 0 normal - // This function is only used if we don't hate a matching implementation + // This function is only used if we don't have a matching implementation // for normal computation with the current vector type defined in the mesh traits assert(false); Normal normal; - vectorize(normal,Scalar(0.0)); + vectorize(normal,Scalar(0)); return normal; } @@ -223,13 +223,13 @@ PolyMeshT::calc_face_normal_impl(const Point&, const Point&, const Point // Dummy fallback implementation // Returns just an initialized all 0 normal - // This function is only used if we don't hate a matching implementation + // This function is only used if we don't have a matching implementation // for normal computation with the current vector type defined in the mesh traits assert(false); Normal normal; - vectorize(normal,Scalar(0.0)); + vectorize(normal,Scalar(0)); return normal; } @@ -241,7 +241,7 @@ PolyMeshT:: calc_face_centroid(FaceHandle _fh) const { Point _pt; - vectorize(_pt, Scalar(0.0)); + vectorize(_pt, Scalar(0)); Scalar valence = 0.0; for (ConstFaceVertexIter cfv_it = this->cfv_iter(_fh); cfv_it.is_valid(); ++cfv_it, valence += 1.0) { @@ -404,7 +404,7 @@ template void PolyMeshT:: calc_vertex_normal_fast(VertexHandle _vh, Normal& _n) const { - vectorize(_n,Scalar(0.0)); + vectorize(_n, Scalar(0)); for (ConstVertexFaceIter vf_it = this->cvf_iter(_vh); vf_it.is_valid(); ++vf_it) _n += this->normal(*vf_it); } @@ -414,7 +414,7 @@ template void PolyMeshT:: calc_vertex_normal_correct(VertexHandle _vh, Normal& _n) const { - vectorize(_n, Scalar(0.0)); + vectorize(_n, Scalar(0)); ConstVertexIHalfedgeIter cvih_it = this->cvih_iter(_vh); if (! cvih_it.is_valid() ) {//don't crash on isolated vertices diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh b/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh index bde59f39..7985dc90 100644 --- a/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh @@ -256,7 +256,7 @@ collapse_priority(const CollapseInfo& _ci) // undo simulation changes mesh_.set_point(_ci.v0, _ci.p0); - return ( ok ? Base::LEGAL_COLLAPSE : Base::ILLEGAL_COLLAPSE ); + return ( ok ? static_cast(Base::LEGAL_COLLAPSE) : static_cast(Base::ILLEGAL_COLLAPSE) ); } //----------------------------------------------------------------------------- diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh index 55e5e196..c9518ef0 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh @@ -576,7 +576,7 @@ void CompositeT::FVc(Coeff& _coeff) ++valence; } - c = static_cast(_coeff(valence)); + c = static_cast(_coeff(valence)); for (voh_it = mesh_.voh_iter(*v_it); voh_it.is_valid(); ++voh_it) {