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

defined mytype and used on updateheap and init functions to extend tri_edge_collapse

This commit is contained in:
Nico Pietroni 2004-09-02 10:06:18 +00:00
parent 638dfc64fb
commit 3367585465
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vcg/complex/local_optimization/tri_edge_collapse.h
View File

@ -66,11 +66,12 @@ public:
}; };
typedef typename TriMeshType::FaceType FaceType; typedef typename TriMeshType::FaceType FaceType;
typedef typename FaceType::VertexType VertexType; typedef typename FaceType::VertexType VertexType;
typedef typename FaceType::VertexType::CoordType CoordType; typedef typename FaceType::VertexType::CoordType CoordType;
typedef typename TriMeshType::VertexType::ScalarType ScalarType; typedef typename TriMeshType::VertexType::ScalarType ScalarType;
typedef vcg::face::Pos<FaceType> PosType; typedef vcg::face::Pos<FaceType> PosType;
typedef typename LocalOptimization<TriMeshType>::HeapElem HeapElem; typedef typename LocalOptimization<TriMeshType>::HeapElem HeapElem;
typedef typename TriEdgeCollapse<TriMeshType> MyType;
protected: protected:
@ -136,7 +137,7 @@ public:
{ {
PosType p; PosType p;
p.Set(VFi.F(),VFi.I(),VFi.f->V(VFi.z)); p.Set(VFi.F(),VFi.I(),VFi.f->V(VFi.z));
h_ret.push_back(HeapElem(new TriEdgeCollapse<TriMeshType>(p,_Imark()))); h_ret.push_back(HeapElem(new MyType(p,_Imark())));
std::push_heap(h_ret.begin(),h_ret.end()); std::push_heap(h_ret.begin(),h_ret.end());
//// update the mark of the vertices //// update the mark of the vertices
VFi.f->V(VFi.z)->IMark() = _Imark(); VFi.f->V(VFi.z)->IMark() = _Imark();
@ -188,7 +189,7 @@ public:
for (int j=0;j<3;j++) for (int j=0;j<3;j++)
{ {
PosType p=PosType(&*fi,j,(*fi).V(j)); PosType p=PosType(&*fi,j,(*fi).V(j));
h_ret.push_back(HeapElem(new TriEdgeCollapse<TriMeshType>(p,m.IMark()))); h_ret.push_back(HeapElem(new MyType(p,m.IMark())));
//printf("Inserting in heap coll %3i ->%3i %f\n",p.V()-&m.vert[0],p.VFlip()-&m.vert[0],h_ret.back().locModPtr->Priority()); //printf("Inserting in heap coll %3i ->%3i %f\n",p.V()-&m.vert[0],p.VFlip()-&m.vert[0],h_ret.back().locModPtr->Priority());
} }
} }