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

Changed order of functions intersection_line_box and 

intersectuion_ray_box
This commit is contained in:
Federico Ponchio 2005-10-03 16:07:50 +00:00
parent c37db42415
commit e9583c5020
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vcg/space/intersection3.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.19 2005/09/30 13:11:39 pietroni
corrected 1 compiling error on Ray_Box_Intersection function
Revision 1.18 2005/09/29 15:30:10 pietroni Revision 1.18 2005/09/29 15:30:10 pietroni
Added function RayBoxIntersection, renamed intersection line box from "Intersection" to "Intersection_Line_Box" Added function RayBoxIntersection, renamed intersection line box from "Intersection" to "Intersection_Line_Box"
@ -370,19 +373,7 @@ bool Intersection( const Line3<T> & ray, const Point3<T> & vert0,
return true; return true;
} }
// line-box
// ray-box
template<class T>
bool Intersection_Ray_Box( const Box3<T> & box, const Ray3<T> & r, Point3<T> & coord )
{
Line3<T> l;
l.SetOrigin(r.Origin());
l.SetDirection(r.Direction());
return(Intersection_Line_Box<T>(box,l,coord));
}
// ray-box
template<class T> template<class T>
bool Intersection_Line_Box( const Box3<T> & box, const Line3<T> & r, Point3<T> & coord ) bool Intersection_Line_Box( const Box3<T> & box, const Line3<T> & r, Point3<T> & coord )
{ {
@ -456,6 +447,17 @@ bool Intersection_Line_Box( const Box3<T> & box, const Line3<T> & r, Point3<T> &
return true; // ray hits box return true; // ray hits box
} }
// ray-box
template<class T>
bool Intersection_Ray_Box( const Box3<T> & box, const Ray3<T> & r, Point3<T> & coord )
{
Line3<T> l;
l.SetOrigin(r.Origin());
l.SetDirection(r.Direction());
return(Intersection_Line_Box<T>(box,l,coord));
}
template<class T> template<class T>
bool Intersection (const Plane3<T> & plane0, const Plane3<T> & plane1, bool Intersection (const Plane3<T> & plane0, const Plane3<T> & plane1,
Line3<T> & line) Line3<T> & line)