diff options
| author | aap <aap@papnet.eu> | 2019-05-28 08:39:36 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-05-28 08:39:36 +0200 |
| commit | cb8993f15e06fe2ea94decce77892c28b1b23d64 (patch) | |
| tree | 617b6745f6ff26ab4551a4d192fab082ea17f46f /src/Collision.h | |
| parent | implemented CFileMgr (barf) (diff) | |
| download | re3-cb8993f15e06fe2ea94decce77892c28b1b23d64.tar re3-cb8993f15e06fe2ea94decce77892c28b1b23d64.tar.gz re3-cb8993f15e06fe2ea94decce77892c28b1b23d64.tar.bz2 re3-cb8993f15e06fe2ea94decce77892c28b1b23d64.tar.lz re3-cb8993f15e06fe2ea94decce77892c28b1b23d64.tar.xz re3-cb8993f15e06fe2ea94decce77892c28b1b23d64.tar.zst re3-cb8993f15e06fe2ea94decce77892c28b1b23d64.zip | |
Diffstat (limited to 'src/Collision.h')
| -rw-r--r-- | src/Collision.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Collision.h b/src/Collision.h index 53a314bd..1bd4ca4a 100644 --- a/src/Collision.h +++ b/src/Collision.h @@ -132,7 +132,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(CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSurf78); + static bool TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough); 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); @@ -141,8 +141,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 ignoreSurf78); - static bool ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSurf78, CStoredCollPoly *poly); + 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 int32 ProcessColModels(const CMatrix &matrix1, CColModel &model1, const CMatrix &matrix2, CColModel &model2, CColPoint *point1, CColPoint *point2, float *linedists); // TODO: |