From bc40ebd7307341291bf66ce7730bab1910b51333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Terziman?= <leo.terziman@clarte.asso.fr>
Date: Mon, 28 Oct 2013 11:46:07 +0100
Subject: [PATCH] Improved color comparison

---
 include/assimp/color4.h   |  1 +
 include/assimp/color4.inl | 11 +++++++++++
 include/assimp/types.h    | 10 ++++++++++
 3 files changed, 22 insertions(+)

diff --git a/include/assimp/color4.h b/include/assimp/color4.h
index 4fb8941ee..bd8ff6fb4 100644
--- a/include/assimp/color4.h
+++ b/include/assimp/color4.h
@@ -74,6 +74,7 @@ public:
 	// comparison
 	bool operator == (const aiColor4t& other) const;
 	bool operator != (const aiColor4t& other) const;
+	bool operator <  (const aiColor4t& other) const;
 
 	// color tuple access, rgba order
 	inline TReal operator[](unsigned int i) const;
diff --git a/include/assimp/color4.inl b/include/assimp/color4.inl
index f4f9126de..1b9d173ab 100644
--- a/include/assimp/color4.inl
+++ b/include/assimp/color4.inl
@@ -94,6 +94,17 @@ AI_FORCE_INLINE bool aiColor4t<TReal>::operator!= (const aiColor4t<TReal>& other
 }
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>
+AI_FORCE_INLINE bool aiColor4t<TReal>::operator< (const aiColor4t<TReal>& other) const {
+	return r < other.r || (
+		r == other.r && (g < other.g ||
+			g == other.g && (b < other.b ||
+				b == other.b && a < other.a
+			)
+		)
+	);
+}
+// ------------------------------------------------------------------------------------------------
+template <typename TReal>
 AI_FORCE_INLINE aiColor4t<TReal> operator + (const aiColor4t<TReal>& v1, const aiColor4t<TReal>& v2)	{
 	return aiColor4t<TReal>( v1.r + v2.r, v1.g + v2.g, v1.b + v2.b, v1.a + v2.a);
 }
diff --git a/include/assimp/types.h b/include/assimp/types.h
index 22ca7abdc..070c5d224 100644
--- a/include/assimp/types.h
+++ b/include/assimp/types.h
@@ -172,6 +172,16 @@ struct aiColor3D
 	bool operator != (const aiColor3D& other) const
 		{return r != other.r || g != other.g || b != other.b;}
 
+	/** Component-wise comparison */
+	// TODO: add epsilon?
+	bool operator < (const aiColor3D& other) const {
+		return r < other.r || (
+			r == other.r && (g < other.g ||
+				g == other.g && b < other.b
+			)
+		);
+	}
+
 	/** Component-wise addition */
 	aiColor3D operator+(const aiColor3D& c) const {
 		return aiColor3D(r+c.r,g+c.g,b+c.b);