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

Clear Patch for OpenMesh.. free all used memory on mesh clear

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@190 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2009-08-10 10:50:34 +00:00
parent 00613d349b
commit 4c8440de8f
5 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/OpenMesh/Core/Mesh/ArrayKernel.cc
View File

@@ -257,14 +257,20 @@ void ArrayKernel::garbage_collection(bool _v, bool _e, bool _f)
void ArrayKernel::clear()
{
vertices_.clear();
edges_.clear();
faces_.clear();
vprops_clear();
eprops_clear();
hprops_clear();
fprops_clear();
vertices_.clear();
VertexContainer().swap( vertices_ );
edges_.clear();
EdgeContainer().swap( edges_ );
faces_.clear();
FaceContainer().swap( faces_ );
vprops_resize(0);
eprops_resize(0);
hprops_resize(0);
fprops_resize(0);
}
void ArrayKernel::resize( uint _n_vertices, uint _n_edges, uint _n_faces )

22
src/OpenMesh/Core/Mesh/BaseKernel.hh
View File

@@ -93,7 +93,12 @@ class BaseKernel
public: //-------------------------------------------- constructor / destructor
BaseKernel() {}
virtual ~BaseKernel() {}
virtual ~BaseKernel() {
vprops_.clear();
eprops_.clear();
hprops_.clear();
fprops_.clear();
}
public: //-------------------------------------------------- add new properties
@@ -504,29 +509,44 @@ protected: //------------------------------------------- synchronize properties
void vprops_reserve(unsigned int _n) const { vprops_.reserve(_n); }
void vprops_resize(unsigned int _n) const { vprops_.resize(_n); }
void vprops_clear() {
vprops_.clear();
}
void vprops_swap(unsigned int _i0, unsigned int _i1) const {
vprops_.swap(_i0, _i1);
}
void hprops_reserve(unsigned int _n) const { hprops_.reserve(_n); }
void hprops_resize(unsigned int _n) const { hprops_.resize(_n); }
void hprops_clear() {
hprops_.clear();
}
void hprops_swap(unsigned int _i0, unsigned int _i1) const {
hprops_.swap(_i0, _i1);
}
void eprops_reserve(unsigned int _n) const { eprops_.reserve(_n); }
void eprops_resize(unsigned int _n) const { eprops_.resize(_n); }
void eprops_clear() {
eprops_.clear();
}
void eprops_swap(unsigned int _i0, unsigned int _i1) const {
eprops_.swap(_i0, _i1);
}
void fprops_reserve(unsigned int _n) const { fprops_.reserve(_n); }
void fprops_resize(unsigned int _n) const { fprops_.resize(_n); }
void fprops_clear() {
fprops_.clear();
}
void fprops_swap(unsigned int _i0, unsigned int _i1) const {
fprops_.swap(_i0, _i1);
}
void mprops_resize(unsigned int _n) const { mprops_.resize(_n); }
void mprops_clear() {
mprops_.clear();
}
public: