From a020e535cac36d69a8939fb7956260d2217c65b4 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 15 Jun 2016 13:22:00 -0700 Subject: [core] Add a few conveniences to Color --- include/mbgl/util/color.hpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'include/mbgl/util/color.hpp') diff --git a/include/mbgl/util/color.hpp b/include/mbgl/util/color.hpp index 82cd3c42e7..87d3175178 100644 --- a/include/mbgl/util/color.hpp +++ b/include/mbgl/util/color.hpp @@ -11,14 +11,26 @@ public: float g = 0.0f; float b = 0.0f; float a = 0.0f; + + static constexpr Color black() { return { 0.0f, 0.0f, 0.0f, 1.0f }; }; + static constexpr Color white() { return { 1.0f, 1.0f, 1.0f, 1.0f }; }; }; -inline bool operator== (const Color& colorA, const Color& colorB) { +inline bool operator==(const Color& colorA, const Color& colorB) { return colorA.r == colorB.r && colorA.g == colorB.g && colorA.b == colorB.b && colorA.a == colorB.a; } -inline bool operator!= (const Color& colorA, const Color& colorB) { - return !(colorA.r == colorB.r && colorA.g == colorB.g && colorA.b == colorB.b && colorA.a == colorB.a); +inline bool operator!=(const Color& colorA, const Color& colorB) { + return !(colorA == colorB); +} + +inline Color operator*(const Color& color, float alpha) { + return { + color.r * alpha, + color.g * alpha, + color.b * alpha, + color.a * alpha + }; } } // namespace mbgl -- cgit v1.2.1