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

took out workaround in McDecimater, since the RandomNumberGenerator is fixed now

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@728 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Isaak Lim
2012-10-01 09:24:55 +00:00
parent 4a49deb7ad
commit 19ab724a82
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/OpenMesh/Tools/Decimater/McDecimaterT.cc
View File

@@ -141,11 +141,6 @@ size_t McDecimaterT<Mesh>::decimate(size_t _n_collapses) {
tmpHandle = typename Mesh::HalfedgeHandle( (double(rand()) / double(RAND_MAX) ) * double(mesh_.n_halfedges()-1) ); tmpHandle = typename Mesh::HalfedgeHandle( (double(rand()) / double(RAND_MAX) ) * double(mesh_.n_halfedges()-1) );
#endif #endif
// Only take valid Handles!
if ( tmpHandle.idx() >=mesh_.n_halfedges() ) {
continue;
}
// if it is not deleted, we analyse it // if it is not deleted, we analyse it
if ( ! mesh_.status(tmpHandle).deleted() ) { if ( ! mesh_.status(tmpHandle).deleted() ) {
@@ -268,11 +263,6 @@ size_t McDecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) {
tmpHandle = typename Mesh::HalfedgeHandle( ( double(rand()) / double(RAND_MAX) ) * double(mesh_.n_halfedges() - 1)); tmpHandle = typename Mesh::HalfedgeHandle( ( double(rand()) / double(RAND_MAX) ) * double(mesh_.n_halfedges() - 1));
#endif #endif
// Only take valid Handles!
if ( tmpHandle.idx() >=mesh_.n_halfedges() ) {
continue;
}
// if it is not deleted, we analyse it // if it is not deleted, we analyse it
if (!mesh_.status(tmpHandle).deleted()) { if (!mesh_.status(tmpHandle).deleted()) {
@@ -411,11 +401,6 @@ size_t McDecimaterT<Mesh>::decimate_constraints_only(float _factor) {
tmpHandle = typename Mesh::HalfedgeHandle(int(rand() * randomNormalizer ) ); tmpHandle = typename Mesh::HalfedgeHandle(int(rand() * randomNormalizer ) );
#endif #endif
// Only take valid Handles!
if ( tmpHandle.idx() >=mesh_.n_halfedges() ) {
continue;
}
// if it is not deleted, we analyze it // if it is not deleted, we analyze it
if (!mesh_.status(mesh_.edge_handle(tmpHandle)).deleted()) { if (!mesh_.status(mesh_.edge_handle(tmpHandle)).deleted()) {