diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-15 22:31:52 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-15 22:31:52 +0200 |
commit | 1795f3d47993e7a9833e6f265bb91fb6ce400f1c (patch) | |
tree | 766dd0f14ba4df90cbac836c03cdfc501c9cd009 /src/math | |
parent | fix (diff) | |
parent | Merge pull request #440 from Fire-Head/master (diff) | |
download | re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.gz re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.bz2 re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.lz re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.xz re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.zst re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.zip |
Diffstat (limited to 'src/math')
-rw-r--r-- | src/math/Vector.h | 7 | ||||
-rw-r--r-- | src/math/Vector2D.h | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/math/Vector.h b/src/math/Vector.h index 1274a4b2..269ffc88 100644 --- a/src/math/Vector.h +++ b/src/math/Vector.h @@ -46,6 +46,13 @@ public: y *= invsqrt; z *= invsqrt; } + + void Normalise2D(void) { + float sq = MagnitudeSqr2D(); + float invsqrt = RecipSqrt(sq); + x *= invsqrt; + y *= invsqrt; + } const CVector &operator+=(CVector const &right) { x += right.x; diff --git a/src/math/Vector2D.h b/src/math/Vector2D.h index 1e4d698f..705ad763 100644 --- a/src/math/Vector2D.h +++ b/src/math/Vector2D.h @@ -13,13 +13,14 @@ public: void Normalise(void){ float sq = MagnitudeSqr(); - if(sq > 0.0f){ + //if(sq > 0.0f){ float invsqrt = RecipSqrt(sq); x *= invsqrt; y *= invsqrt; - }else - x = 1.0f; + //}else + // x = 1.0f; } + const CVector2D &operator+=(CVector2D const &right) { x += right.x; y += right.y; |