OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Color3f. Add operator <

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-10-06 14:34:11 +02:00
parent 0e832fad06
commit 5d672356d2
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Fwk/VizFwk/LibCore/cvfColor3.cpp
View File

@@ -258,6 +258,20 @@ Color3f Color3f::fromByteColor(ubyte r, ubyte g, ubyte b)
return c; return c;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool operator < (const Color3f& color1, const Color3f& color2)
{
for (int i = 0; i < 3; i++)
{
if (color1.m_rgb[i] > color2.m_rgb[i])
return false;
else if (color1.m_rgb[i] < color2.m_rgb[i])
return true;
}
return false;
}
//================================================================================================== //==================================================================================================
@@ -432,6 +446,5 @@ const ubyte* Color3ub::ptr() const
return m_rgb; return m_rgb;
} }
} // namespace cvf } // namespace cvf

3
Fwk/VizFwk/LibCore/cvfColor3.h
View File

@@ -135,10 +135,13 @@ public:
static Color3f fromByteColor(ubyte r, ubyte g, ubyte b); static Color3f fromByteColor(ubyte r, ubyte g, ubyte b);
friend bool operator < (const Color3f& color1, const Color3f& color2);
private: private:
float m_rgb[3]; float m_rgb[3];
}; };
bool operator < (const Color3f& color1, const Color3f& color2);
//================================================================================================== //==================================================================================================