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

compacted the EmptyMark componenet into the EmptyColorMarkQuality component, to shorten the derivation.

This commit is contained in:
Paolo Cignoni 2008-10-14 06:41:46 +00:00
parent 94178d7128
commit f15dcf5536
2 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vcg/simplex/faceplus/base.h
View File

@ -131,12 +131,11 @@ template <class BVT, class BET=DumClass, class BFT=DumClass, class BTT=DumClass>
class FaceBase: public face::EmptyPolyInfo<
face::EmptyVertexRef<
face::EmptyAdj<
face::EmptyColorQuality<
face::EmptyColorMarkQuality<
face::EmptyNormal<
face::EmptyBitFlags<
face::EmptyMark<
face::EmptyWedgeTexCoord<
FaceTypeHolder <BVT, BET, BFT, BTT> > > > > > > > > {
FaceTypeHolder <BVT, BET, BFT, BTT> > > > > > > > {
};
@ -158,8 +157,8 @@ template <class BVT, class BET, typename BFT,class BTT,
template <typename> class C, template <typename> class D,
template <typename> class E, template <typename> class F,
template <typename> class G, template <typename> class H,
template <typename> class I >
class FaceArityMax: public I<Arity8<FaceBase,BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H> > {
template <typename> class I, template <typename> class J >
class FaceArityMax: public I<Arity9<FaceBase,BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H, J> > {
// ----- Flags stuff -----
public:
@ -344,16 +343,16 @@ template <class BVT, class BET, class BFT, class BTT,
template <typename> class C = FaceDefaultDeriver, template <typename> class D = FaceDefaultDeriver,
template <typename> class E = FaceDefaultDeriver, template <typename> class F = FaceDefaultDeriver,
template <typename> class G = FaceDefaultDeriver, template <typename> class H = FaceDefaultDeriver,
template <typename> class I = FaceDefaultDeriver >
class FaceSimp3: public FaceArityMax<BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H, I> {};
template <typename> class I = FaceDefaultDeriver, template <typename> class J = FaceDefaultDeriver >
class FaceSimp3: public FaceArityMax<BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H, I, J> {};
class DumTT;
template <class BVT, class BET, class BFT,
template <typename> class A = FaceDefaultDeriver, template <typename> class B = FaceDefaultDeriver,
template <typename> class C = FaceDefaultDeriver, template <typename> class D = FaceDefaultDeriver,
template <typename> class E = FaceDefaultDeriver, template <typename> class F = FaceDefaultDeriver,
template <typename> class G = FaceDefaultDeriver, template <typename> class H = FaceDefaultDeriver,
template <typename> class I = FaceDefaultDeriver >
class FaceSimp2: public FaceArityMax<BVT,BET,BFT,DumTT, A, B, C, D, E, F, G, H, I> {};
template <typename> class I = FaceDefaultDeriver, template <typename> class J = FaceDefaultDeriver >
class FaceSimp2: public FaceArityMax<BVT,BET,BFT,DumTT, A, B, C, D, E, F, G, H, I, J> {};
}// end namespace

35
vcg/simplex/faceplus/component.h
View File

@ -359,17 +359,26 @@ private:
/*-------------------------- COLOR ----------------------------------*/
template <class T> class EmptyColorQuality: public T {
template <class T> class EmptyColorMarkQuality: public T {
public:
typedef float QualityType;
typedef int MarkType;
inline void InitIMark() { }
inline int & IMark() { assert(0); static int tmp=-1; return tmp;}
inline const int IMark() const {return 0;}
typedef float QualityType;
typedef vcg::Color4b ColorType;
ColorType &C() { static ColorType dumcolor(vcg::Color4b::White); assert(0); return dumcolor; }
ColorType &WC(const int) { static ColorType dumcolor(vcg::Color4b::White); assert(0); return dumcolor; }
QualityType &Q() { static QualityType dummyQuality(0); assert(0); return dummyQuality; }
static bool HasFaceColor() { return false; }
static bool HasFaceColor() { return false; }
static bool HasWedgeColor() { return false; }
static bool HasFaceQuality() { return false; }
static bool HasFaceColorOcc() { return false;}
static bool HasMark() { return false; }
static bool HasMarkOcc() { return false; }
static void Name(std::vector<std::string> & name){T::Name(name);}
template <class LeftF>
void ImportLocal(const LeftF & leftF){ T::ImportLocal(leftF);}
@ -415,11 +424,6 @@ template <class T> class Color4b: public Color<vcg::Color4b, T> {
/*-------------------------- Quality ----------------------------------*/
template <class T> class EmptyQuality: public T {
public:
static void Name(std::vector<std::string> & name){T::Name(name);}
};
template <class A, class T> class Quality: public T {
public:
typedef A QualityType;
@ -447,21 +451,6 @@ public: static void Name(std::vector<std::string> & name){name.push_back(std::s
};
/*-------------------------- INCREMENTAL MARK ----------------------------------------*/
template <class T> class EmptyMark: public T {
public:
typedef int MarkType;
static bool HasMark() { return false; }
static bool HasMarkOcc() { return false; }
inline void InitIMark() { }
inline int & IMark() { assert(0); static int tmp=-1; return tmp;}
inline const int IMark() const {return 0;}
template <class LeftF>
void ImportLocal(const LeftF & leftF){T::ImportLocal(leftF);}
inline void Alloc(const int & ns){T::Alloc(ns);}
inline void Dealloc(){T::Dealloc();}
static void Name(std::vector<std::string> & name){T::Name(name);}
};
template <class T> class Mark: public T {
public:
static bool HasMark() { return true; }