Fixed more warnings
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@878 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
@@ -136,7 +136,7 @@ size_t MixedDecimaterT<Mesh>::decimate_to_faces(const size_t _n_vertices,const
|
|||||||
size_t samples = int (double( min) + double(i)/(double(steps)-1.0) * (max-2) ) ;
|
size_t samples = int (double( min) + double(i)/(double(steps)-1.0) * (max-2) ) ;
|
||||||
|
|
||||||
// We won't allow 1 here, as this is the last step in the incremental part
|
// We won't allow 1 here, as this is the last step in the incremental part
|
||||||
float decimaterLevel = (double(i + 1)) * _mc_factor / (double(steps) );
|
float decimaterLevel = (float(i + 1)) * _mc_factor / (float(steps) );
|
||||||
|
|
||||||
this->set_samples(samples);
|
this->set_samples(samples);
|
||||||
r_collapses += McDecimaterT<Mesh>::decimate_constraints_only(decimaterLevel);
|
r_collapses += McDecimaterT<Mesh>::decimate_constraints_only(decimaterLevel);
|
||||||
|
|||||||
@@ -380,7 +380,7 @@ CatmullClarkT<MeshType,RealType>::update_vertex( MeshType& _m, const VertexHandl
|
|||||||
|
|
||||||
Q /= valence*valence;//neigboring_faces;
|
Q /= valence*valence;//neigboring_faces;
|
||||||
|
|
||||||
pos += _m.point(_vh) * (valence-2.0)/valence + Q;
|
pos += _m.point(_vh) * (valence - RealType(2.0) )/valence + Q;
|
||||||
// pos = vector_cast<Vec>(_m.point(_vh));
|
// pos = vector_cast<Vec>(_m.point(_vh));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -286,7 +286,7 @@ private:
|
|||||||
{
|
{
|
||||||
assert(_idx < size());
|
assert(_idx < size());
|
||||||
Base::operator[](_idx) = _h;
|
Base::operator[](_idx) = _h;
|
||||||
interface_.set_heap_position(_h, _idx);
|
interface_.set_heap_position(_h, int(_idx));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user