aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2014-04-08 05:17:27 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2014-04-08 05:17:27 +0200
commitac164afa0954e28b521dc6b19d2ccf0320cc8ed1 (patch)
tree576420091adcad7b91dc1c8b296cc36b3d827b74 /src/menu
parent196f41688d01b7f0a79567c617fd6dd3171150ff (diff)
downloadusdx-ac164afa0954e28b521dc6b19d2ccf0320cc8ed1.tar.gz
usdx-ac164afa0954e28b521dc6b19d2ccf0320cc8ed1.tar.xz
usdx-ac164afa0954e28b521dc6b19d2ccf0320cc8ed1.zip
utils/colors: move colors into subdir, add hsv
All color classes are now in an own subdirectory with a short name. The new class HsvColor represents the Hue/Saturation/Value color model and comes with conversion functions to and from rgb colors (currently integer arithmetic without optimization for higher presicion).
Diffstat (limited to 'src/menu')
-rw-r--r--src/menu/background_color.hpp2
-rw-r--r--src/menu/software_mouse_pointer.hpp2
-rw-r--r--src/menu/static.hpp4
-rw-r--r--src/menu/static_rectangle.hpp2
-rw-r--r--src/menu/texture_colorized.hpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/menu/background_color.hpp b/src/menu/background_color.hpp
index 4ba040cb..79059471 100644
--- a/src/menu/background_color.hpp
+++ b/src/menu/background_color.hpp
@@ -28,7 +28,7 @@
#include <GL/gl.h>
#include "background.hpp"
-#include "utils/rgb_color.hpp"
+#include "utils/color/rgb.hpp"
#include "utils/dimension.hpp"
namespace usdx
diff --git a/src/menu/software_mouse_pointer.hpp b/src/menu/software_mouse_pointer.hpp
index 91ba294b..ff9fe4a4 100644
--- a/src/menu/software_mouse_pointer.hpp
+++ b/src/menu/software_mouse_pointer.hpp
@@ -30,7 +30,7 @@
#include "event_manager.hpp"
#include "texture.hpp"
#include "timer.hpp"
-#include "utils/rgba_color.hpp"
+#include "utils/color/rgba.hpp"
#include "utils/disposer.hpp"
#include <boost/signals2.hpp>
diff --git a/src/menu/static.hpp b/src/menu/static.hpp
index 6f5ce59a..d8ba2066 100644
--- a/src/menu/static.hpp
+++ b/src/menu/static.hpp
@@ -26,8 +26,8 @@
#define STATIC_HPP
#include "drawable.hpp"
-#include "utils/rgb_color.hpp"
-#include "utils/rgba_color.hpp"
+#include "utils/color/rgb.hpp"
+#include "utils/color/rgba.hpp"
namespace usdx
{
diff --git a/src/menu/static_rectangle.hpp b/src/menu/static_rectangle.hpp
index fd9b88ca..7cee1a94 100644
--- a/src/menu/static_rectangle.hpp
+++ b/src/menu/static_rectangle.hpp
@@ -27,7 +27,7 @@
#include "static.hpp"
#include "utils/dimension.hpp"
-#include "utils/rgb_color.hpp"
+#include "utils/color/rgb.hpp"
namespace usdx
{
diff --git a/src/menu/texture_colorized.hpp b/src/menu/texture_colorized.hpp
index 10c08ac4..9259bf55 100644
--- a/src/menu/texture_colorized.hpp
+++ b/src/menu/texture_colorized.hpp
@@ -26,7 +26,7 @@
#define TEXTURE_COLORIZED_HPP
#include "texture_transparent.hpp"
-#include "utils/rgb_color.hpp"
+#include "utils/color/rgb.hpp"
namespace usdx
{