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

Merge branch 'warn3' into 'master'

Browse Source 
Warn3

See merge request !102
This commit is contained in:
Jan Möbius
2016-10-28 15:01:14 +02:00
parent 4fefc30f8c 066272a58e
commit bb75d7029f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
View File

@@ -223,7 +223,7 @@ Tvv3<M>::raise(typename M::FaceHandle& _fh, state_t _target_state)
vh3(Base::mesh_.FVH(hh2)); vh3(Base::mesh_.FVH(hh2));
// set display position and attributes for new vertices // set display position and attributes for new vertices
Base::mesh_.set_point(vh1, (Base::mesh_.point(vh0) * 2.0 + Base::mesh_.point(vh3)) / 3.0); Base::mesh_.set_point(vh1, (Base::mesh_.point(vh0) * static_cast<typename M::Point::value_type>(2.0) + Base::mesh_.point(vh3)) / static_cast<typename M::Point::value_type>(3.0) );
MOBJ(vh1).set_position(_target_state, zero_point); MOBJ(vh1).set_position(_target_state, zero_point);
MOBJ(vh1).set_state(_target_state); MOBJ(vh1).set_state(_target_state);
@@ -1375,7 +1375,7 @@ void VVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
// choose coefficient c // choose coefficient c
c = Base::coeff(); c = Base::coeff();
position *= (1.0 - c); position *= (static_cast<typename M::Scalar>(1.0) - c);
position += MOBJ(_vh).position(_target_state - 1) * c; position += MOBJ(_vh).position(_target_state - 1) * c;
MOBJ(_vh).set_position(_target_state, position); MOBJ(_vh).set_position(_target_state, position);
@@ -1712,10 +1712,10 @@ void EVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
typename M::Point position(0.0, 0.0, 0.0); typename M::Point position(0.0, 0.0, 0.0);
typename M::Scalar c; typename M::Scalar c;
typename M::Point zero_point(0.0, 0.0, 0.0); typename M::Point zero_point(0.0, 0.0, 0.0);
int valence(0); size_t valence(0);
valence = Base::mesh_.valence(_vh); valence = Base::mesh_.valence(_vh);
c = coeff( valence ); c = static_cast<typename M::Scalar>(coeff( valence ));
for (voh_it = Base::mesh_.voh_iter(_vh); voh_it.is_valid(); ++voh_it) for (voh_it = Base::mesh_.voh_iter(_vh); voh_it.is_valid(); ++voh_it)
{ {
@@ -1734,7 +1734,7 @@ void EVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
} }
} }
else { else {
--valence; --valence;
} }
} }

2
src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh
View File

@@ -233,7 +233,7 @@ private:
return weight_t( static_cast<real_t>(1.0-alpha), static_cast<real_t>(inv_v*alpha) ); return weight_t( static_cast<real_t>(1.0-alpha), static_cast<real_t>(inv_v*alpha) );
} }
return weight_t(0.0, 0.0); return weight_t(static_cast<real_t>(0.0), static_cast<real_t>(0.0));
} }
int valence; int valence;
}; };