X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvideo%2Fcolor.hpp;h=e3ff67804b8aa1f9bc615a55b50908914f7fcd93;hb=20efd7620620892d92b1c7df124c3a0c8df22a82;hp=6bce2055f9325159ec5720148bd9440373528360;hpb=0f0e6a3689e5d810ec55b68ff455210b1081a021;p=supertux.git

diff --git a/src/video/color.hpp b/src/video/color.hpp
index 6bce2055f..e3ff67804 100644
--- a/src/video/color.hpp
+++ b/src/video/color.hpp
@@ -1,8 +1,28 @@
+//  $Id$
+//
+//  SuperTux
+//  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
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  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.
+
 #ifndef __COLOR_HPP__
 #define __COLOR_HPP__
 
 #include <vector>
-#include "msg.hpp"
+#include <assert.h>
+#include "log.hpp"
 
 class Color
 {
@@ -19,6 +39,7 @@ public:
   }
   Color(const std::vector<float>& vals)
   {
+    assert(vals.size() >= 3);
     red = vals[0];
     green = vals[1];
     blue = vals[2];
@@ -31,16 +52,31 @@ 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
             || blue < 0 || blue > 1.0
             || alpha < 0 || alpha > 1.0)
-      msg_warning("color value out of range: " << red << ", " << green << ", " << blue << ", " << alpha);
+      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;
 };
 
 #endif
-