GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MathStuff' of git://github.com/W2Wizard/FlaxEngine into W2Wizard-MathStuff

Browse Source
This commit is contained in:
Wojtek Figat
2021-04-29 10:14:31 +02:00
parent f63849ed56 7cfcacf0cd
commit c745e6f29b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Engine/Core/Math/Math.h
View File

@@ -13,6 +13,7 @@
#define PI_OVER_2 1.57079632679f #define PI_OVER_2 1.57079632679f
#define PI_OVER_4 0.78539816339f #define PI_OVER_4 0.78539816339f
#define PI_HALF PI_OVER_2 #define PI_HALF PI_OVER_2
#define GOLDEN_RATIO 1.6180339887f
// The value for which all absolute numbers smaller than are considered equal to zero. // The value for which all absolute numbers smaller than are considered equal to zero.
#define ZeroTolerance 1e-6f #define ZeroTolerance 1e-6f
@@ -648,9 +649,9 @@ namespace Math
{ {
float delta = a2 - a1; float delta = a2 - a1;
if (delta > PI) if (delta > PI)
delta = delta - PI * 2.0f; delta = delta - TWO_PI;
else if (delta < -PI) else if (delta < -PI)
delta = delta + PI * 2.0f; delta = delta + TWO_PI;
return delta; return delta;
} }
@@ -658,9 +659,9 @@ namespace Math
static float UnwindRadians(float a) static float UnwindRadians(float a)
{ {
while (a > PI) while (a > PI)
a -= (float)PI * 2.0f; a -= TWO_PI;
while (a < -PI) while (a < -PI)
a += (float)PI * 2.0f; a += TWO_PI;
return a; return a;
} }

1
Source/Engine/Core/Math/Vector3.h
View File

@@ -912,6 +912,7 @@ public:
/// <param name="v2">The third triangle vertex.</param> /// <param name="v2">The third triangle vertex.</param>
/// <returns>The triangle area.</returns> /// <returns>The triangle area.</returns>
static float TriangleArea(const Vector3& v0, const Vector3& v1, const Vector3& v2); static float TriangleArea(const Vector3& v0, const Vector3& v1, const Vector3& v2);
}; };
inline Vector3 operator+(float a, const Vector3& b) inline Vector3 operator+(float a, const Vector3& b)