OctahedronPolygon.cpp   OctahedronPolygon.cpp
skipping to change at line 39 skipping to change at line 39
inline bool intersectsBoundingCap(const Vec3d& n1, double d1, const Vec3d& n2, double d2) inline bool intersectsBoundingCap(const Vec3d& n1, double d1, const Vec3d& n2, double d2)
{ {
const double a = d1*d2 - n1*n2; const double a = d1*d2 - n1*n2;
return d1+d2<=0. || a<=0. || (a<=1. && a*a <= (1.-d1*d1)*(1.-d2*d2)) ; return d1+d2<=0. || a<=0. || (a<=1. && a*a <= (1.-d1*d1)*(1.-d2*d2)) ;
} }
inline bool containsBoundingCap(const Vec3d& n1, double d1, const Vec3d& n2 , double d2) inline bool containsBoundingCap(const Vec3d& n1, double d1, const Vec3d& n2 , double d2)
{ {
const double a = n1*n2-d1*d2; const double a = n1*n2-d1*d2;
return d1<=d && ( a>=1. || (a>=0. && a*a >= (1.-d1*d1)*(1.-d2*d2))) ; return d1<=d2 && ( a>=1. || (a>=0. && a*a >= (1.-d1*d1)*(1.-d2*d2))) ;
} }
static int getSide(const Vec3d& v, int onLine) static int getSide(const Vec3d& v, int onLine)
{ {
Q_ASSERT(onLine>=0 && onLine<3); Q_ASSERT(onLine>=0 && onLine<3);
return v[onLine]>=0. ? 0 : 1; return v[onLine]>=0. ? 0 : 1;
} }
QDataStream& operator<<(QDataStream& out, const EdgeVertex& v) QDataStream& operator<<(QDataStream& out, const EdgeVertex& v)
{ {
End of changes. 1 change blocks.
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/