projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split object/block.?pp
[supertux.git]
/
src
/
video
/
color.hpp
diff --git
a/src/video/color.hpp
b/src/video/color.hpp
index
1178fab
..
ef751b6
100644
(file)
--- a/
src/video/color.hpp
+++ b/
src/video/color.hpp
@@
-1,12
+1,10
@@
-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// 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 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
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,33
+12,47
@@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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.
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef
__COLOR_HPP__
-#define
__COLOR_HPP__
+#ifndef
HEADER_SUPERTUX_VIDEO_COLOR_HPP
+#define
HEADER_SUPERTUX_VIDEO_COLOR_HPP
+#include <assert.h>
#include <vector>
#include <vector>
-#include "log.hpp"
+
+#include "util/log.hpp"
class Color
{
public:
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
}
{
#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];
green = vals[1];
- blue = vals[2];
+ blue
= vals[2];
if(vals.size() > 3)
alpha = vals[3];
else
if(vals.size() > 3)
alpha = vals[3];
else
@@
-50,15
+62,42
@@
public:
#endif
}
#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
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;
}
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;
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
};
#endif
+
+/* EOF */