From fd8ed29ed56ccd63ecce5d187a9c4ad49d21f1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 2 Oct 2012 07:54:57 +0000 Subject: [PATCH] Mixed not ready yet. Keep for next release git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@729 fdac6126-5c0c-442c-9429-916003d36597 --- .../Tools/Decimater/MixedDecimaterT.cc | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc b/src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc index e75b5a2c..a3be54bd 100644 --- a/src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc +++ b/src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc @@ -118,29 +118,7 @@ size_t MixedDecimaterT::decimate_to_faces(const size_t _n_vertices,const r_collapses = McDecimaterT::decimate_to_faces(n_vertices_mc, n_faces_mc); } else { - - 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::decimate_constraints_only(decimaterLevel); - } + r_collapses += McDecimaterT::decimate_constraints_only(_mc_factor); } }