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

Docu and indents

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@726 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-10-01 07:12:25 +00:00
parent d085da3b89
commit 849ee4d293
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenMesh/Tools/Decimater/DecimaterT.cc
View File

@@ -118,7 +118,7 @@ void DecimaterT<Mesh>::heap_vertex(VertexHandle _vh) {
if (collapse_target.is_valid()) { if (collapse_target.is_valid()) {
// std::clog << " added|updated" << std::endl; // std::clog << " added|updated" << std::endl;
mesh_.property(collapse_target_, _vh) = collapse_target; mesh_.property(collapse_target_, _vh) = collapse_target;
mesh_.property(priority_, _vh) = best_prio; mesh_.property(priority_, _vh) = best_prio;
if (heap_->is_stored(_vh)) if (heap_->is_stored(_vh))
heap_->update(_vh); heap_->update(_vh);
@@ -140,6 +140,7 @@ void DecimaterT<Mesh>::heap_vertex(VertexHandle _vh) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
template<class Mesh> template<class Mesh>
size_t DecimaterT<Mesh>::decimate(size_t _n_collapses) { size_t DecimaterT<Mesh>::decimate(size_t _n_collapses) {
if (!this->is_initialized()) if (!this->is_initialized())
return 0; return 0;
@@ -215,6 +216,7 @@ size_t DecimaterT<Mesh>::decimate(size_t _n_collapses) {
heap_.reset(); heap_.reset();
// DON'T do garbage collection here! It's up to the application. // DON'T do garbage collection here! It's up to the application.
return n_collapses; return n_collapses;
} }
@@ -223,6 +225,7 @@ size_t DecimaterT<Mesh>::decimate(size_t _n_collapses) {
template<class Mesh> template<class Mesh>
size_t DecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) { size_t DecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) {
if (!this->is_initialized()) if (!this->is_initialized())
return 0; return 0;

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

@@ -372,7 +372,7 @@ size_t McDecimaterT<Mesh>::decimate_constraints_only(float _factor) {
unsigned int nf = mesh_.n_faces(); unsigned int nf = mesh_.n_faces();
bool lastCollapseIllegal = false; bool lastCollapseIllegal = false;
// number of illegal collapses that occured in a row // number of illegal collapses that occurred in a row
unsigned int illegalCollapses = 0; unsigned int illegalCollapses = 0;
bool collapsesUnchanged = false; bool collapsesUnchanged = false;