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

corrected IntersectionSegmentTriangle calls, the value dist was not updated coherently

This commit is contained in:
Nico Pietroni 2010-10-15 15:15:27 +00:00
parent efadeb21f1
commit 6ad59d0756
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vcg/space/intersection3.h
View File

@ -670,7 +670,7 @@ bool IntersectionSegmentTriangle( const vcg::Segment3<ScalarType> & seg,
const Point3<ScalarType> & vert0, const Point3<ScalarType> & vert0,
const Point3<ScalarType> & vert1, const const Point3<ScalarType> & vert1, const
Point3<ScalarType> & vert2, Point3<ScalarType> & vert2,
ScalarType & a ,ScalarType & b, ScalarType & dist) ScalarType & a ,ScalarType & b)
{ {
//control intersection of bounding boxes //control intersection of bounding boxes
vcg::Box3<ScalarType> bb0,bb1; vcg::Box3<ScalarType> bb0,bb1;
@ -688,12 +688,14 @@ bool IntersectionSegmentTriangle( const vcg::Segment3<ScalarType> & seg,
//first set both directions of ray //first set both directions of ray
vcg::Line3<ScalarType> line; vcg::Line3<ScalarType> line;
vcg::Point3<ScalarType> dir; vcg::Point3<ScalarType> dir;
ScalarType lenght=seg.Length();
dir=(seg.P1()-seg.P0()); dir=(seg.P1()-seg.P0());
dir.Normalize(); dir.Normalize();
line.Set(seg.P0(),dir); line.Set(seg.P0(),dir);
if(IntersectionLineTriangle<ScalarType>(line,vert0,vert1,vert2,dist,a,b)) ScalarType orig_dist;
return (dist>=0 && dist<=1.0); if(IntersectionLineTriangle<ScalarType>(line,vert0,vert1,vert2,orig_dist,a,b))
return false; return (orig_dist<=lenght);
return false;
} }
/** /**
* Compute the intersection between a segment and a triangle. * Compute the intersection between a segment and a triangle.
@ -702,9 +704,9 @@ bool IntersectionSegmentTriangle( const vcg::Segment3<ScalarType> & seg,
template<class TriangleType> template<class TriangleType>
bool IntersectionSegmentTriangle( const vcg::Segment3<typename TriangleType::ScalarType> & seg, bool IntersectionSegmentTriangle( const vcg::Segment3<typename TriangleType::ScalarType> & seg,
const TriangleType &t, const TriangleType &t,
typename TriangleType::ScalarType & a ,typename TriangleType::ScalarType & b, typename TriangleType::ScalarType & dist) typename TriangleType::ScalarType & a ,typename TriangleType::ScalarType & b)
{ {
return IntersectionSegmentTriangle(seg,t.P(0),t.P(1),t.P(2),a,b,dist); return IntersectionSegmentTriangle(seg,t.P(0),t.P(1),t.P(2),a,b);
} }
template<class ScalarType> template<class ScalarType>