summaryrefslogtreecommitdiffstats
path: root/src/core/Collision.cpp
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-06-16 22:02:21 +0200
committerGitHub <noreply@github.com>2020-06-16 22:02:21 +0200
commitd322a8033e07cf286891fdc165c7b77dfe6b762e (patch)
tree30a5d3a4181030ca731ae38f20df077a22b91e67 /src/core/Collision.cpp
parentUpdate ModelIndices.h (diff)
parentfix crash-VC pickup scaling (diff)
downloadre3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar
re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar.gz
re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar.bz2
re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar.lz
re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar.xz
re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar.zst
re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.zip
Diffstat (limited to 'src/core/Collision.cpp')
-rw-r--r--src/core/Collision.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index b68214af..77e28a10 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -1801,6 +1801,21 @@ CColSphere::Set(float radius, const CVector &center, uint8 surf, uint8 piece)
this->piece = piece;
}
+bool
+CColSphere::IntersectRay(CVector const& from, CVector const& dir, CVector &entry, CVector &exit)
+{
+ CVector distToCenter = from - center;
+ float distToTouchSqr = distToCenter.MagnitudeSqr() - sq(radius);
+ float root1, root2;
+
+ if (!CGeneral::SolveQuadratic(1.0f, DotProduct(distToCenter, dir) * 2.f, distToTouchSqr, root1, root2))
+ return false;
+
+ entry = from + dir * root1;
+ exit = from + dir * root2;
+ return true;
+}
+
void
CColBox::Set(const CVector &min, const CVector &max, uint8 surf, uint8 piece)
{