From 5c7a9e1011d5b3f561a649089106adecfa7cb2b7 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 2 Dec 2012 00:37:21 +0100 Subject: [PATCH] Removed Quaternion/Vector comparison operator Made no sense Former-commit-id: 3c2a822cd3142e2bc931021ef8874602630be8cf --- include/Nazara/Math/Quaternion.hpp | 4 ---- include/Nazara/Math/Quaternion.inl | 24 ------------------------ include/Nazara/Math/Vector2.hpp | 4 ---- include/Nazara/Math/Vector2.inl | 24 ------------------------ include/Nazara/Math/Vector3.hpp | 4 ---- include/Nazara/Math/Vector3.inl | 24 ------------------------ include/Nazara/Math/Vector4.hpp | 4 ---- include/Nazara/Math/Vector4.inl | 24 ------------------------ 8 files changed, 112 deletions(-) diff --git a/include/Nazara/Math/Quaternion.hpp b/include/Nazara/Math/Quaternion.hpp index b492aff11..6984f0fdd 100644 --- a/include/Nazara/Math/Quaternion.hpp +++ b/include/Nazara/Math/Quaternion.hpp @@ -74,10 +74,6 @@ template class NzQuaternion bool operator==(const NzQuaternion& quat) const; bool operator!=(const NzQuaternion& quat) const; - bool operator<(const NzQuaternion& quat) const; - bool operator<=(const NzQuaternion& quat) const; - bool operator>(const NzQuaternion& quat) const; - bool operator>=(const NzQuaternion& quat) const; static NzQuaternion Identity(); static NzQuaternion Lerp(const NzQuaternion& from, const NzQuaternion& to, T interpolation); diff --git a/include/Nazara/Math/Quaternion.inl b/include/Nazara/Math/Quaternion.inl index 846c80d57..fa01c62aa 100644 --- a/include/Nazara/Math/Quaternion.inl +++ b/include/Nazara/Math/Quaternion.inl @@ -361,30 +361,6 @@ bool NzQuaternion::operator!=(const NzQuaternion& quat) const return !operator==(quat); } -template -bool NzQuaternion::operator<(const NzQuaternion& quat) const -{ - return w < quat.w && x < quat.x && y < quat.y && z < quat.z; -} - -template -bool NzQuaternion::operator<=(const NzQuaternion& quat) const -{ - return operator<(quat) || operator==(quat); -} - -template -bool NzQuaternion::operator>(const NzQuaternion& quat) const -{ - return !operator<=(quat); -} - -template -bool NzQuaternion::operator>=(const NzQuaternion& quat) const -{ - return !operator<(quat); -} - template NzQuaternion NzQuaternion::Identity() { diff --git a/include/Nazara/Math/Vector2.hpp b/include/Nazara/Math/Vector2.hpp index 816760fd5..29f205431 100644 --- a/include/Nazara/Math/Vector2.hpp +++ b/include/Nazara/Math/Vector2.hpp @@ -79,10 +79,6 @@ class NzVector2 bool operator==(const NzVector2& vec) const; bool operator!=(const NzVector2& vec) const; - bool operator<(const NzVector2& vec) const; - bool operator<=(const NzVector2& vec) const; - bool operator>(const NzVector2& vec) const; - bool operator>=(const NzVector2& vec) const; static NzVector2 Lerp(const NzVector2& from, const NzVector2& to, T interpolation); static NzVector2 UnitX(); diff --git a/include/Nazara/Math/Vector2.inl b/include/Nazara/Math/Vector2.inl index 4fc18f312..f05ebe7e0 100644 --- a/include/Nazara/Math/Vector2.inl +++ b/include/Nazara/Math/Vector2.inl @@ -414,30 +414,6 @@ bool NzVector2::operator!=(const NzVector2& vec) const return !operator==(vec); } -template -bool NzVector2::operator<(const NzVector2& vec) const -{ - return x < vec.x && y < vec.y; -} - -template -bool NzVector2::operator<=(const NzVector2& vec) const -{ - return operator<(vec) || operator==(vec); -} - -template -bool NzVector2::operator>(const NzVector2& vec) const -{ - return !operator<=(vec); -} - -template -bool NzVector2::operator>=(const NzVector2& vec) const -{ - return !operator<(vec); -} - template NzVector2 NzVector2::Lerp(const NzVector2& from, const NzVector2& to, T interpolation) { diff --git a/include/Nazara/Math/Vector3.hpp b/include/Nazara/Math/Vector3.hpp index d65b764b9..6fc3fc34e 100644 --- a/include/Nazara/Math/Vector3.hpp +++ b/include/Nazara/Math/Vector3.hpp @@ -87,10 +87,6 @@ template class NzVector3 bool operator==(const NzVector3& vec) const; bool operator!=(const NzVector3& vec) const; - bool operator<(const NzVector3& vec) const; - bool operator<=(const NzVector3& vec) const; - bool operator>(const NzVector3& vec) const; - bool operator>=(const NzVector3& vec) const; static NzVector3 CrossProduct(const NzVector3& vec1, const NzVector3& vec2); static T DotProduct(const NzVector3& vec1, const NzVector3& vec2); diff --git a/include/Nazara/Math/Vector3.inl b/include/Nazara/Math/Vector3.inl index da7b86a42..b714f8165 100644 --- a/include/Nazara/Math/Vector3.inl +++ b/include/Nazara/Math/Vector3.inl @@ -473,30 +473,6 @@ bool NzVector3::operator!=(const NzVector3& vec) const return !operator==(vec); } -template -bool NzVector3::operator<(const NzVector3& vec) const -{ - return x < vec.x && y < vec.y && z < vec.z; -} - -template -bool NzVector3::operator<=(const NzVector3& vec) const -{ - return operator<(vec) || operator==(vec); -} - -template -bool NzVector3::operator>(const NzVector3& vec) const -{ - return !operator<=(vec); -} - -template -bool NzVector3::operator>=(const NzVector3& vec) const -{ - return !operator<(vec); -} - template NzVector3 NzVector3::CrossProduct(const NzVector3& vec1, const NzVector3& vec2) { diff --git a/include/Nazara/Math/Vector4.hpp b/include/Nazara/Math/Vector4.hpp index 9daa32507..15126d9d1 100644 --- a/include/Nazara/Math/Vector4.hpp +++ b/include/Nazara/Math/Vector4.hpp @@ -71,10 +71,6 @@ template class NzVector4 bool operator==(const NzVector4& vec) const; bool operator!=(const NzVector4& vec) const; - bool operator<(const NzVector4& vec) const; - bool operator<=(const NzVector4& vec) const; - bool operator>(const NzVector4& vec) const; - bool operator>=(const NzVector4& vec) const; static NzVector4 UnitX(); static NzVector4 UnitY(); diff --git a/include/Nazara/Math/Vector4.inl b/include/Nazara/Math/Vector4.inl index a4617487e..0def605db 100644 --- a/include/Nazara/Math/Vector4.inl +++ b/include/Nazara/Math/Vector4.inl @@ -425,30 +425,6 @@ bool NzVector4::operator!=(const NzVector4& vec) const return !operator==(vec); } -template -bool NzVector4::operator<(const NzVector4& vec) const -{ - return x < vec.x && y < vec.y && z < vec.z && w < vec.w; -} - -template -bool NzVector4::operator<=(const NzVector4& vec) const -{ - return operator<(vec) || operator==(vec); -} - -template -bool NzVector4::operator>(const NzVector4& vec) const -{ - return !operator<=(vec); -} - -template -bool NzVector4::operator>=(const NzVector4& vec) const -{ - return !operator<(vec); -} - template NzVector4 NzVector4::UnitX() {