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

Restored Ray-Triangle Intersection (as an extension of IntersectionLineTriangle)

This commit is contained in:
Paolo Cignoni 2009-01-23 14:33:13 +00:00
parent 8a53c7a836
commit f4ec24c552
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vcg/space/intersection3.h
View File

@ -507,6 +507,18 @@ bool IntersectionLineTriangle( const Line3<T> & line, const Point3<T> & vert0,
return 1; return 1;
} }
template<class T>
bool IntersectionRayTriangle( const Ray3<T> & ray, const Point3<T> & vert0,
const Point3<T> & vert1, const Point3<T> & vert2,
T & t ,T & u, T & v)
{
Line3<T> line(ray.Origin(), ray.Direction());
if (IntersectionLineTriangle(line, vert0, vert1, vert2, t, u, v))
{
if (t <= 0) return 0;
else return 1;
}else return 0;
}
// line-box // line-box
template<class T> template<class T>
@ -843,13 +855,13 @@ public:
template <class TRIANGLETYPE, class SCALARTYPE> template <class TRIANGLETYPE, class SCALARTYPE>
inline bool operator () (const TRIANGLETYPE & f, const Ray3<SCALARTYPE> & ray, SCALARTYPE & t) { inline bool operator () (const TRIANGLETYPE & f, const Ray3<SCALARTYPE> & ray, SCALARTYPE & t) {
typedef SCALARTYPE ScalarType; typedef SCALARTYPE ScalarType;
ScalarType a; ScalarType u;
ScalarType b; ScalarType v;
bool bret = Intersection(ray, Point3<SCALARTYPE>::Construct(f.P(0)), Point3<SCALARTYPE>::Construct(f.P(1)), Point3<SCALARTYPE>::Construct(f.P(2)), a, b, t); bool bret = IntersectionRayTriangle(ray, Point3<SCALARTYPE>::Construct(f.P(0)), Point3<SCALARTYPE>::Construct(f.P(1)), Point3<SCALARTYPE>::Construct(f.P(2)), t, u, v);
if (BACKFACETEST) { if (BACKFACETEST) {
if (!bret) { if (!bret) {
bret = Intersection(ray, Point3<SCALARTYPE>::Construct(f.P(0)), Point3<SCALARTYPE>::Construct(f.P(2)), Point3<SCALARTYPE>::Construct(f.P(1)), a, b, t); bret = IntersectionRayTriangle(ray, Point3<SCALARTYPE>::Construct(f.P(0)), Point3<SCALARTYPE>::Construct(f.P(2)), Point3<SCALARTYPE>::Construct(f.P(1)), t, u, v);
} }
} }
return (bret); return (bret);
@ -857,8 +869,6 @@ public:
}; };
/*@}*/ /*@}*/