diff options
Diffstat (limited to 'src/Quaternions.cpp')
| -rw-r--r-- | src/Quaternions.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/Quaternions.cpp b/src/Quaternions.cpp index 464c0f2..6edbd3a 100644 --- a/src/Quaternions.cpp +++ b/src/Quaternions.cpp @@ -392,9 +392,8 @@ bool PointInTriangle(Vector *p, Vector normal, float p11, float p12, float p13, bool LineFacet(Vector p1,Vector p2,Vector pa,Vector pb,Vector pc,Vector *p) { float d; - float a1,a2,a3; - float total,denom,mu; - Vector n,pa1,pa2,pa3; + float denom, mu; + Vector n, pa1, pa2, pa3; //Calculate the parameters for the plane n.x = (pb.y - pa.y)*(pc.z - pa.z) - (pb.z - pa.z)*(pc.y - pa.y); @@ -487,9 +486,8 @@ bool PointInTriangle(XYZ *p, XYZ normal, XYZ *p1, XYZ *p2, XYZ *p3) bool LineFacet(XYZ p1,XYZ p2,XYZ pa,XYZ pb,XYZ pc,XYZ *p) { float d; - float a1,a2,a3; - float total,denom,mu; - XYZ n,pa1,pa2,pa3; + float denom, mu; + XYZ n; //Calculate the parameters for the plane n.x = (pb.y - pa.y)*(pc.z - pa.z) - (pb.z - pa.z)*(pc.y - pa.y); @@ -686,9 +684,8 @@ bool sphere_line_intersection ( // This function returns a pointer array which first index indicates // the number of intersection point, followed by coordinate pairs. - float x , y , z; - float a, b, c, mu, i ; - + float a, b, c, i; + if(x1>x3+r&&x2>x3+r)return(0); if(x1<x3-r&&x2<x3-r)return(0); if(y1>y3+r&&y2>y3+r)return(0); |