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

Changed HasColor -> HasFaceColor and HasNormal ->HasFaceNormal

This commit is contained in:
Paolo Cignoni 2005-11-21 21:46:20 +00:00
parent 0d97fa92f5
commit 019fb69c53
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vcg/simplex/faceplus/component_ocf.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2005/11/16 22:43:36 cignoni
Added WedgeTexture component
Revision 1.2 2005/10/22 13:16:46 cignoni Revision 1.2 2005/10/22 13:16:46 cignoni
Added a missing ';' in FFAdjOcf (thanks to Mario Latronico). Added a missing ';' in FFAdjOcf (thanks to Mario Latronico).
@ -116,25 +119,25 @@ public:
// Enabling Eunctions // Enabling Eunctions
void EnableColor() { void EnableColor() {
assert(VALUE_TYPE::HasColorOcf()); assert(VALUE_TYPE::HasFaceColorOcf());
ColorEnabled=true; ColorEnabled=true;
CV.resize(size()); CV.resize(size());
} }
void DisableColor() { void DisableColor() {
assert(VALUE_TYPE::HasColorOcf()); assert(VALUE_TYPE::HasFaceColorOcf());
ColorEnabled=false; ColorEnabled=false;
CV.clear(); CV.clear();
} }
void EnableNormal() { void EnableNormal() {
assert(VALUE_TYPE::HasNormalOcf()); assert(VALUE_TYPE::HasFaceNormalOcf());
NormalEnabled=true; NormalEnabled=true;
NV.resize(size()); NV.resize(size());
} }
void DisableNormal() { void DisableNormal() {
assert(VALUE_TYPE::HasNormalOcf()); assert(VALUE_TYPE::HasFaceNormalOcf());
NormalEnabled=false; NormalEnabled=false;
NV.clear(); NV.clear();
} }
@ -255,13 +258,19 @@ private:
template <class A, class T> class NormalOcf: public T { template <class A, class T> class NormalOcf: public T {
public: public:
typedef A NormalType; typedef A NormalType;
static bool HasNormal() { return true; } static bool HasFaceNormal() { return true; }
static bool HasNormalOcf() { return true; } static bool HasFaceNormalOcf() { return true; }
NormalType &N() { NormalType &N() {
// you cannot use Normals before enabling them with: yourmesh.face.EnableNormal() // you cannot use Normals before enabling them with: yourmesh.face.EnableNormal()
assert(Base().NormalEnabled); assert(Base().NormalEnabled);
return Base().NV[Index()]; } return Base().NV[Index()]; }
const NormalType &cN() const {
// you cannot use Normals before enabling them with: yourmesh.face.EnableNormal()
assert(Base().NormalEnabled);
return Base().NV[Index()]; }
}; };
template <class T> class Normal3sOcf: public NormalOcf<vcg::Point3s, T> {}; template <class T> class Normal3sOcf: public NormalOcf<vcg::Point3s, T> {};
@ -274,8 +283,8 @@ template <class A, class T> class ColorOcf: public T {
public: public:
typedef A ColorType; typedef A ColorType;
ColorType &C() { assert(Base().NormalEnabled); return Base().CV[Index()]; } ColorType &C() { assert(Base().NormalEnabled); return Base().CV[Index()]; }
static bool HasColor() { return true; } static bool HasFaceColor() { return true; }
static bool HasColorOcf() { return true; } static bool HasFaceColorOcf() { return true; }
}; };
template <class T> class Color4bOcf: public ColorOcf<vcg::Color4b, T> {}; template <class T> class Color4bOcf: public ColorOcf<vcg::Color4b, T> {};