mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-24 18:15:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix CCollision::DistToLine

Browse source
This commit is contained in:
shfil 2021-01-24 12:35:45 +01:00 committed by GitHub
parent 4e477a17b2
commit ca1de3cd17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/collision/Collision.cpp
View file

@ -2099,12 +2099,12 @@ CCollision::DistToLine(const CVector *l0, const CVector *l1, const CVector *poin
float dot = DotProduct(*point - *l0, *l1 - *l0); float dot = DotProduct(*point - *l0, *l1 - *l0);
// Between 0 and len we're above the line. // Between 0 and len we're above the line.
// if not, calculate distance to endpoint // if not, calculate distance to endpoint
if(dot <= 0.0f) if(dot <= 0.0f) return (*point - *l0).Magnitude();
return (*point - *l0).Magnitude(); if(dot >= lensq) return (*point - *l1).Magnitude();
if(dot >= lensq)
return (*point - *l1).Magnitude();
// distance to line // distance to line
return Sqrt((*point - *l0).MagnitudeSqr() - dot*dot/lensq); float distSqr = (*point - *l0).MagnitudeSqr() - dot * dot / lensq;
if(distSqr <= 0.f) return 0.f;
return Sqrt(distSqr);
} }
// same as above but also return the point on the line // same as above but also return the point on the line
@ -2571,4 +2571,4 @@ CCollision::DrawColModel_Coloured(const CMatrix &mat, const CColModel &colModel,
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE); RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE); RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE); RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
} }