archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-22 01:19:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into Standalone

Browse Source
This commit is contained in:
Sergeanur
2020-04-17 16:31:43 +03:00
parent 599164006a 6ef7924e01
commit 941c50ee25
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/math/Vector2D.h
View File

@ -11,16 +11,18 @@ public:
float Magnitude(void) const { return Sqrt(x*x + y*y); }
float MagnitudeSqr(void) const { return x*x + y*y; }
void Normalise(void){
void Normalise(void);
void NormaliseSafe(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
y = 1.0f;
}
const CVector2D &operator+=(CVector2D const &right) {
x += right.x;
y += right.y;

13
src/math/math.cpp
View File

@ -4,6 +4,19 @@
// 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)
{