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

minor typos

This commit is contained in:
T.Alderighi 2018-05-09 17:14:16 +02:00
parent b597815848
commit 05764ee1c2
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vcg/complex/allocate.h
View File

@ -780,10 +780,10 @@ public:
assert(v2 >= &m.vert.front() && v2 <= &m.vert.back()); assert(v2 >= &m.vert.front() && v2 <= &m.vert.back());
assert(v3 >= &m.vert.front() && v3 <= &m.vert.back()); assert(v3 >= &m.vert.front() && v3 <= &m.vert.back());
AddFace(m, v0, v1, v2); // AddFace(m, v0, v1, v2);
AddFace(m, v0, v3, v1); // AddFace(m, v0, v3, v1);
AddFace(m, v0, v2, v3); // AddFace(m, v0, v2, v3);
AddFace(m, v1, v3, v2); // AddFace(m, v1, v3, v2);
PointerUpdater<TetraPointer> pu; PointerUpdater<TetraPointer> pu;
TetraIterator ti = AddTetras(m, 1, pu); TetraIterator ti = AddTetras(m, 1, pu);

2
vcg/simplex/face/component.h
View File

@ -388,7 +388,7 @@ public: static void Name(std::vector<std::string> & name){name.push_back(std::st
template <class T> class WedgeColor4f: public WedgeColor<vcg::Color4f, T> { template <class T> class WedgeColor4f: public WedgeColor<vcg::Color4f, T> {
public: static void Name(std::vector<std::string> & name){name.push_back(std::string("WedgeColor4f"));T::Name(name);} public: static void Name(std::vector<std::string> & name){name.push_back(std::string("WedgeColor4f"));T::Name(name);}
}; };
template <class T> class Color4b: public Color<vcg::Color4b, T> { public: template <class T> class Color4b: public Color<vcg::Color4b, T> {
public: static void Name(std::vector<std::string> & name){name.push_back(std::string("Color4b"));T::Name(name);} public: static void Name(std::vector<std::string> & name){name.push_back(std::string("Color4b"));T::Name(name);}
}; };

11
vcg/simplex/tetrahedron/component.h
View File

@ -176,15 +176,13 @@ public:
typedef typename T::VertexType::ScalarType ScalarType; 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 * & 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 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]; } 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 // Shortcut for tetra points
inline typename CoordType & P( const int j ) { assert(j>=0 && j<4); return v[j]->P(); } 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]->P(); }
inline const typename CoordType &cP( const int j ) const { assert(j>=0 && j<4); return v[j]->cP(); }
/** Return the pointer to the ((j+1)%4)-th vertex of the tetra. /** Return the pointer to the ((j+1)%4)-th vertex of the tetra.
@param j Index of the face vertex. @param j Index of the face vertex.
@ -360,7 +358,8 @@ public: static void Name(std::vector<std::string> & name){name.push_back(std::s
}; };
/*-------------------------- COLOR ----------------------------------------*/ /*-------------------------- COLOR ----------------------------------------*/
template <class A, class T> class Color: public T { template <class A, class T>
class Color: public T {
public: public:
typedef A ColorType; typedef A ColorType;
Color():_color(vcg::Color4b::White) {} Color():_color(vcg::Color4b::White) {}
@ -378,6 +377,10 @@ public:
private: private:
ColorType _color; ColorType _color;
}; };
template <class T> class Color4b : public Color<vcg::Color4b, T> {
public: static void Name(std::vector<std::string> & name){name.push_back(std::string("Color4b"));T::Name(name); }
};
/*-------------------------- INCREMENTAL MARK ----------------------------------------*/ /*-------------------------- INCREMENTAL MARK ----------------------------------------*/
// template <class T> class EmptyMark: public T { // template <class T> class EmptyMark: public T {

2
vcg/space/tetra3.h
View File

@ -117,7 +117,7 @@ Revision 1.1 2004/04/08 01:13:31 pietroni
Initial commit Initial commit
****************************************************************************/ ***************************************************************************/
#ifndef __VCG_TETRA3 #ifndef __VCG_TETRA3
#define __VCG_TETRA3 #define __VCG_TETRA3