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

Mixed not ready yet. Keep for next release

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@729 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-10-02 07:54:57 +00:00
parent 19ab724a82
commit fd8ed29ed5
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc
View File

@@ -118,29 +118,7 @@ size_t MixedDecimaterT<Mesh>::decimate_to_faces(const size_t _n_vertices,const
r_collapses = McDecimaterT<Mesh>::decimate_to_faces(n_vertices_mc, n_faces_mc); r_collapses = McDecimaterT<Mesh>::decimate_to_faces(n_vertices_mc, n_faces_mc);
} else { } else {
r_collapses += McDecimaterT<Mesh>::decimate_constraints_only(_mc_factor);
const int samples = this->samples();
// MinimalSample count for the McDecimater
const int min = 2;
// Maximal number of samples for the McDecimater
const int max = samples;
// Number of incremental steps
const int steps = 7;
for ( int i = 0; i < steps; ++i ) {
// Compute number of samples to be used
int samples = 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
double decimaterLevel = (double(i + 1)) * _mc_factor / (double(steps) );
this->set_samples(samples);
r_collapses = McDecimaterT<Mesh>::decimate_constraints_only(decimaterLevel);
}
} }
} }