X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fvideo%2Fcolor.hpp;h=f0bd76d6b0ee87e78802b7823c521a96d81f4146;hb=7e15c4f871809033278711a6e9327616da00c4c9;hp=1cc32eba2d7e7ce9e7bc97a1dbb5bdef5bdc4e01;hpb=e6a940db5904743e8220491ce10b5107e119a44c;p=supertux.git

diff --git a/src/video/color.hpp b/src/video/color.hpp
index 1cc32eba2..f0bd76d6b 100644
--- a/src/video/color.hpp
+++ b/src/video/color.hpp
@@ -1,7 +1,7 @@
-//  $Id: main.cpp 3314 2006-04-12 12:36:29Z matzebraun $
-// 
+//  $Id$
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,15 +12,16 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef __COLOR_HPP__
 #define __COLOR_HPP__
 
 #include <vector>
+#include <assert.h>
 #include "log.hpp"
 
 class Color
@@ -38,6 +39,7 @@ public:
   }
   Color(const std::vector<float>& vals)
   {
+    assert(vals.size() >= 3);
     red = vals[0];
     green = vals[1];
     blue = vals[2];
@@ -50,6 +52,12 @@ public:
 #endif
   }
 
+  bool operator==(const Color& other) const
+  {
+    return red == other.red && green == other.green && blue == other.blue
+           && alpha == other.alpha;
+  }
+
   void check_color_ranges()
   {
     if(red < 0 || red > 1.0 || green < 0 || green > 1.0
@@ -58,8 +66,26 @@ public:
       log_warning << "color value out of range: " << red << ", " << green << ", " << blue << ", " << alpha << std::endl;
   }
 
+  float greyscale() const
+  {
+    return red * 0.30 + green * 0.59 + blue * 0.11;
+  }
+
+  bool operator < (const Color& other) const
+  {
+    return greyscale() < other.greyscale();
+  }
+
   float red, green, blue, alpha;
+
+  static const Color BLACK;
+  static const Color RED;
+  static const Color GREEN;
+  static const Color BLUE;
+  static const Color CYAN;
+  static const Color MAGENTA;
+  static const Color YELLOW;
+  static const Color WHITE;
 };
 
 #endif
-