manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added Finalize() method to the interface, corrected minor bugs on border preserving and postsimplification cleanup 

Avoided double make_heap (it is done only in the local_optimization init)
This commit is contained in:
Paolo Cignoni 2007-01-19 09:13:14 +00:00
parent f991e164a1
commit 9732b0f8b8
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
vcg/complex/local_optimization/tri_edge_collapse_quadric.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.11 2006/10/15 07:31:21 cignoni
typenames and qualifiers for gcc compliance
Revision 1.10 2006/10/09 20:12:55 cignoni Revision 1.10 2006/10/09 20:12:55 cignoni
Heavyly restructured for meshlab inclusion. Now the access to the quadric elements are mediated by a static helper class. Heavyly restructured for meshlab inclusion. Now the access to the quadric elements are mediated by a static helper class.
@ -175,7 +178,9 @@ public:
static bool IsSetHint(Hint hn) { return (Hnt()&hn)!=0; } static bool IsSetHint(Hint hn) { return (Hnt()&hn)!=0; }
// puntatori ai vertici che sono stati messi non-w per preservare il boundary // puntatori ai vertici che sono stati messi non-w per preservare il boundary
static std::vector<typename TriMeshType::VertexPointer> & WV(){static std::vector<typename TriMeshType::VertexPointer> _WV; return _WV;}; static std::vector<typename TriMeshType::VertexPointer> & WV(){
static std::vector<typename TriMeshType::VertexPointer> _WV; return _WV;
};
inline TriEdgeCollapseQuadric(const EdgeType &p, int i) inline TriEdgeCollapseQuadric(const EdgeType &p, int i)
//:TEC(p,i){} //:TEC(p,i){}
@ -203,6 +208,31 @@ public:
--m.vn; --m.vn;
} }
// Final Clean up after the end of the simplification process
static void Finalize(TriMeshType &m,HeapType&h_ret)
{
// if the mesh was prepared with precomputed borderflags
// correctly set them again.
if(IsSetHint(HNHasBorderFlag) )
vcg::tri::UpdateFlags<TriMeshType>::FaceBorderFromVF(m);
// If we had the boundary preservation we should clean up the writable flags
if(Params().FastPreserveBoundary)
{
typename TriMeshType::VertexIterator vi;
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
if(!(*vi).IsD()) (*vi).SetW();
}
if(Params().FastPreserveBoundary)
{
typename std::vector<typename TriMeshType::VertexPointer>::iterator wvi;
for(wvi=WV().begin();wvi!=WV().end();++wvi)
if(!(*wvi)->IsD()) (*wvi)->SetW();
}
}
static void Init(TriMeshType &m,HeapType&h_ret){ static void Init(TriMeshType &m,HeapType&h_ret){
typename TriMeshType::VertexIterator vi; typename TriMeshType::VertexIterator vi;
@ -236,6 +266,7 @@ public:
if(Params().PreserveBoundary) if(Params().PreserveBoundary)
{ {
WV().clear();
for(pf=m.face.begin();pf!=m.face.end();++pf) for(pf=m.face.begin();pf!=m.face.end();++pf)
if( !(*pf).IsD() && (*pf).IsW() ) if( !(*pf).IsD() && (*pf).IsW() )
for(int j=0;j<3;++j) for(int j=0;j<3;++j)
@ -252,7 +283,7 @@ public:
if(IsSymmetric()) if(IsSymmetric())
{ // if the collapse is symmetric (e.g. u->v == v->u) { // if the collapse is symmetric (e.g. u->v == v->u)
for(vi=m.vert.begin();vi!=m.vert.end();++vi) for(vi=m.vert.begin();vi!=m.vert.end();++vi)
if((*vi).IsRW()) if(!(*vi).IsD() && (*vi).IsRW())
{ {
vcg::face::VFIterator<FaceType> x; vcg::face::VFIterator<FaceType> x;
for( x.F() = (*vi).VFp(), x.I() = (*vi).VFi(); x.F()!=0; ++ x){ for( x.F() = (*vi).VFp(), x.I() = (*vi).VFi(); x.F()!=0; ++ x){
@ -291,7 +322,6 @@ public:
} }
} }
} }
make_heap(h_ret.begin(),h_ret.end());
} }
static bool IsSymmetric() {return Params().OptimalPlacement;} static bool IsSymmetric() {return Params().OptimalPlacement;}