thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-02-20 19:57:12 +01:00
Code Releases Activity

Fix the inequality operator in basic types.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2016-07-29 18:00:10 +03:00
parent 3b925c21d5
commit d4f39e636e
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Base/AABB.cpp
View File

@ -276,7 +276,7 @@ bool AABB::operator == (const AABB & b) const
// ------------------------------------------------------------------------------------------------
bool AABB::operator != (const AABB & b) const
{
return (min != b.min) && (max != b.max);
return (min != b.min) || (max != b.max);
}
// ------------------------------------------------------------------------------------------------

2
source/Base/Circle.cpp
View File

@ -323,7 +323,7 @@ bool Circle::operator == (const Circle & c) const
// ------------------------------------------------------------------------------------------------
bool Circle::operator != (const Circle & c) const
{
return !EpsEq(rad, c.rad) && (pos != c.pos);
return !EpsEq(rad, c.rad) || (pos != c.pos);
}
// ------------------------------------------------------------------------------------------------

2
source/Base/Color3.cpp
View File

@ -444,7 +444,7 @@ bool Color3::operator == (const Color3 & c) const
// ------------------------------------------------------------------------------------------------
bool Color3::operator != (const Color3 & c) const
{
return (r != c.r) && (g != c.g) && (b != c.b);
return (r != c.r) || (g != c.g) || (b != c.b);
}
// ------------------------------------------------------------------------------------------------

2
source/Base/Color4.cpp
View File

@ -469,7 +469,7 @@ bool Color4::operator == (const Color4 & c) const
// ------------------------------------------------------------------------------------------------
bool Color4::operator != (const Color4 & c) const
{
return (r != c.r) && (g != c.g) && (b != c.b) && (a != c.a);
return (r != c.r) || (g != c.g) || (b != c.b) || (a != c.a);
}
// ------------------------------------------------------------------------------------------------

2
source/Base/Quaternion.cpp
View File

@ -308,7 +308,7 @@ bool Quaternion::operator == (const Quaternion & q) const
// ------------------------------------------------------------------------------------------------
bool Quaternion::operator != (const Quaternion & q) const
{
return !EpsEq(x, q.x) && !EpsEq(y, q.y) && !EpsEq(z, q.z) && !EpsEq(w, q.w);
return !EpsEq(x, q.x) || !EpsEq(y, q.y) || !EpsEq(z, q.z) || !EpsEq(w, q.w);
}
// ------------------------------------------------------------------------------------------------

2
source/Base/Sphere.cpp
View File

@ -323,7 +323,7 @@ bool Sphere::operator == (const Sphere & s) const
// ------------------------------------------------------------------------------------------------
bool Sphere::operator != (const Sphere & s) const
{
return !EpsEq(rad, s.rad) && (pos != s.pos);
return !EpsEq(rad, s.rad) || (pos != s.pos);
}
// ------------------------------------------------------------------------------------------------

2
source/Base/Vector2.cpp
View File

@ -265,7 +265,7 @@ bool Vector2::operator == (const Vector2 & v) const
// ------------------------------------------------------------------------------------------------
bool Vector2::operator != (const Vector2 & v) const
{
return !EpsEq(x, v.x) && !EpsEq(y, v.y);
return !EpsEq(x, v.x) || !EpsEq(y, v.y);
}
// ------------------------------------------------------------------------------------------------

2
source/Base/Vector2i.cpp
View File

@ -411,7 +411,7 @@ bool Vector2i::operator == (const Vector2i & v) const
// ------------------------------------------------------------------------------------------------
bool Vector2i::operator != (const Vector2i & v) const
{
return (x != v.x) && (y != v.y);
return (x != v.x) || (y != v.y);
}
// ------------------------------------------------------------------------------------------------

2
source/Base/Vector3.cpp
View File

@ -284,7 +284,7 @@ bool Vector3::operator == (const Vector3 & v) const
// ------------------------------------------------------------------------------------------------
bool Vector3::operator != (const Vector3 & v) const
{
return !EpsEq(x, v.x) && !EpsEq(y, v.y) && !EpsEq(z, v.z);
return !EpsEq(x, v.x) || !EpsEq(y, v.y) || !EpsEq(z, v.z);
}
// ------------------------------------------------------------------------------------------------

2
source/Base/Vector4.cpp
View File

@ -307,7 +307,7 @@ bool Vector4::operator == (const Vector4 & v) const
// ------------------------------------------------------------------------------------------------
bool Vector4::operator != (const Vector4 & v) const
{
return !EpsEq(x, v.x) && !EpsEq(y, v.y) && !EpsEq(z, v.z) && !EpsEq(w, v.w);
return !EpsEq(x, v.x) || !EpsEq(y, v.y) || !EpsEq(z, v.z) || !EpsEq(w, v.w);
}
// ------------------------------------------------------------------------------------------------