From add80bd2242204a53479e12ffdaec27a93c6b68e Mon Sep 17 00:00:00 2001 From: dibenedetto Date: Wed, 28 Sep 2005 21:24:44 +0000 Subject: [PATCH] Added Point3::Construct() in ray-face functor to handle tree and objects with different ScalarType. --- vcg/space/index/aabb_binary_tree/face_functors.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vcg/space/index/aabb_binary_tree/face_functors.h b/vcg/space/index/aabb_binary_tree/face_functors.h index 4c93638c..31bbba39 100644 --- a/vcg/space/index/aabb_binary_tree/face_functors.h +++ b/vcg/space/index/aabb_binary_tree/face_functors.h @@ -25,6 +25,9 @@ History $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 First Commit. @@ -48,10 +51,10 @@ public: ScalarType a; ScalarType b; - bool bret = Intersection(ray, f.P(0), f.P(1), f.P(2), a, b, t); + bool bret = Intersection(ray, Point3::Construct(f.P(0)), Point3::Construct(f.P(1)), Point3::Construct(f.P(2)), a, b, t); if (BACKFACETEST) { if (!bret) { - bret = Intersection(ray, f.P(0), f.P(2), f.P(1), a, b, t); + bret = Intersection(ray, Point3::Construct(f.P(0)), Point3::Construct(f.P(2)), Point3::Construct(f.P(1)), a, b, t); } } return (bret);