diff options
| author | aap <aap@papnet.eu> | 2020-08-07 10:18:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 10:18:35 +0200 |
| commit | 40185161b83091e79455acf6fe82f070e26c6662 (patch) | |
| tree | 87ae90e9dc46c746d0a4819286ce1b965c3f91fa /src/core | |
| parent | Merge pull request #668 from majesticCoding/miami (diff) | |
| parent | Update CutsceneShadow.h (diff) | |
| download | re3-40185161b83091e79455acf6fe82f070e26c6662.tar re3-40185161b83091e79455acf6fe82f070e26c6662.tar.gz re3-40185161b83091e79455acf6fe82f070e26c6662.tar.bz2 re3-40185161b83091e79455acf6fe82f070e26c6662.tar.lz re3-40185161b83091e79455acf6fe82f070e26c6662.tar.xz re3-40185161b83091e79455acf6fe82f070e26c6662.tar.zst re3-40185161b83091e79455acf6fe82f070e26c6662.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Cam.cpp | 4 | ||||
| -rw-r--r-- | src/core/Collision.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index 3b11e16f..375e9d5b 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -3958,7 +3958,7 @@ CCam::Process_Debug(const CVector&, float, float, float) if(CPad::GetPad(1)->GetLeftShockJustDown() && gbBigWhiteDebugLightSwitchedOn) CShadows::StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &Source, 12.0f, 0.0f, 0.0f, -12.0f, - 128, 128, 128, 128, 1000.0f, false, 1.0f); + 128, 128, 128, 128, 1000.0f, false, 1.0f, nil, false); if(CHud::m_Wants_To_Draw_Hud){ char str[256]; @@ -4103,7 +4103,7 @@ CCam::Process_Editor(const CVector&, float, float, float) if(CPad::GetPad(1)->GetLeftShockJustDown() && gbBigWhiteDebugLightSwitchedOn) CShadows::StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &Source, 12.0f, 0.0f, 0.0f, -12.0f, - 128, 128, 128, 128, 1000.0f, false, 1.0f); + 128, 128, 128, 128, 1000.0f, false, 1.0f, nil, false); if(CHud::m_Wants_To_Draw_Hud){ char str[256]; diff --git a/src/core/Collision.h b/src/core/Collision.h index eb11d8c4..1dc29efb 100644 --- a/src/core/Collision.h +++ b/src/core/Collision.h @@ -88,6 +88,9 @@ struct CColTrianglePlane void Set(const CVector &va, const CVector &vb, const CVector &vc); void Set(const CompressedVector *v, CColTriangle &tri) { Set(v[tri.a].Get(), v[tri.b].Get(), v[tri.c].Get()); } void GetNormal(CVector &n) const { n = normal; } + float GetNormalX() const { return normal.x; } + float GetNormalY() const { return normal.y; } + float GetNormalZ() const { return normal.z; } float CalcPoint(const CVector &v) const { return DotProduct(normal, v) - dist; }; }; |