From 3e747d769f63fde60f6095bd1ae7c651d4237f39 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 4 Jun 2016 18:36:00 +0200 Subject: Make Colour movabl;e and make Image contain a vector of Colour instead of raw char data. --- plugingui/colour.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'plugingui/colour.h') diff --git a/plugingui/colour.h b/plugingui/colour.h index a02a6b0..0e85bc6 100644 --- a/plugingui/colour.h +++ b/plugingui/colour.h @@ -31,18 +31,22 @@ namespace GUI { class Colour { public: Colour(); + Colour(float grey, float alpha = 1.0f); + Colour(float red, float green, float blue, float alpha = 1.0f); + Colour(Colour&& other); + Colour(const Colour& other); + ~Colour(); - Colour(float grey, float alpha = 1.0); + Colour& operator=(const Colour& other); + Colour& operator=(Colour&& other); - Colour(float red, - float green, - float blue, - float alpha = 1.0); + inline float red() const { return data[0]; } + inline float green() const { return data[1]; } + inline float blue() const { return data[2]; } + inline float alpha() const { return data[3]; } - float red; - float green; - float blue; - float alpha; +private: + float *data{nullptr}; }; } // GUI:: -- cgit v1.2.3