From 401abff90a67e85808b215ee1c8e2bdba33dbbfd Mon Sep 17 00:00:00 2001 From: matteodelle Date: Mon, 21 Dec 2009 13:02:28 +0000 Subject: [PATCH] Correction of IntersectionRayMesh functions, they did not compile. --- vcg/complex/intersection.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcg/complex/intersection.h b/vcg/complex/intersection.h index cfb21ed0..c344684b 100644 --- a/vcg/complex/intersection.h +++ b/vcg/complex/intersection.h @@ -271,7 +271,7 @@ bool IntersectionRayMesh( p1=vcg::Point3( (*fi).P(0).X() ,(*fi).P(0).Y(),(*fi).P(0).Z() ); p2=vcg::Point3( (*fi).P(1).X() ,(*fi).P(1).Y(),(*fi).P(1).Z() ); p3=vcg::Point3( (*fi).P(2).X() ,(*fi).P(2).Y(),(*fi).P(2).Z() ); - if(Intersection(ray,p1,p2,p3,bar1,bar2,dist)) + if(IntersectionLineTriangle(ray,p1,p2,p3,bar1,bar2,dist)) { hitPoint= p1*(1-bar1-bar2) + p2*bar1 + p3*bar2; hit=true; @@ -314,7 +314,7 @@ bool IntersectionRayMesh( p1=vcg::Point3( (*fi).P(0).X() ,(*fi).P(0).Y(),(*fi).P(0).Z() ); p2=vcg::Point3( (*fi).P(1).X() ,(*fi).P(1).Y(),(*fi).P(1).Z() ); p3=vcg::Point3( (*fi).P(2).X() ,(*fi).P(2).Y(),(*fi).P(2).Z() ); - if(Intersection(ray,p1,p2,p3,bar1,bar2,dist)) + if(IntersectionLineTriangle(ray,p1,p2,p3,bar1,bar2,dist)) { bar3 = (1-bar1-bar2); hitPoint= p1*bar3 + p2*bar1 + p3*bar2;