Improved color comparison
parent
647eab6ae9
commit
bc40ebd730
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue