Fixed some warnings

This commit is contained in:
Jan Möbius
2016-10-24 14:01:06 +02:00
parent 0132a367b2
commit b7aabbd912
6 changed files with 19 additions and 19 deletions

View File

@@ -863,7 +863,7 @@ void VF<M>::raise(typename M::FaceHandle& _fh, state_t _target_state)
if (Base::number() == Base::subdiv_rule()->number() + 1 &&
Base::mesh_.is_boundary(_fh) &&
!MOBJ(_fh).final())
position *= 0.5;
position *= static_cast<typename M::Scalar>(0.5);
MOBJ(_fh).set_position(_target_state, position);
MOBJ(_fh).inc_state();

View File

@@ -309,7 +309,7 @@ CatmullClarkT<MeshType,RealType>::compute_midpoint( MeshType& _m, const EdgeHand
// this yields the [1/2 1/2] mask
if (_m.is_boundary(_eh) || !_update_points)
{
pos *= 0.5;
pos *= static_cast<RealType>(0.5);
}
// else if (_m.status(_eh).selected() )
// {
@@ -321,7 +321,7 @@ CatmullClarkT<MeshType,RealType>::compute_midpoint( MeshType& _m, const EdgeHand
{
pos += _m.property(fp_pos_, _m.face_handle(heh));
pos += _m.property(fp_pos_, _m.face_handle(opp_heh));
pos *= 0.25;
pos *= static_cast<RealType>(0.25);
}
_m.property( ep_pos_, _eh ) = pos;
}