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

added initialization of mark component to zero. So all the element it is sure that are unitialized after the first unmarkall.

This commit is contained in:
Paolo Cignoni 2012-12-21 15:33:18 +00:00
parent 8476a1ff20
commit b48b0e568c
5 changed files with 15 additions and 12 deletions

19
vcg/simplex/edge/component.h
View File

@ -162,16 +162,17 @@ template <class T> class EVAdj : public VertexRef<T>{};
*/ */
template <class T> class Mark: public T { template <class T> class Mark: public T {
public: public:
static bool HasMark() { return true; } Mark():_imark(0){}
static bool HasMarkOcc() { return true; } static bool HasMark() { return true; }
inline void InitIMark() { _imark = 0; } static bool HasMarkOcc() { return true; }
inline int & IMark() { return _imark;} inline void InitIMark() { _imark = 0; }
inline const int & IMark() const {return _imark;} inline int & IMark() { return _imark;}
template < class LeftV> inline const int & IMark() const {return _imark;}
void ImportData(const LeftV & left ) { IMark() = left.IMark(); T::ImportData( left); } template < class LeftV>
static void Name(std::vector<std::string> & name){name.push_back(std::string("Mark"));T::Name(name);} void ImportData(const LeftV & left ) { IMark() = left.IMark(); T::ImportData( left); }
static void Name(std::vector<std::string> & name){name.push_back(std::string("Mark"));T::Name(name);}
private: private:
int _imark; int _imark;
}; };

1
vcg/simplex/face/component.h
View File

@ -457,6 +457,7 @@ public: static void Name(std::vector<std::string> & name){name.push_back(std::s
template <class T> class Mark: public T { template <class T> class Mark: public T {
public: public:
Mark():_imark(0){}
inline int &IMark() { return _imark;} inline int &IMark() { return _imark;}
inline int cIMark() const { return _imark;} inline int cIMark() const { return _imark;}
inline void InitIMark() { _imark = 0; } inline void InitIMark() { _imark = 0; }

2
vcg/simplex/face/component_ocf.h
View File

@ -263,7 +263,7 @@ bool IsMarkEnabled() const {return MarkEnabled;}
void EnableMark() { void EnableMark() {
assert(VALUE_TYPE::HasMarkOcf()); assert(VALUE_TYPE::HasMarkOcf());
MarkEnabled=true; MarkEnabled=true;
MV.resize((*this).size()); MV.resize((*this).size(),0);
} }
void DisableMark() { void DisableMark() {

1
vcg/simplex/vertex/component.h
View File

@ -218,6 +218,7 @@ public: static void Name(std::vector<std::string> & name){name.push_back(std::st
template <class T> class Mark: public T { template <class T> class Mark: public T {
public: public:
Mark():_imark(0){}
inline const int &IMark() const { return _imark;} inline const int &IMark() const { return _imark;}
inline int &IMark() { return _imark;} inline int &IMark() { return _imark;}
inline int cIMark() const { return _imark;} inline int cIMark() const { return _imark;}

4
vcg/simplex/vertex/component_ocf.h
View File

@ -148,7 +148,7 @@ bool IsMarkEnabled() const {return MarkEnabled;}
void EnableMark() { void EnableMark() {
assert(VALUE_TYPE::HasMarkOcf()); assert(VALUE_TYPE::HasMarkOcf());
MarkEnabled=true; MarkEnabled=true;
MV.resize((*this).size()); MV.resize((*this).size(),0);
} }
void DisableMark() { void DisableMark() {
assert(VALUE_TYPE::HasMarkOcf()); assert(VALUE_TYPE::HasMarkOcf());
@ -355,7 +355,7 @@ public:
template <class RightVertexType> template <class RightVertexType>
void ImportData(const RightVertexType & rightV) void ImportData(const RightVertexType & rightV)
{ {
if((*this).IsQualityEnabled && rightV.IsQualityEnabled() ) // copy the data only if they are enabled in both vertices if((*this).IsQualityEnabled() && rightV.IsQualityEnabled() ) // copy the data only if they are enabled in both vertices
Q() = rightV.cQ(); Q() = rightV.cQ();
T::ImportData(rightV); T::ImportData(rightV);
} }