- more this ptr
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@651 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
@@ -199,8 +199,8 @@ size_t McDecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) {
|
|||||||
CollapseInfo ci(mesh_, tmpHandle);
|
CollapseInfo ci(mesh_, tmpHandle);
|
||||||
|
|
||||||
// Check if legal we analyze the priority of this collapse operation
|
// Check if legal we analyze the priority of this collapse operation
|
||||||
if (is_collapse_legal(ci)) {
|
if (this->is_collapse_legal(ci)) {
|
||||||
double energy = collapse_priority(ci);
|
double energy = this->collapse_priority(ci);
|
||||||
|
|
||||||
// Check if the current samples energy is better than any energy before
|
// Check if the current samples energy is better than any energy before
|
||||||
if ( energy < bestEnergy ) {
|
if ( energy < bestEnergy ) {
|
||||||
@@ -221,7 +221,7 @@ size_t McDecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) {
|
|||||||
CollapseInfo ci(mesh_, bestHandle);
|
CollapseInfo ci(mesh_, bestHandle);
|
||||||
|
|
||||||
// check topological correctness AGAIN !
|
// check topological correctness AGAIN !
|
||||||
if (!is_collapse_legal(ci))
|
if (!this->is_collapse_legal(ci))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// adjust complexity in advance (need boundary status)
|
// adjust complexity in advance (need boundary status)
|
||||||
@@ -238,7 +238,7 @@ size_t McDecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) {
|
|||||||
nf -= 2;
|
nf -= 2;
|
||||||
|
|
||||||
// pre-processing
|
// pre-processing
|
||||||
preprocess_collapse(ci);
|
this->preprocess_collapse(ci);
|
||||||
|
|
||||||
// perform collapse
|
// perform collapse
|
||||||
mesh_.collapse(bestHandle);
|
mesh_.collapse(bestHandle);
|
||||||
@@ -251,7 +251,7 @@ size_t McDecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) {
|
|||||||
mesh_.set_normal(vf_it, mesh_.calc_face_normal(vf_it.handle()));
|
mesh_.set_normal(vf_it, mesh_.calc_face_normal(vf_it.handle()));
|
||||||
|
|
||||||
// post-process collapse
|
// post-process collapse
|
||||||
postprocess_collapse(ci);
|
this->postprocess_collapse(ci);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user