summaryrefslogtreecommitdiffstats
path: root/src/collision
diff options
context:
space:
mode:
authorshfil <filip.gawin@zoho.com>2021-01-24 12:36:43 +0100
committerGitHub <noreply@github.com>2021-01-24 12:36:43 +0100
commitd68ec362ddc5d5e4dbf6dc4577a06a071f8b394c (patch)
tree203a69dbb0318a148ea6cec04656357010c47fbc /src/collision
parentfix merge failure (diff)
downloadre3-d68ec362ddc5d5e4dbf6dc4577a06a071f8b394c.tar
re3-d68ec362ddc5d5e4dbf6dc4577a06a071f8b394c.tar.gz
re3-d68ec362ddc5d5e4dbf6dc4577a06a071f8b394c.tar.bz2
re3-d68ec362ddc5d5e4dbf6dc4577a06a071f8b394c.tar.lz
re3-d68ec362ddc5d5e4dbf6dc4577a06a071f8b394c.tar.xz
re3-d68ec362ddc5d5e4dbf6dc4577a06a071f8b394c.tar.zst
re3-d68ec362ddc5d5e4dbf6dc4577a06a071f8b394c.zip
Diffstat (limited to 'src/collision')
-rw-r--r--src/collision/Collision.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/collision/Collision.cpp b/src/collision/Collision.cpp
index 45a15628..bead5183 100644
--- a/src/collision/Collision.cpp
+++ b/src/collision/Collision.cpp
@@ -2099,12 +2099,12 @@ CCollision::DistToLine(const CVector *l0, const CVector *l1, const CVector *poin
float dot = DotProduct(*point - *l0, *l1 - *l0);
// Between 0 and len we're above the line.
// if not, calculate distance to endpoint
- if(dot <= 0.0f)
- return (*point - *l0).Magnitude();
- if(dot >= lensq)
- return (*point - *l1).Magnitude();
+ if(dot <= 0.0f) return (*point - *l0).Magnitude();
+ if(dot >= lensq) return (*point - *l1).Magnitude();
// 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
@@ -2571,4 +2571,4 @@ CCollision::DrawColModel_Coloured(const CMatrix &mat, const CColModel &colModel,
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
-} \ No newline at end of file
+}