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

Modified Files:

Browse Source 
SGIntersect.hxx: Make it compile with win32
This commit is contained in:
frohlich
2006-12-28 13:25:14 +00:00
parent 7fe56bea86
commit 26cb8ec4f1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/math/SGIntersect.hxx
+6 -6
View File
@@ -570,17 +570,17 @@ intersects(const SGBox<T>& box, const SGRay<T>& ray)
return false; return false;
} }
T near = - SGLimits<T>::max(); T nearr = - SGLimits<T>::max();
T far = SGLimits<T>::max(); T farr = SGLimits<T>::max();
T T1 = (cMin - cOrigin) / cDir; T T1 = (cMin - cOrigin) / cDir;
T T2 = (cMax - cOrigin) / cDir; T T2 = (cMax - cOrigin) / cDir;
if (T1 > T2) std::swap (T1, T2);/* since T1 intersection with near plane */ if (T1 > T2) std::swap (T1, T2);/* since T1 intersection with near plane */
if (T1 > near) near = T1; /* want largest Tnear */ if (T1 > nearr) nearr = T1; /* want largest Tnear */
if (T2 < far) far = T2; /* want smallest Tfar */ if (T2 < farr) farr = T2; /* want smallest Tfarr */
if (near > far) // far box is missed if (nearr > farr) // farr box is missed
return false; return false;
if (far < 0) // box is behind ray if (farr < 0) // box is behind ray
return false; return false;
} }