diff --git a/vcg/simplex/faceplus/component.h b/vcg/simplex/faceplus/component.h index ba04bbde..f738f0db 100644 --- a/vcg/simplex/faceplus/component.h +++ b/vcg/simplex/faceplus/component.h @@ -24,6 +24,10 @@ History $Log: not supported by cvs2svn $ +Revision 1.3 2005/11/16 22:58:17 cignoni +Added IncrementalMark and WedgeTexCoord +Standardized name of flags. It is plural becouse each simplex has many flag. + Revision 1.2 2005/11/12 18:43:14 cignoni added missing cFFi @@ -114,7 +118,7 @@ public: //typedef vcg::Point3s NormalType; typedef typename T::VertexType::NormalType NormalType; NormalType &N() { static NormalType dummy_normal(0, 0, 0); return dummy_normal; } - const NormalType cN() const { static NormalType dummy_normal(0, 0, 0); return dummy_normal; } + const NormalType &cN() const { static NormalType dummy_normal(0, 0, 0); return dummy_normal; } NormalType &WN(int) { static NormalType dummy_normal(0, 0, 0); return dummy_normal; } const NormalType cWN(int) const { static NormalType dummy_normal(0, 0, 0); return dummy_normal; } @@ -130,7 +134,7 @@ template class NormalFromVert: public T { public: typedef typename T::VertexType::NormalType NormalType; NormalType &N() { return _norm; } - NormalType cN() const { return _norm; } + NormalType &cN() const { return _norm; } static bool HasFaceNormal() { return true; } void ComputeNormal() { _norm = vcg::Normal(*(static_cast(this))); } void ComputeNormalizedNormal() { _norm = vcg::NormalizedNormal(*this);} diff --git a/vcg/simplex/vertexplus/component.h b/vcg/simplex/vertexplus/component.h index bac9aa3b..1dd6444b 100644 --- a/vcg/simplex/vertexplus/component.h +++ b/vcg/simplex/vertexplus/component.h @@ -24,6 +24,10 @@ History $Log: not supported by cvs2svn $ +Revision 1.14 2005/11/16 23:02:37 cignoni +Added some missing members to EmptyMark +Standardized name of flags. It is plural becouse each simplex has many flag. + Revision 1.13 2005/11/14 23:50:57 cignoni Added Incremental Mark @@ -124,7 +128,7 @@ template class Normal: public T { public: typedef A NormalType; NormalType &N() { return _norm; } - const NormalType cN() const { return _norm; } + const NormalType &cN() const { return _norm; } static bool HasNormal() { return true; } private: NormalType _norm;