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.h | |
| 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.h')
| -rw-r--r-- | src/core/Collision.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Collision.h b/src/core/Collision.h index 4b0c2fb9..12af5225 100644 --- a/src/core/Collision.h +++ b/src/core/Collision.h @@ -151,7 +151,7 @@ public: static bool TestLineTriangle(const CColLine &line, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane); static bool TestLineSphere(const CColLine &line, const CColSphere &sph); static bool TestSphereTriangle(const CColSphere &sphere, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane); - static bool TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough); + static bool TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough, bool ignoreShootThrough); static bool ProcessSphereSphere(const CColSphere &s1, const CColSphere &s2, CColPoint &point, float &mindistsq); static bool ProcessSphereBox(const CColSphere &sph, const CColBox &box, CColPoint &point, float &mindistsq); @@ -160,8 +160,8 @@ public: static bool ProcessLineTriangle(const CColLine &line , const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindist); static bool ProcessLineSphere(const CColLine &line, const CColSphere &sphere, CColPoint &point, float &mindist); static bool ProcessSphereTriangle(const CColSphere &sph, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindistsq); - static bool ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough); - static bool ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, CStoredCollPoly *poly); + static bool ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, bool ignoreShootThrough); + static bool ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, bool ignoreShootThrough, CStoredCollPoly *poly); static int32 ProcessColModels(const CMatrix &matrixA, CColModel &modelA, const CMatrix &matrixB, CColModel &modelB, CColPoint *spherepoints, CColPoint *linepoints, float *linedists); static bool IsStoredPolyStillValidVerticalLine(const CVector &pos, float z, CColPoint &point, CStoredCollPoly *poly); |