vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Faction Test v1.0.1.0

Browse Source
This commit is contained in:
Regalis11
2023-02-16 15:01:28 +02:00
parent caa5a2f762
commit 2c5a7923b0
309 changed files with 7502 additions and 4335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Utils/MathUtils.cs
+31 -32
View File
@@ -19,6 +19,9 @@ namespace Barotrauma
static class MathUtils
{
public static Vector2 DiscardZ(this Vector3 vector)
=> new Vector2(vector.X, vector.Y);
public static float Percentage(float portion, float total)
{
return portion / total * 100;
@@ -152,7 +155,6 @@ namespace Barotrauma
public static float CurveAngle(float from, float to, float step)
{
from = WrapAngleTwoPi(from);
to = WrapAngleTwoPi(to);
@@ -186,13 +188,7 @@ namespace Barotrauma
{
return 0.0f;
}
while (angle < 0)
angle += MathHelper.TwoPi;
while (angle >= MathHelper.TwoPi)
angle -= MathHelper.TwoPi;
return angle;
return PositiveModulo(angle, MathHelper.TwoPi);
}
/// <summary>
@@ -204,13 +200,9 @@ namespace Barotrauma
{
return 0.0f;
}
// Ensure that -pi <= angle < pi for both "from" and "to"
while (angle < -MathHelper.Pi)
angle += MathHelper.TwoPi;
while (angle >= MathHelper.Pi)
angle -= MathHelper.TwoPi;
return angle;
float min = -MathHelper.Pi;
float diffFromMin = angle - min;
return diffFromMin - (MathF.Floor(diffFromMin / MathHelper.TwoPi) * MathHelper.TwoPi) + min;
}
public static float GetShortestAngle(float from, float to)
@@ -339,13 +331,13 @@ namespace Barotrauma
if (axisAligned1.Y < axisAligned2.Y)
{
if (y < axisAligned1.Y) return false;
if (y > axisAligned2.Y) return false;
if (y < axisAligned1.Y) { return false; }
if (y > axisAligned2.Y) { return false; }
}
else
{
if (y > axisAligned1.Y) return false;
if (y < axisAligned2.Y) return false;
if (y > axisAligned1.Y) { return false; }
if (y < axisAligned2.Y) { return false; }
}
intersection = new Vector2(axisAligned1.X, y);
@@ -361,13 +353,13 @@ namespace Barotrauma
if (axisAligned1.X < axisAligned2.X)
{
if (x < axisAligned1.X) return false;
if (x > axisAligned2.X) return false;
if (x < axisAligned1.X) { return false; }
if (x > axisAligned2.X) { return false; }
}
else
{
if (x > axisAligned1.X) return false;
if (x < axisAligned2.X) return false;
if (x > axisAligned1.X) { return false; }
if (x < axisAligned2.X) { return false; }
}
intersection = new Vector2(x, axisAligned1.Y);
@@ -898,23 +890,30 @@ namespace Barotrauma
// https://stackoverflow.com/questions/3874627/floating-point-comparison-functions-for-c-sharp
public static bool NearlyEqual(float a, float b, float epsilon = 0.0001f)
{
float diff = Math.Abs(a - b);
if (a == b)
{
// shortcut, handles infinities
//shortcut, handles infinities
return true;
}
else if (a == 0 || b == 0 || diff < float.Epsilon)
if (a == 0 || b == 0)
{
// a or b is zero or both are extremely close to it
// relative error is less meaningful here
return diff < epsilon;
//if a or b is zero, relative error is less meaningful
return Math.Abs(a - b) < epsilon;
}
else
float absA = Math.Abs(a);
float absB = Math.Abs(b);
float absAB = absA + absB;
if (absAB < epsilon)
{
// use relative error
return diff / (Math.Abs(a) + Math.Abs(b)) < epsilon;
// a and b extremely close to zero, relative error is less meaningful
return true;
}
float diff = Math.Abs(a - b);
// use relative error
return diff / absAB < epsilon;
}
/// <summary>