kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intersectcylinder fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5429 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2010-07-18 22:20:48 +00:00
parent df5b109b10
commit 577ade081b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+4 -6
View File
@@ -238,16 +238,14 @@ static inline bool intersectcylinder(const vec &from, const vec &to, const vec &
if(offset < 0)
{
if(nd <= 0) return false;
float cdist = -md / nd;
if(k + cdist*(2*mn + cdist*nn) <= 0) dist = cdist;
else if(c <= 0) return false;
dist = -md / nd;
if(k + dist*(2*mn + dist*nn) > 0) return false;
}
else if(offset > dd)
{
if(nd >= 0) return false;
float cdist = (dd - md) / nd;
if(k + dd - 2*md + cdist*(2*(mn-nd) + cdist*nn) <= 0) dist = cdist;
else if(c <= 0) return false;
dist = (dd - md) / nd;
if(k + dd - 2*md + dist*(2*(mn-nd) + dist*nn) > 0) return false;
}
return dist >= 0 && dist <= 1;
}