godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change inequality comparison operators to use exact equality 

(cherry picked from commit d0a1399a1b)
This commit is contained in:
Aaron Franke 2020-09-08 18:10:58 -04:00 committed by Rémi Verschelde
parent 13d7404cd7
commit 1dcbcaaa0d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/math/vector2.h
View File

@ -116,10 +116,10 @@ struct Vector2 {
bool operator==(const Vector2 &p_vec2) const;
bool operator!=(const Vector2 &p_vec2) const;
bool operator<(const Vector2 &p_vec2) const { return Math::is_equal_approx(x, p_vec2.x) ? (y < p_vec2.y) : (x < p_vec2.x); }
bool operator>(const Vector2 &p_vec2) const { return Math::is_equal_approx(x, p_vec2.x) ? (y > p_vec2.y) : (x > p_vec2.x); }
bool operator<=(const Vector2 &p_vec2) const { return Math::is_equal_approx(x, p_vec2.x) ? (y <= p_vec2.y) : (x < p_vec2.x); }
bool operator>=(const Vector2 &p_vec2) const { return Math::is_equal_approx(x, p_vec2.x) ? (y >= p_vec2.y) : (x > p_vec2.x); }
bool operator<(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y < p_vec2.y) : (x < p_vec2.x); }
bool operator>(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y > p_vec2.y) : (x > p_vec2.x); }
bool operator<=(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y <= p_vec2.y) : (x < p_vec2.x); }
bool operator>=(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y >= p_vec2.y) : (x > p_vec2.x); }
real_t angle() const;

16
core/math/vector3.h
View File

@ -342,8 +342,8 @@ bool Vector3::operator!=(const Vector3 &p_v) const {
bool Vector3::operator<(const Vector3 &p_v) const {
if (Math::is_equal_approx(x, p_v.x)) {
if (Math::is_equal_approx(y, p_v.y))
if (x == p_v.x) {
if (y == p_v.y)
return z < p_v.z;
else
return y < p_v.y;
@ -354,8 +354,8 @@ bool Vector3::operator<(const Vector3 &p_v) const {
bool Vector3::operator>(const Vector3 &p_v) const {
if (Math::is_equal_approx(x, p_v.x)) {
if (Math::is_equal_approx(y, p_v.y))
if (x == p_v.x) {
if (y == p_v.y)
return z > p_v.z;
else
return y > p_v.y;
@ -366,8 +366,8 @@ bool Vector3::operator>(const Vector3 &p_v) const {
bool Vector3::operator<=(const Vector3 &p_v) const {
if (Math::is_equal_approx(x, p_v.x)) {
if (Math::is_equal_approx(y, p_v.y))
if (x == p_v.x) {
if (y == p_v.y)
return z <= p_v.z;
else
return y < p_v.y;
@ -378,8 +378,8 @@ bool Vector3::operator<=(const Vector3 &p_v) const {
bool Vector3::operator>=(const Vector3 &p_v) const {
if (Math::is_equal_approx(x, p_v.x)) {
if (Math::is_equal_approx(y, p_v.y))
if (x == p_v.x) {
if (y == p_v.y)
return z >= p_v.z;
else
return y > p_v.y;

13
modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs
View File

@ -700,41 +700,37 @@ namespace Godot
public static bool operator <(Vector2 left, Vector2 right)
{
if (Mathf.IsEqualApprox(left.x, right.x))
if (left.x == right.x)
{
return left.y < right.y;
}
return left.x < right.x;
}
public static bool operator >(Vector2 left, Vector2 right)
{
if (Mathf.IsEqualApprox(left.x, right.x))
if (left.x == right.x)
{
return left.y > right.y;
}
return left.x > right.x;
}
public static bool operator <=(Vector2 left, Vector2 right)
{
if (Mathf.IsEqualApprox(left.x, right.x))
if (left.x == right.x)
{
return left.y <= right.y;
}
return left.x <= right.x;
}
public static bool operator >=(Vector2 left, Vector2 right)
{
if (Mathf.IsEqualApprox(left.x, right.x))
if (left.x == right.x)
{
return left.y >= right.y;
}
return left.x >= right.x;
}
@ -744,7 +740,6 @@ namespace Godot
{
return Equals((Vector2)obj);
}
return false;
}

28
modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
View File

@ -734,49 +734,53 @@ namespace Godot
public static bool operator <(Vector3 left, Vector3 right)
{
if (Mathf.IsEqualApprox(left.x, right.x))
if (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;
}
return left.x < right.x;
}
public static bool operator >(Vector3 left, Vector3 right)
{
if (Mathf.IsEqualApprox(left.x, right.x))
if (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;
}
return left.x > right.x;
}
public static bool operator <=(Vector3 left, Vector3 right)
{
if (Mathf.IsEqualApprox(left.x, right.x))
if (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;
}
return left.x < right.x;
}
public static bool operator >=(Vector3 left, Vector3 right)
{
if (Mathf.IsEqualApprox(left.x, right.x))
if (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;
}
return left.x > right.x;
}