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

correct access to point funtions call in usage of triangle3 (ex. t.P(0) in t.P0(0))

This commit is contained in:
Nico Pietroni 2004-07-15 10:17:42 +00:00
parent 9b76dfbd2b
commit f7bd6ddb20
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vcg/space/triangle3.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.1 2004/03/08 01:13:31 cignoni
Initial commit
****************************************************************************/ ****************************************************************************/
#ifndef __VCG_TRIANGLE3 #ifndef __VCG_TRIANGLE3
@ -228,35 +231,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.P(1) - t.P(0)) ^ (t.P(2) - t.P(0))); return (( t.P0(1) - t.P0(0)) ^ (t.P0(2) - t.P0(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.P(1) - t.P(0)) ^ (t.P(2) - t.P(0))).Normalize(); return (( t.P0(1) - t.P0(0)) ^ (t.P0(2) - t.P0(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.P(1) - t.P(0)) ^ (t.P(2) - t.P(0)) ); return Norm( (t.P0(1) - t.P0(0)) ^ (t.P0(2) - t.P0(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.P(0)+t.P(1)+t.P(2))/ScalarType(3.0); return ((t.P0(0)+t.P0(1)+t.P0(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.P(0),t.P(1))+ return Distance(t.P0(0),t.P0(1))+
Distance(t.P(1),t.P(2))+ Distance(t.P0(1),t.P0(2))+
Distance(t.P(2),t.P(0)); Distance(t.P0(2),t.P0(0));
} }