diff --git a/vcg/simplex/vertexplus/component.h b/vcg/simplex/vertexplus/component.h index 63ec3953..e0ed01df 100644 --- a/vcg/simplex/vertexplus/component.h +++ b/vcg/simplex/vertexplus/component.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.3 2004/03/31 12:28:37 ganovelli +*** empty log message *** + Revision 1.2 2004/03/29 14:26:38 cignoni Error in color @@ -35,9 +38,6 @@ First working version! #ifndef __VCG_VERTEX_PLUS_COMPONENT #define __VCG_VERTEX_PLUS_COMPONENT -#include - - namespace vcg { namespace vert { /* @@ -68,17 +68,6 @@ private: template class Coord3f: public Coord {}; template class Coord3d: public Coord {}; -template class CoordOpt: public T { -public: - typedef A CoordType; - typedef typename CoordType::ScalarType ScalarType; - CoordType &P() { return CAT< TVector,CoordType>::Get((VertType*)this); } - CoordType &UberP() { return CAT< TVector,CoordType>::Get((VertType*)this); } -}; -template class Coord3fOpt: public CoordOpt {}; -template class Coord3dOpt: public CoordOpt {}; - - /*-------------------------- NORMAL ----------------------------------------*/ template class EmptyNormal: public T { @@ -190,13 +179,12 @@ public: template class VFAdj: public T { public: - //typedef A ColorType; - typename T::FacePointer &Fp() {return fp; } - typename T::FacePointer &Zp() {return Zp; } + typename T::FacePointer &Fp() {return _fp; } + int &Zp() {return _zp; } static bool HasVFAdjacency() { return true; } private: - typename T::FacePointer fp ; - int zp ; + typename T::FacePointer _fp ; + int _zp ; }; } // end namespace vert diff --git a/vcg/simplex/vertexplus/component_opt.h b/vcg/simplex/vertexplus/component_opt.h index 9951220b..64c76638 100644 --- a/vcg/simplex/vertexplus/component_opt.h +++ b/vcg/simplex/vertexplus/component_opt.h @@ -24,10 +24,13 @@ History $Log: not supported by cvs2svn $ +Revision 1.1 2004/03/31 12:46:53 cignoni +First working version! + ****************************************************************************/ -#ifndef __VCG_VERTEX_PLUS_COMPONENT -#define __VCG_VERTEX_PLUS_COMPONENT +#ifndef __VCG_VERTEX_PLUS_COMPONENT_OPT +#define __VCG_VERTEX_PLUS_COMPONENT_OPT #include #include