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

Added Point3::Construct() in ray-face functor 

to handle tree and objects with different ScalarType.
This commit is contained in:
Marco Di Benedetto 2005-09-28 21:24:44 +00:00
parent bf84eeafe0
commit add80bd224
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vcg/space/index/aabb_binary_tree/face_functors.h
View File

@ -25,6 +25,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.2 2005/09/28 19:55:08 m_di_benedetto
All functors but FaceRayIntersectFunctor removed and placed in appropriate files.
Revision 1.1 2005/09/26 18:33:16 m_di_benedetto Revision 1.1 2005/09/26 18:33:16 m_di_benedetto
First Commit. First Commit.
@ -48,10 +51,10 @@ public:
ScalarType a; ScalarType a;
ScalarType b; ScalarType b;
bool bret = Intersection(ray, f.P(0), f.P(1), f.P(2), a, b, t); 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);
if (BACKFACETEST) { if (BACKFACETEST) {
if (!bret) { if (!bret) {
bret = Intersection(ray, f.P(0), f.P(2), f.P(1), a, b, t); bret = Intersection(ray, Point3<SCALARTYPE>::Construct(f.P(0)), Point3<SCALARTYPE>::Construct(f.P(2)), Point3<SCALARTYPE>::Construct(f.P(1)), a, b, t);
} }
} }
return (bret); return (bret);