Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed various warnings

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1208 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2015-01-16 15:24:36 +00:00
parent 38aa39240a
commit a1617b1b98
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenMesh/Tools/Decimater/ModAspectRatioT.cc
View File

@@ -102,7 +102,7 @@ void ModAspectRatioT<MeshT>::initialize() {
typename Mesh::Point& p1 = mesh_.point(*(++fv_it));
typename Mesh::Point& p2 = mesh_.point(*(++fv_it));
mesh_.property(aspect_, *f_it) = 1.0 / aspectRatio(p0, p1, p2);
mesh_.property(aspect_, *f_it) = static_cast<typename Mesh::Scalar>(1.0) / aspectRatio(p0, p1, p2);
}
}
@@ -121,7 +121,7 @@ void ModAspectRatioT<MeshT>::preprocess_collapse(const CollapseInfo& _ci) {
typename Mesh::Point& p1 = mesh_.point(*(++fv_it));
typename Mesh::Point& p2 = mesh_.point(*(++fv_it));
mesh_.property(aspect_, fh) = 1.0 / aspectRatio(p0, p1, p2);
mesh_.property(aspect_, fh) = static_cast<typename Mesh::Scalar>(1.0) / aspectRatio(p0, p1, p2);
}
}
}
@@ -157,7 +157,7 @@ float ModAspectRatioT<MeshT>::collapse_priority(const CollapseInfo& _ci) {
// aspect after
if (!(v2 == _ci.v1 || v3 == _ci.v1))
if ((r1 = 1.0 / aspectRatio(*p1, *p2, *p3)) < r1_min)
if ((r1 = static_cast<typename Mesh::Scalar>(1.0) / aspectRatio(*p1, *p2, *p3)) < r1_min)
r1_min = r1;
}
}

4
src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh
View File

@@ -134,7 +134,7 @@ public:
/// Set normal deviation ( 0 .. 360 )
void set_normal_deviation(Scalar _s) {
normal_deviation_ = _s / 180.0 * M_PI;
normal_deviation_ = _s / static_cast<Scalar>(180.0) * static_cast<Scalar>(M_PI);
}
@@ -207,7 +207,7 @@ public:
// the smaller the factor, the smaller normal_deviation_ gets
// thus creating a stricter constraint
// division by error_tolerance_factor_ is for normalization
Scalar normal_deviation = (normal_deviation_ * 180.0/M_PI) * _factor / this->error_tolerance_factor_;
Scalar normal_deviation = (normal_deviation_ * static_cast<Scalar>(180.0)/static_cast<Scalar>(M_PI) ) * _factor / this->error_tolerance_factor_;
set_normal_deviation(normal_deviation);
this->error_tolerance_factor_ = _factor;
}