diff options
author | aap <aap@papnet.eu> | 2020-05-24 15:14:27 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-05-25 18:33:34 +0200 |
commit | 7bf833785411955c2bcf35ed55e9d206facbc575 (patch) | |
tree | a69383e116ca35a5c6ac14e40a462d29b8b46c87 /src/math | |
parent | how did saving even work in original III? (diff) | |
download | re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar.gz re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar.bz2 re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar.lz re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar.xz re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar.zst re3-7bf833785411955c2bcf35ed55e9d206facbc575.zip |
Diffstat (limited to '')
-rw-r--r-- | src/math/Vector2D.h | 4 | ||||
-rw-r--r-- | src/math/math.cpp | 13 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/math/Vector2D.h b/src/math/Vector2D.h index 0885a5d2..7bfccae6 100644 --- a/src/math/Vector2D.h +++ b/src/math/Vector2D.h @@ -11,9 +11,7 @@ public: float Magnitude(void) const { return Sqrt(x*x + y*y); } float MagnitudeSqr(void) const { return x*x + y*y; } - void Normalise(void); - - void NormaliseSafe(void) { + void Normalise(void) { float sq = MagnitudeSqr(); if(sq > 0.0f){ float invsqrt = RecipSqrt(sq); diff --git a/src/math/math.cpp b/src/math/math.cpp index eeb9d3fa..e11d048c 100644 --- a/src/math/math.cpp +++ b/src/math/math.cpp @@ -5,19 +5,6 @@ // TODO: move more stuff into here void -CVector2D::Normalise(void) -{ - float sq = MagnitudeSqr(); - assert(sq != 0.0f); // just be safe here - //if(sq > 0.0f){ - float invsqrt = RecipSqrt(sq); - x *= invsqrt; - y *= invsqrt; - //}else - // x = 1.0f; -} - -void CMatrix::SetRotate(float xAngle, float yAngle, float zAngle) { float cX = Cos(xAngle); |