maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Mono] Approximate equality

Browse source
This commit is contained in:
Aaron Franke 2019-04-01 18:13:38 -04:00
parent 7f7d97f536
commit c577ec6ae4
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
7 changed files with 53 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/mono/glue/Managed/Files/Color.cs
View file

@ -168,7 +168,7 @@ namespace Godot
int max = Mathf.Max(color.r8, Mathf.Max(color.g8, color.b8));
int min = Mathf.Min(color.r8, Mathf.Min(color.g8, color.b8));
float delta = max - min;
int delta = max - min;
if (delta == 0)
{
@ -591,11 +591,11 @@ namespace Godot
public static bool operator <(Color left, Color right)
{
if (left.r == right.r)
if (Mathf.IsEqualApprox(left.r, right.r))
{
if (left.g == right.g)
if (Mathf.IsEqualApprox(left.g, right.g))
{
if (left.b == right.b)
if (Mathf.IsEqualApprox(left.b, right.b))
return left.a < right.a;
return left.b < right.b;
}
@ -608,11 +608,11 @@ namespace Godot
public static bool operator >(Color left, Color right)
{
if (left.r == right.r)
if (Mathf.IsEqualApprox(left.r, right.r))
{
if (left.g == right.g)
if (Mathf.IsEqualApprox(left.g, right.g))
{
if (left.b == right.b)
if (Mathf.IsEqualApprox(left.b, right.b))
return left.a > right.a;
return left.b > right.b;
}
@ -635,7 +635,7 @@ namespace Godot
public bool Equals(Color other)
{
return r == other.r && g == other.g && b == other.b && a == other.a;
return Mathf.IsEqualApprox(r, other.r) && Mathf.IsEqualApprox(g, other.g) && Mathf.IsEqualApprox(b, other.b) && Mathf.IsEqualApprox(a, other.a);
}
public override int GetHashCode()

14
modules/mono/glue/Managed/Files/Mathf.cs
View file

@ -143,6 +143,15 @@ namespace Godot
return (weight - from) / (to - from);
}
public static bool IsEqualApprox(real_t a, real_t b)
{
real_t tolerance = Epsilon * Abs(a);
if (tolerance < Epsilon) {
tolerance = Epsilon;
}
return Abs(a - b) < tolerance;
}
public static bool IsInf(real_t s)
{
return real_t.IsInfinity(s);
@ -153,6 +162,11 @@ namespace Godot
return real_t.IsNaN(s);
}
public static bool IsZeroApprox(real_t s)
{
return Abs(s) < Epsilon;
}
public static real_t Lerp(real_t from, real_t to, real_t weight)
{
return from + (to - from) * weight;

4
modules/mono/glue/Managed/Files/MathfEx.cs
View file

@ -36,9 +36,9 @@ namespace Godot
return (int)Math.Round(s);
}
public static bool IsEqualApprox(real_t a, real_t b, real_t ratio = Mathf.Epsilon)
public static bool IsEqualApprox(real_t a, real_t b, real_t tolerance)
{
return Abs(a - b) < ratio;
return Abs(a - b) < tolerance;
}
}
}

2
modules/mono/glue/Managed/Files/Plane.cs
View file

@ -200,7 +200,7 @@ namespace Godot
public bool Equals(Plane other)
{
return _normal == other._normal && D == other.D;
return _normal == other._normal && Mathf.IsEqualApprox(D, other.D);
}
public override int GetHashCode()

2
modules/mono/glue/Managed/Files/Quat.cs
View file

@ -358,7 +358,7 @@ namespace Godot
public bool Equals(Quat other)
{
return x == other.x && y == other.y && z == other.z && w == other.w;
return Mathf.IsEqualApprox(x, other.x) && Mathf.IsEqualApprox(y, other.y) && Mathf.IsEqualApprox(z, other.z) && Mathf.IsEqualApprox(w, other.w);
}
public override int GetHashCode()

26
modules/mono/glue/Managed/Files/Vector2.cs
View file

@ -52,11 +52,15 @@ namespace Godot
internal void Normalize()
{
real_t length = x * x + y * y;
real_t lengthsq = LengthSquared();
if (length != 0f)
if (lengthsq == 0)
{
length = Mathf.Sqrt(length);
x = y = 0f;
}
else
{
real_t length = Mathf.Sqrt(lengthsq);
x /= length;
y /= length;
}
@ -184,9 +188,9 @@ namespace Godot
public Vector2 Normalized()
{
var result = this;
result.Normalize();
return result;
var v = this;
v.Normalize();
return v;
}
public Vector2 Project(Vector2 onNormal)
@ -343,7 +347,7 @@ namespace Godot
public static bool operator <(Vector2 left, Vector2 right)
{
if (left.x.Equals(right.x))
if (Mathf.IsEqualApprox(left.x, right.x))
{
return left.y < right.y;
}
@ -353,7 +357,7 @@ namespace Godot
public static bool operator >(Vector2 left, Vector2 right)
{
if (left.x.Equals(right.x))
if (Mathf.IsEqualApprox(left.x, right.x))
{
return left.y > right.y;
}
@ -363,7 +367,7 @@ namespace Godot
public static bool operator <=(Vector2 left, Vector2 right)
{
if (left.x.Equals(right.x))
if (Mathf.IsEqualApprox(left.x, right.x))
{
return left.y <= right.y;
}
@ -373,7 +377,7 @@ namespace Godot
public static bool operator >=(Vector2 left, Vector2 right)
{
if (left.x.Equals(right.x))
if (Mathf.IsEqualApprox(left.x, right.x))
{
return left.y >= right.y;
}
@ -393,7 +397,7 @@ namespace Godot
public bool Equals(Vector2 other)
{
return x == other.x && y == other.y;
return Mathf.IsEqualApprox(x, other.x) && Mathf.IsEqualApprox(y, other.y);
}
public override int GetHashCode()

23
modules/mono/glue/Managed/Files/Vector3.cs
View file

@ -65,14 +65,15 @@ namespace Godot
internal void Normalize()
{
real_t length = Length();
real_t lengthsq = LengthSquared();
if (length == 0f)
if (lengthsq == 0)
{
x = y = z = 0f;
}
else
{
real_t length = Mathf.Sqrt(lengthsq);
x /= length;
y /= length;
z /= length;
@ -397,9 +398,9 @@ namespace Godot
public static bool operator <(Vector3 left, Vector3 right)
{
if (left.x == right.x)
if (Mathf.IsEqualApprox(left.x, right.x))
{
if (left.y == right.y)
if (Mathf.IsEqualApprox(left.y, right.y))
return left.z < right.z;
return left.y < right.y;
}
@ -409,9 +410,9 @@ namespace Godot
public static bool operator >(Vector3 left, Vector3 right)
{
if (left.x == right.x)
if (Mathf.IsEqualApprox(left.x, right.x))
{
if (left.y == right.y)
if (Mathf.IsEqualApprox(left.y, right.y))
return left.z > right.z;
return left.y > right.y;
}
@ -421,9 +422,9 @@ namespace Godot
public static bool operator <=(Vector3 left, Vector3 right)
{
if (left.x == right.x)
if (Mathf.IsEqualApprox(left.x, right.x))
{
if (left.y == right.y)
if (Mathf.IsEqualApprox(left.y, right.y))
return left.z <= right.z;
return left.y < right.y;
}
@ -433,9 +434,9 @@ namespace Godot
public static bool operator >=(Vector3 left, Vector3 right)
{
if (left.x == right.x)
if (Mathf.IsEqualApprox(left.x, right.x))
{
if (left.y == right.y)
if (Mathf.IsEqualApprox(left.y, right.y))
return left.z >= right.z;
return left.y > right.y;
}
@ -455,7 +456,7 @@ namespace Godot
public bool Equals(Vector3 other)
{
return x == other.x && y == other.y && z == other.z;
return Mathf.IsEqualApprox(x, other.x) && Mathf.IsEqualApprox(y, other.y) && Mathf.IsEqualApprox(z, other.z);
}
public override int GetHashCode()