FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix line segment plane intersect.

Browse Source
This commit is contained in:
Mathias Froehlich
2012-09-26 22:45:12 +02:00
parent c04ec5953f
commit fcd1733787
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
simgear/math/SGIntersect.hxx
View File

@@ -253,11 +253,11 @@ intersects(SGVec3<T>& dst, const SGLineSegment<T>& lineSegment, const SGPlane<T>
// The negative numerator for the \alpha expression
T num = plane.getPositiveDist();
num -= dot(plane.getNormal(), lineSegment.getOrigin());
num -= dot(plane.getNormal(), lineSegment.getStart());
// If the numerator is zero, we have the lines origin included in the plane
if (fabs(num) <= SGLimits<T>::min()) {
dst = lineSegment.getOrigin();
dst = lineSegment.getStart();
return true;
}
@@ -279,7 +279,7 @@ intersects(SGVec3<T>& dst, const SGLineSegment<T>& lineSegment, const SGPlane<T>
if (1 < alpha)
return false;
dst = lineSegment.getOrigin() + alpha*lineSegment.getDirection();
dst = lineSegment.getStart() + alpha*lineSegment.getDirection();
return true;
}
// make it symmetric