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

Added the standard P() access function instead of the shortcut P0()

This commit is contained in:
Paolo Cignoni 2004-07-15 13:22:37 +00:00
parent c15f2fb66c
commit b53fe209a1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vcg/space/triangle3.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.2 2004/07/15 10:17:42 pietroni
correct access to point funtions call in usage of triangle3 (ex. t.P(0) in t.P0(0))
Revision 1.1 2004/03/08 01:13:31 cignoni Revision 1.1 2004/03/08 01:13:31 cignoni
Initial commit Initial commit
@ -61,9 +64,11 @@ protected:
public: public:
/// Shortcut per accedere ai punti delle facce /// Shortcut per accedere ai punti delle facce
inline CoordType & P( const int j ) { return _v[j];}
inline CoordType & P0( const int j ) { return _v[j];} inline CoordType & P0( const int j ) { return _v[j];}
inline CoordType & P1( const int j ) { return _v[(j+1)%3];} inline CoordType & P1( const int j ) { return _v[(j+1)%3];}
inline CoordType & P2( const int j ) { return _v[(j+2)%3];} inline CoordType & P2( const int j ) { return _v[(j+2)%3];}
inline const CoordType & P( const int j ) const { return _v[j];}
inline const CoordType & P0( const int j ) const { return _v[j];} inline const CoordType & P0( const int j ) const { return _v[j];}
inline const CoordType & P1( const int j ) const { return _v[(j+1)%3];} inline const CoordType & P1( const int j ) const { return _v[(j+1)%3];}
inline const CoordType & P2( const int j ) const { return _v[(j+2)%3];} inline const CoordType & P2( const int j ) const { return _v[(j+2)%3];}
@ -231,35 +236,35 @@ P3ScalarType Quality( Point3<P3ScalarType> const &p0, Point3<P3ScalarType> const
template<class TriangleType> template<class TriangleType>
Point3<typename TriangleType::ScalarType> Normal(const TriangleType &t) Point3<typename TriangleType::ScalarType> Normal(const TriangleType &t)
{ {
return (( t.P0(1) - t.P0(0)) ^ (t.P0(2) - t.P0(0))); return (( t.P(1) - t.P(0)) ^ (t.P(2) - t.P(0)));
} }
/// Like the above, it returns the normal to the plane passing through p0,p1,p2, but normalized. /// Like the above, it returns the normal to the plane passing through p0,p1,p2, but normalized.
template<class TriangleType> template<class TriangleType>
Point3<typename TriangleType::ScalarType> NormalizedNormal(const TriangleType &t) Point3<typename TriangleType::ScalarType> NormalizedNormal(const TriangleType &t)
{ {
return (( t.P0(1) - t.P0(0)) ^ (t.P0(2) - t.P0(0))).Normalize(); return (( t.P(1) - t.P(0)) ^ (t.P(2) - t.P(0))).Normalize();
} }
/// Return the area of the triangle /// Return the area of the triangle
template<class TriangleType> template<class TriangleType>
typename TriangleType::ScalarType Area(const TriangleType &t) typename TriangleType::ScalarType Area(const TriangleType &t)
{ {
return Norm( (t.P0(1) - t.P0(0)) ^ (t.P0(2) - t.P0(0)) ); return Norm( (t.P(1) - t.P(0)) ^ (t.P(2) - t.P(0)) );
} }
template<class TriangleType> template<class TriangleType>
Point3<typename TriangleType::ScalarType> Barycenter(const TriangleType &t) Point3<typename TriangleType::ScalarType> Barycenter(const TriangleType &t)
{ {
return ((t.P0(0)+t.P0(1)+t.P0(2))/(typename TriangleType::ScalarType) 3.0); return ((t.P(0)+t.P(1)+t.P(2))/(typename TriangleType::ScalarType) 3.0);
} }
template<class TriangleType> template<class TriangleType>
typename TriangleType::ScalarType Perimeter(const TriangleType &t) typename TriangleType::ScalarType Perimeter(const TriangleType &t)
{ {
return Distance(t.P0(0),t.P0(1))+ return Distance(t.P(0),t.P(1))+
Distance(t.P0(1),t.P0(2))+ Distance(t.P(1),t.P(2))+
Distance(t.P0(2),t.P0(0)); Distance(t.P(2),t.P(0));
} }