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

added template parameter reference to himself type (used for extend it)

This commit is contained in:
Nico Pietroni 2004-09-07 15:40:04 +00:00
parent 8c18db4e51
commit 9d9191918b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ namespace tri{
/// Note that it has knowledge of the heap of the class LocalOptimization because /// Note that it has knowledge of the heap of the class LocalOptimization because
/// it is responsible of updating it after a collapse has been performed /// it is responsible of updating it after a collapse has been performed
template<class TriMeshType> template<class TriMeshType,class MYTYPE>
class TriEdgeCollapse: public LocalOptimization<TriMeshType>::LocModType , public EdgeCollapse<TriMeshType> class TriEdgeCollapse: public LocalOptimization<TriMeshType>::LocModType , public EdgeCollapse<TriMeshType>
{ {
public: public:
@ -71,7 +71,6 @@ public:
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:
@ -121,7 +120,7 @@ public:
void Execute(TriMeshType &m) void Execute(TriMeshType &m)
{ {
CoordType MidPoint=(pos.V()->P()+pos.VFlip()->P())/2.0; CoordType MidPoint=(pos.V()->P()+pos.VFlip()->P())/2.0;
int FaceDel=DoCollapse(pos, MidPoint); int FaceDel=DoCollapse(pos, MidPoint);
m.fn-=FaceDel; m.fn-=FaceDel;
--m.vn; --m.vn;
} }
@ -137,7 +136,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 MyType(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();
@ -189,7 +188,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 MyType(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());
} }
} }