Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

FixedPoint2 tweaks (#12431)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-08 12:14:13 +13:00
committed by GitHub
parent f6e5790b72
commit 5cade18119
2 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Shared/FixedPoint/FixedPoint2.cs
View File

@@ -70,21 +70,17 @@ namespace Content.Shared.FixedPoint
public static FixedPoint2 operator *(FixedPoint2 a, FixedPoint2 b)
{
var aD = a.ShiftDown();
var bD = b.ShiftDown();
return New(aD * bD);
return new((int) MathF.Round(b._value * a._value / MathF.Pow(10, Shift), MidpointRounding.AwayFromZero));
}
public static FixedPoint2 operator *(FixedPoint2 a, float b)
{
var aD = (float) a.ShiftDown();
return New(aD * b);
return new((int) MathF.Round(a._value * b, MidpointRounding.AwayFromZero));
}
public static FixedPoint2 operator *(FixedPoint2 a, double b)
{
var aD = a.ShiftDown();
return New(aD * b);
return new((int) Math.Round(a._value * b, MidpointRounding.AwayFromZero));
}
public static FixedPoint2 operator *(FixedPoint2 a, int b)
@@ -94,18 +90,12 @@ namespace Content.Shared.FixedPoint
public static FixedPoint2 operator /(FixedPoint2 a, FixedPoint2 b)
{
if (b._value == 0)
{
throw new DivideByZeroException();
}
var aD = a.ShiftDown();
var bD = b.ShiftDown();
return New(aD / bD);
return new((int) MathF.Round((MathF.Pow(10, Shift) * a._value) / b._value, MidpointRounding.AwayFromZero));
}
public static FixedPoint2 operator /(FixedPoint2 a, float b)
{
return a / FixedPoint2.New(b);
return new((int) MathF.Round(a._value / b, MidpointRounding.AwayFromZero));
}
public static bool operator <=(FixedPoint2 a, int b)