diff options
| author | Aaron Franke <arnfranke@yahoo.com> | 2019-10-02 16:35:49 -0400 |
|---|---|---|
| committer | Aaron Franke <arnfranke@yahoo.com> | 2019-10-14 16:48:59 -0400 |
| commit | 218f38c7ecdea970a5e82a48e7782077be4fc248 (patch) | |
| tree | 98c0dc91a6253b678a3cd3dc781b5b4c10044e65 /core/math | |
| parent | aeb70756287ad209f0b9d799bcd157dcaed41c17 (diff) | |
Expose is_equal_approx and restore == to be exact again
This commit changes behavior for GDScript and C#.
Also did some organizing of the order to logically group related methods, mostly for Rect2 and AABB.
Diffstat (limited to 'core/math')
| -rw-r--r-- | core/math/plane.h | 4 | ||||
| -rw-r--r-- | core/math/vector2.h | 4 | ||||
| -rw-r--r-- | core/math/vector3.h | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/core/math/plane.h b/core/math/plane.h index 07c6a81c35..9abf24fbba 100644 --- a/core/math/plane.h +++ b/core/math/plane.h @@ -125,12 +125,12 @@ Plane::Plane(const Vector3 &p_point1, const Vector3 &p_point2, const Vector3 &p_ bool Plane::operator==(const Plane &p_plane) const { - return normal == p_plane.normal && Math::is_equal_approx(d, p_plane.d); + return normal == p_plane.normal && d == p_plane.d; } bool Plane::operator!=(const Plane &p_plane) const { - return normal != p_plane.normal || !Math::is_equal_approx(d, p_plane.d); + return normal != p_plane.normal || d != p_plane.d; } #endif // PLANE_H diff --git a/core/math/vector2.h b/core/math/vector2.h index 39fec15ce6..7fcaadab00 100644 --- a/core/math/vector2.h +++ b/core/math/vector2.h @@ -223,11 +223,11 @@ _FORCE_INLINE_ Vector2 Vector2::operator-() const { _FORCE_INLINE_ bool Vector2::operator==(const Vector2 &p_vec2) const { - return Math::is_equal_approx(x, p_vec2.x) && Math::is_equal_approx(y, p_vec2.y); + return x == p_vec2.x && y == p_vec2.y; } _FORCE_INLINE_ bool Vector2::operator!=(const Vector2 &p_vec2) const { - return !Math::is_equal_approx(x, p_vec2.x) || !Math::is_equal_approx(y, p_vec2.y); + return x != p_vec2.x || y != p_vec2.y; } Vector2 Vector2::linear_interpolate(const Vector2 &p_b, real_t p_t) const { diff --git a/core/math/vector3.h b/core/math/vector3.h index ac42238ed4..43fa09ffac 100644 --- a/core/math/vector3.h +++ b/core/math/vector3.h @@ -332,11 +332,12 @@ Vector3 Vector3::operator-() const { bool Vector3::operator==(const Vector3 &p_v) const { - return (Math::is_equal_approx(x, p_v.x) && Math::is_equal_approx(y, p_v.y) && Math::is_equal_approx(z, p_v.z)); + return x == p_v.x && y == p_v.y && z == p_v.z; } bool Vector3::operator!=(const Vector3 &p_v) const { - return (!Math::is_equal_approx(x, p_v.x) || !Math::is_equal_approx(y, p_v.y) || !Math::is_equal_approx(z, p_v.z)); + + return x != p_v.x || y != p_v.y || z != p_v.z; } bool Vector3::operator<(const Vector3 &p_v) const { |