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

diff --git a/src/video/color.hpp b/src/video/color.hpp
index 6bce2055f..6900d7cf1 100644
--- a/src/video/color.hpp
+++ b/src/video/color.hpp
@@ -1,46 +1,95 @@
-#ifndef __COLOR_HPP__
-#define __COLOR_HPP__
+//  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 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, see <http://www.gnu.org/licenses/>.
 
+#ifndef HEADER_SUPERTUX_VIDEO_COLOR_HPP
+#define HEADER_SUPERTUX_VIDEO_COLOR_HPP
+
+#include <assert.h>
 #include <vector>
-#include "msg.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
+    assert(0 <= red   && red <= 1.0);
+    assert(0 <= green && green <= 1.0);
+    assert(0 <= blue  && blue <= 1.0);
   }
-  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
       alpha = 1.0;
-#ifdef DEBUG
-    check_color_ranges();
-#endif
+    assert(0 <= red   && red <= 1.0);
+    assert(0 <= green && green <= 1.0);
+    assert(0 <= blue  && blue <= 1.0);
   }
 
-  void check_color_ranges()
+  bool operator==(const Color& other) const
   {
-    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);
+    return red == other.red && green == other.green && blue == other.blue
+      && alpha == other.alpha;
+  }
+
+  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 */