diff options
| author | aap <aap@papnet.eu> | 2020-05-26 11:25:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 11:25:23 +0200 |
| commit | 0b8f045d363dec9e9bf96d98995b339e12e04bd6 (patch) | |
| tree | 86df5a8337edb1af67275219cef37d235aaebdf7 /src/core/Collision.cpp | |
| parent | fixed filename (diff) | |
| parent | CVehicle (diff) | |
| download | re3-0b8f045d363dec9e9bf96d98995b339e12e04bd6.tar re3-0b8f045d363dec9e9bf96d98995b339e12e04bd6.tar.gz re3-0b8f045d363dec9e9bf96d98995b339e12e04bd6.tar.bz2 re3-0b8f045d363dec9e9bf96d98995b339e12e04bd6.tar.lz re3-0b8f045d363dec9e9bf96d98995b339e12e04bd6.tar.xz re3-0b8f045d363dec9e9bf96d98995b339e12e04bd6.tar.zst re3-0b8f045d363dec9e9bf96d98995b339e12e04bd6.zip | |
Diffstat (limited to 'src/core/Collision.cpp')
| -rw-r--r-- | src/core/Collision.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp index c29c1d28..d2e08f7c 100644 --- a/src/core/Collision.cpp +++ b/src/core/Collision.cpp @@ -414,8 +414,9 @@ CCollision::TestSphereTriangle(const CColSphere &sphere, return dist < sphere.radius; } +//--MIAMI: TODO bool -CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough) +CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough, bool ignoreShootThrough) { static CMatrix matTransform; int i; @@ -1042,10 +1043,11 @@ CCollision::ProcessSphereTriangle(const CColSphere &sphere, return true; } +//--MIAMI: TODO bool CCollision::ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, - CColPoint &point, float &mindist, bool ignoreSeeThrough) + CColPoint &point, float &mindist, bool ignoreSeeThrough, bool ignoreShootThrough) { static CMatrix matTransform; int i; @@ -1081,10 +1083,11 @@ CCollision::ProcessLineOfSight(const CColLine &line, return false; } +//--MIAMI: TODO bool CCollision::ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, - CColPoint &point, float &mindist, bool ignoreSeeThrough, CStoredCollPoly *poly) + CColPoint &point, float &mindist, bool ignoreSeeThrough, bool ignoreShootThrough, CStoredCollPoly *poly) { static CStoredCollPoly TempStoredPoly; int i; |