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

diff --git a/src/video/color.hpp b/src/video/color.hpp
index 1cc32eba2..ef751b6f5 100644
--- a/src/video/color.hpp
+++ b/src/video/color.hpp
@@ -1,46 +1,58 @@
-//  $Id: main.cpp 3314 2006-04-12 12:36:29Z matzebraun $
-// 
 //  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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  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 3 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__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_VIDEO_COLOR_HPP
+#define HEADER_SUPERTUX_VIDEO_COLOR_HPP
 
+#include <assert.h>
 #include <vector>
-#include "log.hpp"
+
+#include "util/log.hpp"
 
 class Color
 {
 public:
-  Color()
-    : red(0), green(0), blue(0), alpha(1.0)
-  { }
-  Color(float red, float green, float blue, float alpha = 1.0)
-    : red(red), green(green), blue(blue), alpha(alpha)
+  Color() :
+    red(0), 
+    green(0), 
+    blue(0), 
+    alpha(1.0f)
+  {}
+
+  Color(float red_, float green_, float blue_, float alpha_ = 1.0) :
+    red(red_),
+    green(green_), 
+    blue(blue_), 
+    alpha(alpha_)
   {
 #ifdef DEBUG
     check_color_ranges();
 #endif
   }
-  Color(const std::vector<float>& vals)
+
+  Color(const std::vector<float>& vals) :
+    red(),
+    green(),
+    blue(),
+    alpha()
   {
-    red = vals[0];
+    assert(vals.size() >= 3);
+    red   = vals[0];
     green = vals[1];
-    blue = vals[2];
+    blue  = vals[2];
     if(vals.size() > 3)
       alpha = vals[3];
     else
@@ -50,16 +62,42 @@ 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)
+       || blue < 0 || blue > 1.0
+       || alpha < 0 || alpha > 1.0)
       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
 
+/* EOF */