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

Fixed warnings

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1301 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2015-06-25 10:45:05 +00:00
parent d5c2ea433a
commit ac23cb90bb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1173,7 +1173,7 @@ void FVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
c = _2over3 * ( cos( _2pi / valence) + 1.0); c = _2over3 * ( cos( _2pi / valence) + 1.0);
#else #else
valence = Base::mesh_.valence(_vh); valence = Base::mesh_.valence(_vh);
c = coeff(valence); c = typename M::Scalar(coeff(valence));
#endif #endif
@@ -1193,7 +1193,7 @@ void FVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
position += MOBJ(Base::mesh_.FH(*voh_it)).position(_target_state - 1) * c; position += MOBJ(Base::mesh_.FH(*voh_it)).position(_target_state - 1) * c;
position += MOBJ(Base::mesh_.FH(Base::mesh_.OHEH(Base::mesh_.NHEH(*voh_it)))).position(_target_state - 1) * (1.0 - c); position += MOBJ(Base::mesh_.FH(Base::mesh_.OHEH(Base::mesh_.NHEH(*voh_it)))).position(_target_state - 1) * ( typename M::Scalar(1.0) - c);
} }
else { else {

4
src/Unittests/unittests_smoother.cc
View File

@@ -71,10 +71,10 @@ TEST_F(OpenMeshSmoother_Triangle, Smoother_Poly_Laplace) {
OpenMesh::Smoother::JacobiLaplaceSmootherT<Mesh> smoother(mesh_); OpenMesh::Smoother::JacobiLaplaceSmootherT<Mesh> smoother(mesh_);
// Just call function to instanciate template // Just call function to instanciate template
smoother.set_absolute_local_error(0.5); smoother.set_absolute_local_error(0.5f);
// Set an error // Set an error
smoother.set_relative_local_error(0.1); smoother.set_relative_local_error(0.1f);
// Run algorithm with 5 steps // Run algorithm with 5 steps
smoother.smooth(5); smoother.smooth(5);