diff --git a/vcg/complex/allocate.h b/vcg/complex/allocate.h index 9753c820..2b573641 100644 --- a/vcg/complex/allocate.h +++ b/vcg/complex/allocate.h @@ -780,10 +780,10 @@ public: assert(v2 >= &m.vert.front() && v2 <= &m.vert.back()); assert(v3 >= &m.vert.front() && v3 <= &m.vert.back()); - AddFace(m, v0, v1, v2); - AddFace(m, v0, v3, v1); - AddFace(m, v0, v2, v3); - AddFace(m, v1, v3, v2); +// AddFace(m, v0, v1, v2); +// AddFace(m, v0, v3, v1); +// AddFace(m, v0, v2, v3); +// AddFace(m, v1, v3, v2); PointerUpdater pu; TetraIterator ti = AddTetras(m, 1, pu); diff --git a/vcg/complex/foreach.h b/vcg/complex/foreach.h index ae36cabd..156d3489 100644 --- a/vcg/complex/foreach.h +++ b/vcg/complex/foreach.h @@ -171,7 +171,7 @@ inline void ForEachTetra(const MeshType &m, std::function & name){name.push_back(std::st template class WedgeColor4f: public WedgeColor { public: static void Name(std::vector & name){name.push_back(std::string("WedgeColor4f"));T::Name(name);} }; -template class Color4b: public Color { public: +template class Color4b: public Color { public: static void Name(std::vector & name){name.push_back(std::string("Color4b"));T::Name(name);} }; diff --git a/vcg/simplex/tetrahedron/component.h b/vcg/simplex/tetrahedron/component.h index cf93d437..dbe042d3 100644 --- a/vcg/simplex/tetrahedron/component.h +++ b/vcg/simplex/tetrahedron/component.h @@ -176,15 +176,13 @@ public: typedef typename T::VertexType::ScalarType ScalarType; inline typename T::VertexType * & V( const int j ) { assert(j>=0 && j<4); return v[j]; } - inline typename T::VertexType * const & V( const int j ) const { assert(j>=0 && j<4); return v[j]; } inline typename T::VertexType * const cV( const int j ) const { assert(j>=0 && j<4); return v[j]; } inline typename size_t const cFtoVi (const int f, const int j) const { assert(f >= 0 && f < 4); assert(j >= 0 && j < 3); return findices[f][j]; } // Shortcut for tetra points - inline typename CoordType & P( const int j ) { assert(j>=0 && j<4); return v[j]->P(); } - inline const typename CoordType & P( const int j ) const { assert(j>=0 && j<4); return v[j]->cP(); } - inline const typename CoordType &cP( const int j ) const { assert(j>=0 && j<4); return v[j]->cP(); } + inline typename CoordType & P( const int j ) { assert(j>=0 && j<4); return v[j]->P(); } + inline const typename CoordType &cP( const int j ) const { assert(j>=0 && j<4); return v[j]->P(); } /** Return the pointer to the ((j+1)%4)-th vertex of the tetra. @param j Index of the face vertex. @@ -360,7 +358,8 @@ public: static void Name(std::vector & name){name.push_back(std::s }; /*-------------------------- COLOR ----------------------------------------*/ -template class Color: public T { +template +class Color: public T { public: typedef A ColorType; Color():_color(vcg::Color4b::White) {} @@ -378,6 +377,10 @@ public: private: ColorType _color; }; + +template class Color4b : public Color { +public: static void Name(std::vector & name){name.push_back(std::string("Color4b"));T::Name(name); } +}; /*-------------------------- INCREMENTAL MARK ----------------------------------------*/ // template class EmptyMark: public T { diff --git a/vcg/space/tetra3.h b/vcg/space/tetra3.h index eaa28d12..8f0779c0 100644 --- a/vcg/space/tetra3.h +++ b/vcg/space/tetra3.h @@ -117,7 +117,7 @@ Revision 1.1 2004/04/08 01:13:31 pietroni Initial commit -****************************************************************************/ +***************************************************************************/ #ifndef __VCG_TETRA3 #define __VCG_TETRA3