FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the IntersectVisitor which was broken by a recent patch to catch parallel

Browse Source 
line and traingle combinations.
This commit is contained in:
Robert Osfield 2001-11-08 13:50:32 +00:00
parent e725547a8a
commit 52bc6c2f13
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgUtil/IntersectVisitor.cpp
View File

@ -419,25 +419,20 @@ struct TriangleIntersect
if (ds31<d231) return; if (ds31<d231) return;
} }
if (d312==0.0f || d123==0.0f || d231==0.0f)
{
// the triangle and the line must be parallel intersection.
}
float r3; float r3;
if (ds12==0.0f) r3=0.0f; if (ds12==0.0f) r3=0.0f;
else if (d312>0.0f) r3 = ds12/d312; else if (d312!=0.0f) r3 = ds12/d312;
else return; // the triangle and the line must be parallel intersection. else return; // the triangle and the line must be parallel intersection.
float r1; float r1;
if (ds23==0.0f) r1=0.0f; if (ds23==0.0f) r1=0.0f;
else if (d123>0.0f) r1 = ds23/d123; else if (d123!=0.0f) r1 = ds23/d123;
else return; // the triangle and the line must be parallel intersection. else return; // the triangle and the line must be parallel intersection.
float r2; float r2;
if (ds31==0.0f) r2=0.0f; if (ds31==0.0f) r2=0.0f;
else if (d231>0.0f) r2 = ds31/d231; else if (d231!=0.0f) r2 = ds31/d231;
else return; // the triangle and the line must be parallel intersection. else return; // the triangle and the line must be parallel intersection.
float total_r = (r1+r2+r3); float total_r = (r1+r2+r3);